Skip to content

Commit 8c93101

Browse files
committed
fix clippy
1 parent 6604759 commit 8c93101

14 files changed

Lines changed: 29 additions & 65 deletions

File tree

crates/oxc_ast/src/ast_builder_impl.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -215,12 +215,7 @@ impl<'a> AstBuilder<'a> {
215215
/// `0`
216216
#[inline]
217217
pub fn number_0(self) -> Expression<'a> {
218-
self.expression_numeric_literal(
219-
Span::default(),
220-
0.0,
221-
None,
222-
NumberBase::Decimal,
223-
)
218+
self.expression_numeric_literal(Span::default(), 0.0, None, NumberBase::Decimal)
224219
}
225220

226221
/// `void 0`

crates/oxc_ast/src/ast_impl/literal.rs

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -75,17 +75,8 @@ impl NumericLiteral<'_> {
7575
/// Provide a fallback for converting NumericLiteral's value to a string if `raw` is None
7676
pub fn raw_str(&self) -> Cow<str> {
7777
match self.raw.as_ref() {
78-
Some(raw) => return Cow::Borrowed(raw),
79-
None => {
80-
let value = self.value;
81-
let s = match self.base {
82-
NumberBase::Binary => format!("{:#b}", value as i64),
83-
NumberBase::Decimal | NumberBase::Float => format!("{}", value),
84-
NumberBase::Hex => format!("{:#x}", value as i64),
85-
NumberBase::Octal => format!("{:#o}", value as i64),
86-
};
87-
Cow::Owned(s)
88-
}
78+
Some(raw) => Cow::Borrowed(raw),
79+
None => Cow::Owned(format!("{}", self.value)),
8980
}
9081
}
9182
}

