refactor: Fix lints using clippy from nightly-2023-03-13 (#6920)

crates/ast_node/src/spanned.rs

@@ -145,11 +145,11 @@ fn make_body_for_variant(v: &VariantBinder<'_>, bindings: Vec<BindedField<'_>>)
         .collect();
 
     // TODO: Only one field should be `#[span(lo)]`.
-    let lo = fields.iter().find(|&&(_, ref f)| f.lo);
-    let hi = fields.iter().find(|&&(_, ref f)| f.hi);
+    let lo = fields.iter().find(|&(_, f)| f.lo);
+    let hi = fields.iter().find(|&(_, f)| f.hi);
 
     match (lo, hi) {
-        (Some(&(ref lo_field, _)), Some(&(ref hi_field, _))) => {
+        (Some((lo_field, _)), Some((hi_field, _))) => {
             // Create a new span from lo_field.lo(), hi_field.hi()
             Box::new(
                 Quote::new(def_site::<Span>())

crates/dbg-swc/src/es/minifier/next/check_size.rs

@@ -143,7 +143,7 @@ impl CheckSizeCommand {
         wrap_task(|| {
             if !self.ensure_fresh
                 && self.workspace.is_dir()
-                && read_dir(&self.workspace.join("inputs"))
+                && read_dir(self.workspace.join("inputs"))
                     .context("failed to read workspace directory")?
                     .count()
                     != 0

crates/swc/src/lib.rs

@@ -337,7 +337,7 @@ impl Compiler {
                                         // regressions.
                                         let f = format!("{}.map", filename.display());
 
-                                        match File::open(&f) {
+                                        match File::open(f) {
                                             Ok(v) => Ok(v),
                                             Err(_) => Err(err),
                                         }

crates/swc/tests/error_msg.rs

@@ -80,5 +80,5 @@ fn fixture(input: PathBuf) {
 
     let output = NormalizedOutput::from(format!("{}", err));
 
-    output.compare_to_file(&output_path).unwrap();
+    output.compare_to_file(output_path).unwrap();
 }

crates/swc/tests/source_map.rs

@@ -130,7 +130,7 @@ fn issue_706() {
 
 #[testing::fixture("tests/fixture/**/*.map")]
 fn validate_map(map_file: PathBuf) {
-    let content = fs::read_to_string(&map_file).unwrap();
+    let content = fs::read_to_string(map_file).unwrap();
     if content.is_empty() {
         return;
     }

crates/swc/tests/tsc.rs

@@ -206,7 +206,7 @@ fn matrix(input: &Path) -> Vec<TestUnitData> {
     fn target(value: &str) -> AHashSet<EsVersion> {
         let mut versions = AHashSet::<EsVersion>::default();
 
-        value.split(',').into_iter().for_each(|v| {
+        value.split(',').for_each(|v| {
             let mut v = v.trim();
             match v {
                 "*" => {
@@ -254,7 +254,7 @@ fn matrix(input: &Path) -> Vec<TestUnitData> {
     fn module(value: &str) -> AHashSet<Module> {
         let mut modules = AHashSet::<Module>::default();
 
-        value.split(',').into_iter().for_each(|v| {
+        value.split(',').for_each(|v| {
             let v = v.trim();
             match v {
                 "es6" | "es2015" | "es2020" | "esnext" | "none" | "es2022" => {

crates/swc_bundler/examples/bundle.rs

@@ -16,7 +16,7 @@ use swc_bundler::{Bundle, Bundler, Load, ModuleData, ModuleRecord};
 use swc_common::{
     errors::{ColorConfig, Handler},
     sync::Lrc,
-    FileName, Globals, Mark, SourceMap, Span, GLOBALS,
+    FileName, Mark, SourceMap, Span, GLOBALS,
 };
 use swc_ecma_ast::*;
 use swc_ecma_codegen::{
@@ -73,7 +73,7 @@ fn do_test(_entry: &Path, entries: HashMap<String, FileName>, inline: bool, mini
     testing::run_test2(false, |cm, _| {
         let start = Instant::now();
 
-        let globals = Box::leak(Box::new(Globals::default()));
+        let globals = Box::leak(Box::default());
         let mut bundler = Bundler::new(
             globals,
             cm.clone(),

crates/swc_bundler/tests/deno.rs

@@ -1224,7 +1224,7 @@ fn exec(input: PathBuf) {
     println!("{}", path.display());
 
     let src = bundle(&input.to_string_lossy(), false);
-    write(&path, &src).unwrap();
+    write(&path, src).unwrap();
 
     // println!("{}", src);
 
@@ -1260,7 +1260,7 @@ fn exec_minified(input: PathBuf) {
         println!("Unminified: {}", path.display());
 
         let src = bundle(&input.to_string_lossy(), false);
-        write(&path, &src).unwrap();
+        write(&path, src).unwrap();
 
         std::mem::forget(dir);
     }
@@ -1270,7 +1270,7 @@ fn exec_minified(input: PathBuf) {
     println!("{}", path.display());
 
     let src = bundle(&input.to_string_lossy(), true);
-    write(&path, &src).unwrap();
+    write(&path, src).unwrap();
     // println!("{}", src);
 
     let output = Command::new("deno")

crates/swc_common/src/errors/emitter.rs

@@ -294,7 +294,7 @@ impl EmitterWriter {
         }
 
         // Find overlapping multiline annotations, put them at different depths
-        multiline_annotations.sort_by_key(|&(_, ref ml)| (ml.line_start, ml.line_end));
+        multiline_annotations.sort_by_key(|(_, ml)| (ml.line_start, ml.line_end));
         for item in multiline_annotations.clone() {
             let ann = item.1;
             for item in multiline_annotations.iter_mut() {
@@ -912,7 +912,7 @@ impl EmitterWriter {
         //                see how it *looks* with
         //                very *weird* formats
         //                see?
-        for &(ref text, ref style) in msg.iter() {
+        for (text, style) in msg.iter() {
             let lines = text.split('\n').collect::<Vec<_>>();
             if lines.len() > 1 {
                 for (i, line) in lines.iter().enumerate() {
@@ -975,7 +975,7 @@ impl EmitterWriter {
             if !level_str.is_empty() {
                 buffer.append(0, ": ", header_style);
             }
-            for &(ref text, _) in msg.iter() {
+            for (text, _) in msg.iter() {
                 buffer.append(0, text, header_style);
             }
         }
@@ -1222,7 +1222,7 @@ impl EmitterWriter {
             let suggestions = suggestion.splice_lines(&**sm);
 
             let mut row_num = 2;
-            for &(ref complete, ref parts) in suggestions.iter().take(MAX_SUGGESTIONS) {
+            for (complete, parts) in suggestions.iter().take(MAX_SUGGESTIONS) {
                 // Only show underline if the suggestion spans a single line and doesn't cover
                 // the entirety of the code output. If you have multiple
                 // replacements in the same line of code, show the underline.

crates/swc_common/src/source_map.rs

@@ -1224,7 +1224,7 @@ impl SourceMap {
         if let Some(orig) = orig {
             for src in orig.sources() {
                 let id = builder.add_source(src);
-                src_id = id as u32 + 1;
+                src_id = id + 1;
 
                 builder.set_source_contents(id, orig.get_source_contents(id));
             }
@@ -1411,7 +1411,7 @@ impl FilePathMapping {
         // NOTE: We are iterating over the mapping entries from last to first
         //       because entries specified later on the command line should
         //       take precedence.
-        for &(ref from, ref to) in self.mapping.iter().rev() {
+        for (from, to) in self.mapping.iter().rev() {
             if let Ok(rest) = path.strip_prefix(from) {
                 return (to.join(rest), true);
             }

crates/swc_common/src/syntax_pos/analyze_source_file.rs

@@ -66,7 +66,7 @@ fn analyze_source_file_generic(
     while i < scan_len {
         let byte = unsafe {
             // We verified that i < scan_len <= src.len()
-            *src_bytes.get_unchecked(i as usize)
+            *src_bytes.get_unchecked(i)
         };
 
         // How much to advance in order to get to the next UTF-8 char in the
@@ -81,7 +81,7 @@ fn analyze_source_file_generic(
 
             match byte {
                 b'\r' => {
-                    if let Some(b'\n') = src_bytes.get(i as usize + 1) {
+                    if let Some(b'\n') = src_bytes.get(i + 1) {
                         lines.push(pos + BytePos(2));
                         i += 2;
                         continue;

crates/swc_core/build.rs

@@ -36,7 +36,7 @@ fn main() {
     let out_dir = env::var("OUT_DIR").expect("Outdir should exist");
     let dest_path = Path::new(&out_dir).join("core_pkg_version.txt");
     let mut f = BufWriter::new(
-        File::create(&dest_path).expect("Failed to create swc_core version constant"),
+        File::create(dest_path).expect("Failed to create swc_core version constant"),
     );
     write!(f, "{}", pkg_version).expect("Failed to write swc_core version constant");
 

crates/swc_css_codegen/src/lib.rs

@@ -2769,10 +2769,9 @@ fn minify_string(value: &str) -> String {
 
 fn serialize_dimension_unit(value: &str) -> Cow<'_, str> {
     // Fast-path
-    let need_escape = (value.len() >= 2
-        && value.as_bytes()[0] == b'e'
-        && (b'0'..=b'9').contains(&value.as_bytes()[1]))
-        || value.contains(|c| c == char::REPLACEMENT_CHARACTER);
+    let need_escape =
+        (value.len() >= 2 && value.as_bytes()[0] == b'e' && value.as_bytes()[1].is_ascii_digit())
+            || value.contains(|c| c == char::REPLACEMENT_CHARACTER);
 
     if !need_escape {
         return Cow::Borrowed(value);

crates/swc_css_compat/src/compiler/legacy_rgb_and_hsl.rs

@@ -18,7 +18,6 @@ impl Compiler {
                 function.value = function
                     .value
                     .drain(..)
-                    .into_iter()
                     .map(|n| match n {
                         ComponentValue::Percentage(box Percentage {
                             span,
@@ -36,7 +35,6 @@ impl Compiler {
                 function.value = function
                     .value
                     .drain(..)
-                    .into_iter()
                     .map(|n| match n {
                         ComponentValue::Hue(box Hue::Angle(Angle {
                             span,

crates/swc_css_lints/tests/lints.rs

@@ -91,5 +91,5 @@ fn fail(input: PathBuf) {
     })
     .unwrap_err();
 
-    stderr.compare_to_file(&stderr_path).unwrap();
+    stderr.compare_to_file(stderr_path).unwrap();
 }

crates/swc_css_parser/src/lexer/mod.rs

@@ -1314,12 +1314,12 @@ fn is_hex_digit(c: char) -> bool {
 
 #[inline(always)]
 fn is_uppercase_letter(c: char) -> bool {
-    matches!(c, 'A'..='Z')
+    c.is_ascii_uppercase()
 }
 
 #[inline(always)]
 fn is_lowercase_letter(c: char) -> bool {
-    matches!(c, 'a'..='z')
+    c.is_ascii_lowercase()
 }
 
 #[inline(always)]

crates/swc_css_parser/tests/fixture.rs

@@ -170,7 +170,7 @@ fn stylesheet_recovery_test(input: PathBuf, config: ParserConfig) {
         );
     }
 
-    stderr.compare_to_file(&stderr_path).unwrap();
+    stderr.compare_to_file(stderr_path).unwrap();
 }
 
 fn stylesheet_recovery_test_tokens(input: PathBuf, config: ParserConfig) {
@@ -248,7 +248,7 @@ fn stylesheet_recovery_test_tokens(input: PathBuf, config: ParserConfig) {
         );
     }
 
-    stderr.compare_to_file(&stderr_path).unwrap();
+    stderr.compare_to_file(stderr_path).unwrap();
 }
 
 struct SpanVisualizer<'a> {
@@ -546,9 +546,7 @@ fn stylesheet_span_visualizer(input: PathBuf, config: Option<ParserConfig>) {
     })
     .unwrap_err();
 
-    output
-        .compare_to_file(&dir.join("span.swc-stderr"))
-        .unwrap();
+    output.compare_to_file(dir.join("span.swc-stderr")).unwrap();
 }
 
 #[testing::fixture("tests/fixture/**/input.css")]

crates/swc_css_utils/src/lib.rs

@@ -166,18 +166,15 @@ fn is_escape_not_required(value: &str) -> bool {
         return true;
     }
 
-    if (b'0'..=b'9').contains(&value.as_bytes()[0]) {
+    if value.as_bytes()[0].is_ascii_digit() {
         return false;
     }
 
     if value.len() == 1 && value.as_bytes()[0] == b'-' {
         return false;
     }
 
-    if value.len() >= 2
-        && value.as_bytes()[0] == b'-'
-        && (b'0'..=b'9').contains(&value.as_bytes()[1])
-    {
+    if value.len() >= 2 && value.as_bytes()[0] == b'-' && value.as_bytes()[1].is_ascii_digit() {
         return false;
     }
 

crates/swc_ecma_codegen/examples/gen.rs

@@ -42,7 +42,7 @@ fn parse_and_gen(entry: &Path) {
             String::from_utf8_lossy(&buf).to_string()
         };
 
-        fs::write("output.js", &code).unwrap();
+        fs::write("output.js", code).unwrap();
 
         Ok(())
     })

crates/swc_ecma_minifier/benches/full.rs

@@ -20,7 +20,7 @@ pub fn bench_files(c: &mut Criterion) {
     group.sample_size(10);
 
     let mut bench_file = |name: &str| {
-        let src = read_to_string(&format!("benches/full/{}.js", name)).unwrap();
+        let src = read_to_string(format!("benches/full/{}.js", name)).unwrap();
 
         group.bench_function(name, |b| {
             b.iter(|| {

crates/swc_ecma_minifier/src/compress/optimize/mod.rs

@@ -2952,7 +2952,6 @@ where
                     let seq = v.init.as_mut().unwrap().force_seq();
                     seq.exprs = side_effects
                         .drain(..)
-                        .into_iter()
                         .chain(seq.exprs.take())
                         .filter(|e| !e.is_invalid())
                         .collect();

crates/swc_ecma_minifier/src/util/base54.rs

@@ -269,7 +269,7 @@ impl CharFreq {
         let mut all = Vec::with_capacity(64);
 
         for (_, c) in arr {
-            if (b'0'..=b'9').contains(&c) {
+            if c.is_ascii_digit() {
                 digits.push(c);
             } else {
                 alpha.push(c);

crates/swc_ecma_minifier/tests/compress.rs

@@ -300,7 +300,7 @@ fn custom_fixture(input: PathBuf) {
 
     testing::run_test2(false, |cm, handler| {
         let mangle = dir.join("mangle.json");
-        let mangle = read_to_string(&mangle).ok();
+        let mangle = read_to_string(mangle).ok();
         if let Some(mangle) = &mangle {
             eprintln!(
                 "---- {} -----\n{}",
@@ -336,7 +336,7 @@ fn custom_fixture(input: PathBuf) {
 fn projects(input: PathBuf) {
     let dir = input.parent().unwrap();
     let config = dir.join("config.json");
-    let config = read_to_string(&config).expect("failed to read config.json");
+    let config = read_to_string(config).expect("failed to read config.json");
     eprintln!("---- {} -----\n{}", Color::Green.paint("Config"), config);
 
     testing::run_test2(false, |cm, handler| {
@@ -443,12 +443,12 @@ fn fixture(input: PathBuf) {
 
     let dir = input.parent().unwrap();
     let config = dir.join("config.json");
-    let config = read_to_string(&config).expect("failed to read config.json");
+    let config = read_to_string(config).expect("failed to read config.json");
     eprintln!("---- {} -----\n{}", Color::Green.paint("Config"), config);
 
     testing::run_test2(false, |cm, handler| {
         let mangle = dir.join("mangle.json");
-        let mangle = read_to_string(&mangle).ok();
+        let mangle = read_to_string(mangle).ok();
         if let Some(mangle) = &mangle {
             eprintln!(
                 "---- {} -----\n{}",
@@ -470,7 +470,7 @@ fn fixture(input: PathBuf) {
         eprintln!("---- {} -----\n{}", Color::Green.paint("Output"), output);
 
         let expected = {
-            let expected = read_to_string(&dir.join("output.js")).unwrap();
+            let expected = read_to_string(dir.join("output.js")).unwrap();
             let fm = cm.new_source_file(FileName::Anon, expected);
             let lexer = Lexer::new(
                 Default::default(),
@@ -512,7 +512,7 @@ fn fixture(input: PathBuf) {
             // Check output.teraer.js
             let identical = (|| -> Option<()> {
                 let expected = {
-                    let expected = read_to_string(&dir.join("output.terser.js")).ok()?;
+                    let expected = read_to_string(dir.join("output.terser.js")).ok()?;
                     let fm = cm.new_source_file(FileName::Anon, expected);
                     let lexer = Lexer::new(
                         Default::default(),
@@ -562,9 +562,9 @@ fn fixture(input: PathBuf) {
             })()
             .is_some();
             if identical {
-                let s = read_to_string(&dir.join("output.terser.js"))
+                let s = read_to_string(dir.join("output.terser.js"))
                     .expect("failed to read output.terser.js");
-                std::fs::write(&dir.join("output.js"), s.as_bytes())
+                std::fs::write(dir.join("output.js"), s.as_bytes())
                     .expect("failed to update output.js");
             }
         }