Move lints to workspace

Author: daxpedda

.cargo/config.toml

@@ -1,15 +1,2 @@
 [target.'cfg(target_arch = "wasm32")']
 runner = 'cargo run -p wasm-bindgen-cli --bin wasm-bindgen-test-runner --'
-
-[target.'cfg(all())']
-rustflags = [
-  "-Adead_code",
-  "-Anon_upper_case_globals",
-  "-Aunused_doc_comments",
-  "-Aclippy::large_enum_variant",
-  "-Aclippy::missing_safety_doc",
-  "-Aclippy::new_without_default",
-  "-Aclippy::overly_complex_bool_expr",
-  "-Aclippy::too_many_arguments",
-  "-Aclippy::type_complexity",
-]

.github/workflows/main.yml

@@ -111,7 +111,7 @@ jobs:
     name: Clippy `no_std` with `atomics`
     runs-on: ubuntu-latest
     env:
-      CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_RUSTFLAGS: -Ctarget-feature=+atomics,+bulk-memory
+      RUSTFLAGS: -Ctarget-feature=+atomics,+bulk-memory
     steps:
     - uses: actions/checkout@v4
     - run: rustup default nightly-2024-07-06

Cargo.toml

@@ -70,6 +70,20 @@ wasm-bindgen-test-crate-b = { path = 'tests/crates/b' }
 [lints.rust]
 unexpected_cfgs = { level = "warn", check-cfg = ['cfg(wasm_bindgen_unstable_test_coverage)'] }
 