crates/oxc_ast/src/ast_kind_impl.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ impl AstKind<'_> {
236236
Self::StringLiteral(s) => format!("StringLiteral({})", s.value).into(),
237237
Self::BooleanLiteral(b) => format!("BooleanLiteral({})", b.value).into(),
238238
Self::NullLiteral(_) => "NullLiteral".into(),
239-
Self::BigIntLiteral(b) => format!("BigIntLiteral({:?})", b.raw).into(),
239+
Self::BigIntLiteral(b) => format!("BigIntLiteral({})", b.raw).into(),
240240
Self::RegExpLiteral(r) => format!("RegExpLiteral({})", r.regex).into(),
241241
Self::TemplateLiteral(t) => format!(
242242
"TemplateLiteral({})",

crates/oxc_ast/src/serialize.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ impl<'a> From<&'a NumericLiteral<'a>> for ESTreeLiteral<'a, f64> {
5252
Self {
5353
span: value.span,
5454
value: value.value,
55-
raw: value.raw.as_ref().map(|raw| raw.as_str()),
55+
raw: value.raw.as_ref().map(oxc_span::Atom::as_str),
5656
bigint: None,
5757
regex: None,
5858
}
@@ -64,7 +64,7 @@ impl<'a> From<&'a StringLiteral<'a>> for ESTreeLiteral<'a, &'a str> {
6464
Self {
6565
span: value.span,
6666
value: &value.value,
67-
raw: value.raw.as_ref().map(|raw| raw.as_str()),
67+
raw: value.raw.as_ref().map(oxc_span::Atom::as_str),
6868
bigint: None,
6969
regex: None,
7070
}
@@ -73,7 +73,7 @@ impl<'a> From<&'a StringLiteral<'a>> for ESTreeLiteral<'a, &'a str> {
7373

7474
impl<'a> From<&'a BigIntLiteral<'a>> for ESTreeLiteral<'a, ()> {
7575
fn from(value: &'a BigIntLiteral) -> Self {
76-
let src = &value.raw.as_str().strip_suffix('n').unwrap().cow_replace('_', "");
76+
let src = &value.raw.strip_suffix('n').unwrap().cow_replace('_', "");
7777

7878
let src = match value.base {
7979
BigintBase::Decimal => src,
@@ -113,7 +113,7 @@ impl<'a> From<&'a RegExpLiteral<'a>> for ESTreeLiteral<'a, Option<EmptyObject>>
113113
fn from(value: &'a RegExpLiteral) -> Self {
114114
Self {
115115
span: value.span,
116-
raw: value.raw.as_ref().map(|raw| raw.as_str()),
116+
raw: value.raw.as_ref().map(oxc_span::Atom::as_str),
117117
value: match &value.regex.pattern {
118118
RegExpPattern::Pattern(_) => Some(EmptyObject {}),
119119
_ => None,

crates/oxc_ecmascript/src/to_big_int.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ impl<'a> ToBigInt<'a> for Expression<'a> {
6868
impl<'a> ToBigInt<'a> for BigIntLiteral<'a> {
6969
fn to_big_int(&self) -> Option<BigInt> {
7070
let value = self.raw.as_str().trim_end_matches('n').string_to_big_int();
71-
debug_assert!(value.is_some(), "Failed to parse {:?}", self.raw);
71+
debug_assert!(value.is_some(), "Failed to parse {}", self.raw);
7272
value
7373
}
7474
}

crates/oxc_isolated_declarations/src/enum.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use rustc_hash::FxHashMap;
22

3-
use oxc_allocator::{CloneIn, IntoIn};
3+
use oxc_allocator::CloneIn;
44
use oxc_ast::ast::*;
55
use oxc_ecmascript::ToInt32;
66
use oxc_span::{Atom, GetSpan, SPAN};

crates/oxc_linter/src/rules/eslint/func_names.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -241,9 +241,7 @@ fn get_property_key_name<'a>(key: &PropertyKey<'a>) -> Option<Cow<'a, str>> {
241241
PropertyKey::RegExpLiteral(regex) => {
242242
Some(Cow::Owned(format!("/{}/{}", regex.regex.pattern, regex.regex.flags)))
243243
}
244-
PropertyKey::BigIntLiteral(bigint) => {
245-
Some(Cow::Borrowed(bigint.raw.as_str()))
246-
}
244+
PropertyKey::BigIntLiteral(bigint) => Some(Cow::Borrowed(bigint.raw.as_str())),
247245
PropertyKey::TemplateLiteral(template) => {
248246
if template.expressions.len() == 0 && template.quasis.len() == 1 {
249247
if let Some(cooked) = &template.quasis[0].value.cooked {

crates/oxc_minifier/src/ast_passes/peephole_replace_known_methods.rs

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -124,12 +124,7 @@ impl PeepholeReplaceKnownMethods {
124124
};
125125

126126
#[expect(clippy::cast_precision_loss)]
127-
Some(ctx.ast.expression_numeric_literal(
128-
span,
129-
result as f64,
130-
None,
131-
NumberBase::Decimal,
132-
))
127+
Some(ctx.ast.expression_numeric_literal(span, result as f64, None, NumberBase::Decimal))
133128
}
134129

135130
fn try_fold_string_substring_or_slice<'a>(
@@ -219,12 +214,7 @@ impl PeepholeReplaceKnownMethods {
219214
let result = string_lit.value.as_str().char_code_at(Some(char_at_index))?;
220215

221216
#[expect(clippy::cast_lossless)]
222-
Some(ctx.ast.expression_numeric_literal(
223-
span,
224-
result as f64,
225-
None,
226-
NumberBase::Decimal,
227-
))
217+
Some(ctx.ast.expression_numeric_literal(span, result as f64, None, NumberBase::Decimal))
228218
}
229219
fn try_fold_string_replace_or_string_replace_all<'a>(
230220
span: Span,

crates/oxc_minifier/src/node_util/mod.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
use std::ops::Deref;
22

3-
use oxc_allocator::IntoIn;
43
use oxc_ast::ast::*;
54
use oxc_ecmascript::constant_evaluation::{ConstantEvaluation, ConstantValue};
65
use oxc_semantic::{IsGlobalReference, SymbolTable};
@@ -39,8 +38,7 @@ impl<'a> Ctx<'a, '_> {
3938
self.ast.expression_numeric_literal(span, n, None, number_base)
4039
}
4140
ConstantValue::BigInt(n) => {
42-
let raw: &str = (n.to_string() + "n").into_in(&self.ast.allocator);
43-
self.ast.expression_big_int_literal(span, raw, BigintBase::Decimal)
41+
self.ast.expression_big_int_literal(span, n.to_string() + "n", BigintBase::Decimal)
4442
}
4543
ConstantValue::String(s) => self.ast.expression_string_literal(span, s, None),
4644
ConstantValue::Boolean(b) => self.ast.expression_boolean_literal(span, b),

crates/oxc_minifier/tests/ecmascript/array_join.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ fn test() {
1313
elements.push(ArrayExpressionElement::NumericLiteral(ast.alloc(ast.numeric_literal(
1414
SPAN,
1515
42f64,
16-
"42",
16+
None,
1717
NumberBase::Decimal,
1818
))));
1919
elements.push(ArrayExpressionElement::StringLiteral(

0 commit comments

Comments
 (0)