clippy

Author: guybedford

worker-build/src/wasm_pack/bindgen.rs

@@ -5,12 +5,12 @@ use crate::wasm_pack::command::build::{BuildProfile, Target};
 use crate::wasm_pack::install::{self, Tool};
 use crate::wasm_pack::manifest::CrateData;
 use anyhow::{bail, Context, Result};
-use semver;
 use std::path::Path;
 use std::process::Command;
 
 /// Run the `wasm-bindgen` CLI to generate bindings for the current crate's
 /// `.wasm`.
+#[allow(clippy::too_many_arguments)]
 pub fn wasm_bindgen_build(
     data: &CrateData,
     install_status: &install::Status,
@@ -21,7 +21,7 @@ pub fn wasm_bindgen_build(
     reference_types: bool,
     target: Target,
     profile: BuildProfile,
-    extra_options: &Vec<String>,
+    extra_options: &[String],
 ) -> Result<()> {
     let profile_name = match profile.clone() {
         BuildProfile::Release | BuildProfile::Profiling => "release",

worker-build/src/wasm_pack/build/wasm_target.rs

@@ -68,7 +68,7 @@ pub fn check_for_wasm32_target() -> Result<()> {
 /// Get rustc's sysroot as a PathBuf
 fn get_rustc_sysroot() -> Result<PathBuf> {
     let command = Command::new("rustc")
-        .args(&["--print", "sysroot"])
+        .args(["--print", "sysroot"])
         .output()?;
 
     if command.status.success() {
@@ -84,7 +84,7 @@ fn get_rustc_sysroot() -> Result<PathBuf> {
 /// Get wasm32-unknown-unknown target libdir
 fn get_rustc_wasm32_unknown_unknown_target_libdir() -> Result<PathBuf> {
     let command = Command::new("rustc")
-        .args(&[
+        .args([
             "--target",
             "wasm32-unknown-unknown",
             "--print",

worker-build/src/wasm_pack/command/build.rs

@@ -45,10 +45,11 @@ pub struct Build {
 
 /// What sort of output we're going to be generating and flags we're invoking
 /// `wasm-bindgen` with.
-#[derive(Clone, Copy, Debug)]
+#[derive(Clone, Copy, Debug, Default)]
 pub enum Target {
     /// Default output mode or `--target bundler`, indicates output will be
     /// used with a bundle in a later step.
+    #[default]
     Bundler,
     /// Correspond to `--target web` where the output is natively usable as an
     /// ES module in a browser and the wasm is manually instantiated.
@@ -65,12 +66,6 @@ pub enum Target {
     Deno,
 }
 
-impl Default for Target {
-    fn default() -> Target {
-        Target::Bundler
-    }
-}
-
 impl fmt::Display for Target {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         let s = match self {
@@ -113,7 +108,7 @@ pub enum BuildProfile {
 }
 
 /// Everything required to configure and run the `wasm-pack build` command.
-#[derive(Debug, Args)]
+#[derive(Debug, Args, Default)]
 #[command(allow_hyphen_values = true, trailing_var_arg = true)]
 pub struct BuildOptions {
     /// The path to the Rust crate. If not set, searches up the path from the current directory.
@@ -186,30 +181,6 @@ pub struct BuildOptions {
     pub extra_options: Vec<String>,
 }
 
-impl Default for BuildOptions {
-    fn default() -> Self {
-        Self {
-            path: None,
-            scope: None,
-            mode: InstallMode::default(),
-            disable_dts: false,
-            weak_refs: false,
-            reference_types: false,
-            target: Target::default(),
-            debug: false,
-            dev: false,
-            no_pack: false,
-            no_opt: false,
-            release: false,
-            profiling: false,
-            profile: None,
-            out_dir: String::new(),
-            out_name: None,
-            extra_options: Vec::new(),
-        }
-    }
-}
-
 type BuildStep = fn(&mut Build) -> Result<()>;
 
 impl Build {
@@ -290,6 +261,7 @@ impl Build {
         Ok(())
     }
 
+    #[allow(clippy::vec_init_then_push)]
     fn get_process_steps(
         mode: InstallMode,
         no_pack: bool,

worker-build/src/wasm_pack/install/mod.rs

@@ -104,7 +104,7 @@ pub fn get_cli_version(tool: &Tool, path: &Path) -> Result<String> {
     let mut cmd = Command::new(path);
     cmd.arg("--version");
     let stdout = child::run_capture_stdout(cmd, tool)?;
-    let version = stdout.trim().split_whitespace().nth(1);
+    let version = stdout.split_whitespace().nth(1);
     match version {
         Some(v) => Ok(v.to_string()),
         None => bail!("Something went wrong! We couldn't determine your version of the wasm-bindgen CLI. We were supposed to set that up for you, so it's likely not your fault! You should file an issue: https://github.com/rustwasm/wasm-pack/issues/new?template=bug_report.md.")

worker-build/src/wasm_pack/install/mode.rs

@@ -3,9 +3,10 @@ use std::str::FromStr;
 
 /// The `InstallMode` determines which mode of initialization we are running, and
 /// what install steps we perform.
-#[derive(Clone, Copy, Debug)]
+#[derive(Clone, Copy, Debug, Default)]
 pub enum InstallMode {
     /// Perform all the install steps.
+    #[default]
     Normal,
     /// Don't install tools like `wasm-bindgen`, just use the global
     /// environment's existing versions to do builds.
@@ -14,12 +15,6 @@ pub enum InstallMode {
     Force,
 }
 
-impl Default for InstallMode {
-    fn default() -> InstallMode {
-        InstallMode::Normal
-    }
-}
-
 impl FromStr for InstallMode {
     type Err = Error;
     fn from_str(s: &str) -> Result<Self> {

worker-build/src/wasm_pack/license.rs

@@ -39,12 +39,12 @@ fn glob_license_files(path: &Path) -> Result<Vec<String>> {
 /// Copy the crate's license into the `pkg` directory.
 pub fn copy_from_crate(crate_data: &CrateData, path: &Path, out_dir: &Path) -> Result<()> {
     assert!(
-        fs::metadata(path).ok().map_or(false, |m| m.is_dir()),
+        fs::metadata(path).ok().is_some_and(|m| m.is_dir()),
         "crate directory should exist"
     );
 
     assert!(
-        fs::metadata(&out_dir).ok().map_or(false, |m| m.is_dir()),
+        fs::metadata(out_dir).ok().is_some_and(|m| m.is_dir()),
         "crate's pkg directory should exist"
     );
 

worker-build/src/wasm_pack/lockfile.rs

@@ -9,7 +9,6 @@ use crate::wasm_pack::manifest::CrateData;
 use anyhow::{anyhow, bail, Context, Result};
 use console::style;
 use serde::Deserialize;
-use toml;
 
 /// This struct represents the contents of `Cargo.lock`.
 #[derive(Clone, Debug, Deserialize)]

worker-build/src/wasm_pack/manifest/mod.rs

@@ -19,10 +19,8 @@ use crate::wasm_pack::command::build::{BuildProfile, Target};
 use crate::wasm_pack::PBAR;
 use cargo_metadata::{CrateType, Metadata, TargetKind};
 use serde::{self, Deserialize};
-use serde_json;
 use std::collections::BTreeSet;
 use strsim::levenshtein;
-use toml;
 
 const WASM_PACK_METADATA_KEY: &str = "package.metadata.wasm-pack";
 
@@ -334,8 +332,8 @@ impl CrateData {
     }
 
     fn is_same_path(path1: &Path, path2: &Path) -> bool {
-        if let Ok(path1) = fs::canonicalize(&path1) {
-            if let Ok(path2) = fs::canonicalize(&path2) {
+        if let Ok(path1) = fs::canonicalize(path1) {
+            if let Ok(path2) = fs::canonicalize(path2) {
                 return path1 == path2;
             }
         }
@@ -350,7 +348,7 @@ impl CrateData {
     /// Will return Err if the file (manifest_path) couldn't be read or
     /// if deserialize to `CargoManifest` fails.
     pub fn parse_crate_data(manifest_path: &Path) -> Result<ManifestAndUnsedKeys> {
-        let manifest = fs::read_to_string(&manifest_path)
+        let manifest = fs::read_to_string(manifest_path)
             .with_context(|| anyhow!("failed to read: {}", manifest_path.display()))?;
         let manifest = toml::Deserializer::parse(&manifest)?;
 
@@ -407,8 +405,8 @@ impl CrateData {
         let any_cdylib = pkg
             .targets
             .iter()
-            .filter(|target| target.kind.iter().any(|k| *k == TargetKind::CDyLib))
-            .any(|target| target.crate_types.iter().any(|s| *s == CrateType::CDyLib));
+            .filter(|target| target.kind.contains(&TargetKind::CDyLib))
+            .any(|target| target.crate_types.contains(&CrateType::CDyLib));
         if any_cdylib {
             return Ok(());
         }
@@ -430,7 +428,7 @@ impl CrateData {
         match pkg
             .targets
             .iter()
-            .find(|t| t.kind.iter().any(|k| *k == TargetKind::CDyLib))
+            .find(|t| t.kind.contains(&TargetKind::CDyLib))
         {
             Some(lib) => lib.name.replace("-", "_"),
             None => pkg.name.replace("-", "_"),
@@ -544,7 +542,7 @@ impl CrateData {
             None
         };
 
-        let keywords = if pkg.keywords.len() > 0 {
+        let keywords = if !pkg.keywords.is_empty() {
             Some(pkg.keywords.clone())
         } else {
             None

worker-build/src/wasm_pack/manifest/npm/mod.rs

@@ -11,6 +11,7 @@ pub use self::nomodules::NoModulesPackage;
 
 #[derive(Serialize)]
 #[serde(untagged)]
+#[allow(clippy::enum_variant_names)]
 pub enum NpmPackage {
     CommonJSPackage(CommonJSPackage),
     ESModulesPackage(ESModulesPackage),

worker-build/src/wasm_pack/readme.rs

@@ -10,11 +10,11 @@ use crate::wasm_pack::PBAR;
 /// Copy the crate's README into the `pkg` directory.
 pub fn copy_from_crate(crate_data: &CrateData, path: &Path, out_dir: &Path) -> Result<()> {
     assert!(
-        fs::metadata(path).ok().map_or(false, |m| m.is_dir()),
+        fs::metadata(path).ok().is_some_and(|m| m.is_dir()),
         "crate directory should exist"
     );
     assert!(
-        fs::metadata(&out_dir).ok().map_or(false, |m| m.is_dir()),
+        fs::metadata(out_dir).ok().is_some_and(|m| m.is_dir()),
         "crate's pkg directory should exist"
     );