+[lints.clippy]
+large_enum_variant = "allow"
+new_without_default = "allow"
+overly_complex_bool_expr = "allow"
+too_many_arguments = "allow"
+type_complexity = "allow"
+
+[workspace.lints.clippy]
+large_enum_variant = "allow"
+new_without_default = "allow"
+overly_complex_bool_expr = "allow"
+too_many_arguments = "allow"
+type_complexity = "allow"
+
 [workspace]
 exclude = ["crates/msrv"]
 members = [

crates/backend/Cargo.toml

@@ -29,3 +29,6 @@ proc-macro2 = "1.0"
 quote = '1.0'
 syn = { version = '2.0', features = ['full'] }
 wasm-bindgen-shared = { path = "../shared", version = "=0.2.95" }
+
+[lints]
+workspace = true

crates/cli-support/Cargo.toml

@@ -29,3 +29,6 @@ wasm-bindgen-shared = { path = "../shared", version = '=0.2.95' }
 wasm-bindgen-threads-xform = { path = '../threads-xform', version = '=0.2.95' }
 wasm-bindgen-wasm-conventions = { path = '../wasm-conventions', version = '=0.2.95' }
 wasm-bindgen-wasm-interpreter = { path = "../wasm-interpreter", version = '=0.2.95' }
+
+[lints]
+workspace = true

crates/cli-support/src/js/binding.rs

@@ -1240,7 +1240,6 @@ fn instruction(
 
         Instruction::CachedStringLoad {
             owned,
-            optional: _,
             mem,
             free,
             table,

crates/cli-support/src/js/mod.rs

@@ -3274,7 +3274,6 @@ __wbg_set_wasm(wasm);"
                 dtor,
                 mutable,
                 adapter,
-                nargs: _,
             } => {
                 assert!(kind == AdapterJsImportKind::Normal);
                 assert!(!variadic);

crates/cli-support/src/wit/incoming.rs

@@ -117,7 +117,6 @@ impl InstructionBuilder<'_, '_> {
                     &[AdapterType::Enum(name.clone())],
                     Instruction::IntToWasm {
                         input: AdapterType::U32,
-                        output: ValType::I32,
                     },
                     &[AdapterType::I32],
                 );
@@ -473,7 +472,6 @@ impl InstructionBuilder<'_, '_> {
     fn number(&mut self, input: AdapterType, output: walrus::ValType) {
         let instr = Instruction::IntToWasm {
             input: input.clone(),
-            output,
         };
         self.instruction(&[input], instr, &[AdapterType::from_wasm(output).unwrap()]);
     }

crates/cli-support/src/wit/mod.rs

@@ -197,7 +197,6 @@ impl<'a> Context<'a> {
                 // aren't present in the signature but are present in the wasm
                 // signature.
                 let mut function = descriptor.function.clone();
-                let nargs = function.arguments.len();
                 function.arguments.insert(0, Descriptor::I32);
                 function.arguments.insert(0, Descriptor::I32);
                 let adapter = self.table_element_adapter(descriptor.shim_idx, function)?;
@@ -206,7 +205,6 @@ impl<'a> Context<'a> {
                     AuxImport::Closure {
                         dtor: descriptor.dtor_idx,
                         mutable: descriptor.mutable,
-                        nargs,
                         adapter,
                     },
                 );
@@ -1204,7 +1202,7 @@ impl<'a> Context<'a> {
         kind: AdapterJsImportKind,
     ) -> Result<AdapterId, Error> {
         let import = self.module.imports.get(import);
-        let (import_module, import_name) = (import.module.clone(), import.name.clone());
+        let import_name = import.name.clone();
         let import_id = import.id();
         let core_id = match import.kind {
             walrus::ImportKind::Function(f) => f,
@@ -1241,7 +1239,6 @@ impl<'a> Context<'a> {
             ret.input,
             vec![],
             AdapterKind::Import {
-                module: import_module,
                 name: import_name,
                 kind,
             },

crates/cli-support/src/wit/nonstandard.rs

@@ -244,7 +244,6 @@ pub enum AuxImport {
         mutable: bool,      // whether or not this was a `FnMut` closure
         dtor: u32,          // table element index of the destructor function
         adapter: AdapterId, // the adapter which translates the types for this closure
-        nargs: usize,
     },
 
     /// This import is expected to be a shim that simply calls the `foo` method

crates/cli-support/src/wit/outgoing.rs

@@ -110,7 +110,7 @@ impl InstructionBuilder<'_, '_> {
             Descriptor::Ref(d) => self.outgoing_ref(false, d)?,
             Descriptor::RefMut(d) => self.outgoing_ref(true, d)?,
 
-            Descriptor::CachedString => self.cached_string(false, true)?,
+            Descriptor::CachedString => self.cached_string(false)?,
 
             Descriptor::String => {
                 // fetch the ptr/length ...
@@ -193,7 +193,7 @@ impl InstructionBuilder<'_, '_> {
                     &[AdapterType::NamedExternref(name.clone())],
                 );
             }
-            Descriptor::CachedString => self.cached_string(false, false)?,
+            Descriptor::CachedString => self.cached_string(false)?,
 
             Descriptor::String => {
                 self.instruction(
@@ -316,13 +316,10 @@ impl InstructionBuilder<'_, '_> {
                     &[AdapterType::Enum(name.clone()).option()],
                 );
             }
-            Descriptor::StringEnum { name, hole, .. } => {
+            Descriptor::StringEnum { name, .. } => {
                 self.instruction(
                     &[AdapterType::I32],
-                    Instruction::OptionWasmToStringEnum {
-                        name: name.clone(),
-                        hole: *hole,
-                    },
+                    Instruction::OptionWasmToStringEnum { name: name.clone() },
                     &[AdapterType::StringEnum(name.clone()).option()],
                 );
             }
@@ -338,7 +335,7 @@ impl InstructionBuilder<'_, '_> {
             Descriptor::Ref(d) => self.outgoing_option_ref(false, d)?,
             Descriptor::RefMut(d) => self.outgoing_option_ref(true, d)?,
 
-            Descriptor::CachedString => self.cached_string(true, true)?,
+            Descriptor::CachedString => self.cached_string(true)?,
 
             Descriptor::String | Descriptor::Vector(_) => {
                 let kind = arg.vector_kind().ok_or_else(|| {
@@ -528,7 +525,7 @@ impl InstructionBuilder<'_, '_> {
                     &[AdapterType::NamedExternref(name.clone()).option()],
                 );
             }
-            Descriptor::CachedString => self.cached_string(true, false)?,
+            Descriptor::CachedString => self.cached_string(true)?,
             Descriptor::String | Descriptor::Slice(_) => {
                 let kind = arg.vector_kind().ok_or_else(|| {
                     format_err!(
@@ -556,7 +553,6 @@ impl InstructionBuilder<'_, '_> {
 
     fn outgoing_i32(&mut self, output: AdapterType) {
         let instr = Instruction::WasmToInt {
-            input: walrus::ValType::I32,
             output: output.clone(),
         };
         self.instruction(&[AdapterType::I32], instr, &[output]);
@@ -574,20 +570,18 @@ impl InstructionBuilder<'_, '_> {
 
     fn outgoing_i64(&mut self, output: AdapterType) {
         let instr = Instruction::WasmToInt {
-            input: walrus::ValType::I64,
             output: output.clone(),
         };
         self.instruction(&[AdapterType::I64], instr, &[output]);
     }
 
-    fn cached_string(&mut self, optional: bool, owned: bool) -> Result<(), Error> {
+    fn cached_string(&mut self, owned: bool) -> Result<(), Error> {
         let mem = self.cx.memory()?;
         let free = self.cx.free()?;
         self.instruction(
             &[AdapterType::I32, AdapterType::I32],
             Instruction::CachedStringLoad {
                 owned,
-                optional,
                 mem,
                 free,
                 table: None,

crates/cli-support/src/wit/standard.rs

@@ -40,7 +40,6 @@ pub enum AdapterKind {
         instructions: Vec<InstructionData>,
     },
     Import {
-        module: String,
         name: String,
         kind: AdapterJsImportKind,
     },
@@ -139,11 +138,9 @@ pub enum Instruction {
     /// Pops a typed integer (`u8`, `s16`, etc.) and pushes a plain Wasm `i32` or `i64` equivalent.
     IntToWasm {
         input: AdapterType,
-        output: walrus::ValType,
     },
     /// Pops a Wasm `i32` or `i64` and pushes a typed integer (`u8`, `s16`, etc.) equivalent.
     WasmToInt {
-        input: walrus::ValType,
         output: AdapterType,
     },
 
@@ -166,7 +163,6 @@ pub enum Instruction {
 
     OptionWasmToStringEnum {
         name: String,
-        hole: u32,
     },
 
     /// pops a string and pushes the enum variant as an `i32`
@@ -310,7 +306,6 @@ pub enum Instruction {
     /// pops ptr/length i32, loads string from cache
     CachedStringLoad {
         owned: bool,
-        optional: bool,
         mem: walrus::MemoryId,
         free: walrus::FunctionId,
         /// If we're in reference-types mode, the externref table ID to get the cached string from.

crates/cli/Cargo.toml

@@ -57,3 +57,6 @@ rustls-tls = ["ureq/tls"]
 # Legacy support
 openssl = ["dep:native-tls"]
 vendored-openssl = ["openssl", "native-tls/vendored"]
+
+[lints]
+workspace = true

crates/externref-xform/Cargo.toml

@@ -24,6 +24,9 @@ wasmprinter = "0.214"
 wast = "214"
 wat = "1.0"
 
+[lints]
+workspace = true
+
 [[test]]
 harness = false
 name = "all"

crates/futures/Cargo.toml

@@ -38,3 +38,6 @@ version = "=0.3.72"
 futures-channel-preview = { version = "0.3.0-alpha.18" }
 futures-lite = { version = "1.11.3", default-features = false }
 wasm-bindgen-test = { path = '../test' }
+
+[lints]
+workspace = true

crates/js-sys/Cargo.toml

@@ -34,3 +34,10 @@ web-sys = { path = "../web-sys", features = ["Headers", "Response", "ResponseIni
 
 [lints.rust]
 unexpected_cfgs = { level = "warn", check-cfg = ['cfg(js_sys_unstable_apis)'] }
+
+[lints.clippy]
+large_enum_variant = "allow"
+new_without_default = "allow"
+overly_complex_bool_expr = "allow"
+too_many_arguments = "allow"
+type_complexity = "allow"

crates/macro-support/Cargo.toml

@@ -28,3 +28,6 @@ quote = '1.0'
 syn = { version = '2.0', features = ['visit', 'visit-mut', 'full'] }
 wasm-bindgen-backend = { path = "../backend", version = "=0.2.95", default-features = false }
 wasm-bindgen-shared = { path = "../shared", version = "=0.2.95" }
+
+[lints]
+workspace = true

crates/macro/Cargo.toml

@@ -35,3 +35,6 @@ trybuild = "1.0"
 wasm-bindgen = { path = "../.." }
 wasm-bindgen-futures = { path = "../futures" }
 web-sys = { path = "../web-sys", features = ["Worker"] }
+
+[lints]
+workspace = true

crates/multi-value-xform/Cargo.toml

@@ -24,6 +24,9 @@ wasmprinter = "0.214"
 wast = "214"
 wat = "1.0"
 
+[lints]
+workspace = true
+
 [[test]]
 harness = false
 name = "all"

crates/shared/Cargo.toml

@@ -18,3 +18,6 @@ version = "0.2.95"
 # graph, pretend we link a native library so that `cargo` will provide better
 # error messages than the esoteric linker errors we would otherwise trigger.
 links = "wasm_bindgen"
+
+[lints]
+workspace = true

crates/test-macro/Cargo.toml

@@ -29,3 +29,6 @@ syn = { version = "2.0", default-features = false, features = [
 tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
 trybuild = "1.0"
 wasm-bindgen-test = { path = "../test" }
+
+[lints]
+workspace = true

crates/test/Cargo.toml

@@ -29,5 +29,12 @@ wasm-bindgen-test-macro = { path = '../test-macro', version = '=0.3.45', feature
 [lints.rust]
 unexpected_cfgs = { level = "warn", check-cfg = ['cfg(wasm_bindgen_unstable_test_coverage)'] }
 
+[lints.clippy]
+large_enum_variant = "allow"
+new_without_default = "allow"
+overly_complex_bool_expr = "allow"
+too_many_arguments = "allow"
+type_complexity = "allow"
+
 [lib]
 test = false

crates/threads-xform/Cargo.toml

@@ -24,6 +24,9 @@ wasmparser = "0.214"
 wasmprinter = "0.214"
 wat = "1.0"
 
+[lints]
+workspace = true
+
 [[test]]
 harness = false
 name = "all"

crates/typescript-tests/src/custom_section.rs

@@ -8,6 +8,7 @@ const TS_INTERFACE_EXPORT: &'static str = r"
 #[wasm_bindgen(typescript_custom_section)]
 const TS_INTERFACE_EXPORT1: &'static str = include_str!("./custom_section_types.d.ts");
 
+#[allow(dead_code)]
 const TS_INTERFACE_EXPORT2: &str = "interface Person2 { height: number; }";
 #[wasm_bindgen(typescript_custom_section)]
 const _: &str = TS_INTERFACE_EXPORT2;

crates/typescript-tests/src/simple_struct.rs

@@ -6,6 +6,7 @@ pub struct A {}
 #[wasm_bindgen]
 impl A {
     #[wasm_bindgen(constructor)]
+    #[allow(clippy::new_without_default)]
     pub fn new() -> A {
         A {}
     }

crates/wasm-conventions/Cargo.toml

@@ -18,3 +18,6 @@ walrus = "0.23"
 anyhow = "1.0"
 log = "0.4"
 wasmparser = "0.212"
+
+[lints]
+workspace = true

crates/wasm-interpreter/Cargo.toml

@@ -22,3 +22,6 @@ wasm-bindgen-wasm-conventions = { path = "../wasm-conventions", version = "0.2.9
 [dev-dependencies]
 tempfile = "3"
 wat = "1.0"
+
+[lints]
+workspace = true

crates/web-sys/Cargo.toml

@@ -34,6 +34,13 @@ wasm-bindgen-test = { path = '../test' }
 [lints.rust]
 unexpected_cfgs = { level = "warn", check-cfg = ['cfg(web_sys_unstable_apis)'] }
 
+[lints.clippy]
+large_enum_variant = "allow"
+new_without_default = "allow"
+overly_complex_bool_expr = "allow"
+too_many_arguments = "allow"
+type_complexity = "allow"
+
 # This list is auto-generated by the wasm-bindgen-webidl program
 [features]
 default = ["std"]

crates/webidl/Cargo.toml

@@ -19,3 +19,6 @@ sourcefile = "0.2"
 syn = { version = '2.0', features = ['extra-traits', 'full'] }
 wasm-bindgen-backend = { path = "../backend" }
 weedle = { git = "https://github.com/rustwasm/weedle.git" }
+
+[lints]
+workspace = true