diff --git a/.cargo/config b/.cargo/config.toml
similarity index 83%
rename from .cargo/config
rename to .cargo/config.toml
index 84246cbf..cf1995cb 100644
--- a/.cargo/config
+++ b/.cargo/config.toml
@@ -1,5 +1,3 @@
-# TODO: we shouldn't check this in to git, need to figure out how to avoid doing
-# that.
 [target.wasm32-unknown-unknown]
 runner = 'cargo run -p wasm-bindgen-cli --bin wasm-bindgen-test-runner --'
 
diff --git a/benchmarks/Cargo.toml b/benchmarks/Cargo.toml
index cc526bd5..1321bf7e 100644
--- a/benchmarks/Cargo.toml
+++ b/benchmarks/Cargo.toml
@@ -2,6 +2,7 @@
 name = "wasm-bindgen-benchmark"
 version = "0.1.0"
 authors = ["The wasm-bindgen Developers"]
+edition = "2018"
 rust-version = "1.57"
 
 [dependencies]
diff --git a/crates/cli-support/src/js/mod.rs b/crates/cli-support/src/js/mod.rs
index 39c33c78..8c270186 100644
--- a/crates/cli-support/src/js/mod.rs
+++ b/crates/cli-support/src/js/mod.rs
@@ -2797,15 +2797,15 @@ impl<'a> Context<'a> {
             match &js.name {
                 JsImportName::Module { module, name } => {
                     let import = self.module.imports.get_mut(id);
-                    import.module = module.clone();
-                    import.name = name.clone();
+                    import.module.clone_from(module);
+                    import.name.clone_from(name);
                     return Ok(true);
                 }
                 JsImportName::LocalModule { module, name } => {
                     let module = self.config.local_module_name(module);
                     let import = self.module.imports.get_mut(id);
                     import.module = module;
-                    import.name = name.clone();
+                    import.name.clone_from(name);
                     return Ok(true);
                 }
                 JsImportName::InlineJs {
@@ -2818,7 +2818,7 @@ impl<'a> Context<'a> {
                         .inline_js_module_name(unique_crate_identifier, *snippet_idx_in_crate);
                     let import = self.module.imports.get_mut(id);
                     import.module = module;
-                    import.name = name.clone();
+                    import.name.clone_from(name);
                     return Ok(true);
                 }
 
@@ -4133,6 +4133,7 @@ impl ExportedClass {
         }
     }
 
+    #[allow(clippy::assigning_clones)] // Clippy's suggested fix doesn't work at MSRV.
     fn push_accessor_ts(
         &mut self,
         docs: &str,
diff --git a/crates/cli/tests/reference/add.wat b/crates/cli/tests/reference/add.wat
index 63ac9eae..b285488b 100644
--- a/crates/cli/tests/reference/add.wat
+++ b/crates/cli/tests/reference/add.wat
@@ -1,4 +1,4 @@
-(module
+(module $reference_test.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $add_u32 (;0;) (type 0) (param i32 i32) (result i32))
   (func $add_i32 (;1;) (type 0) (param i32 i32) (result i32))
diff --git a/crates/cli/tests/reference/anyref-empty.wat b/crates/cli/tests/reference/anyref-empty.wat
index cbea17aa..d8de8796 100644
--- a/crates/cli/tests/reference/anyref-empty.wat
+++ b/crates/cli/tests/reference/anyref-empty.wat
@@ -1,4 +1,4 @@
-(module
+(module $reference_test.wasm
   (type (;0;) (func))
   (import "./reference_test_bg.js" "__wbindgen_init_externref_table" (func (;0;) (type 0)))
   (table (;0;) 128 externref)
diff --git a/crates/cli/tests/reference/anyref-import-catch.wat b/crates/cli/tests/reference/anyref-import-catch.wat
index 16adbbe6..725fd35e 100644
--- a/crates/cli/tests/reference/anyref-import-catch.wat
+++ b/crates/cli/tests/reference/anyref-import-catch.wat
@@ -1,4 +1,4 @@
-(module
+(module $reference_test.wasm
   (type (;0;) (func))
   (type (;1;) (func (result i32)))
   (type (;2;) (func (param i32)))
diff --git a/crates/cli/tests/reference/anyref-nop.wat b/crates/cli/tests/reference/anyref-nop.wat
index eb547fdf..a410ecd9 100644
--- a/crates/cli/tests/reference/anyref-nop.wat
+++ b/crates/cli/tests/reference/anyref-nop.wat
@@ -1,4 +1,4 @@
-(module
+(module $reference_test.wasm
   (type (;0;) (func))
   (import "./reference_test_bg.js" "__wbindgen_init_externref_table" (func (;0;) (type 0)))
   (func $foo (;1;) (type 0))
diff --git a/crates/cli/tests/reference/builder.wat b/crates/cli/tests/reference/builder.wat
index c6761d48..0e9d738d 100644
--- a/crates/cli/tests/reference/builder.wat
+++ b/crates/cli/tests/reference/builder.wat
@@ -1,4 +1,4 @@
-(module
+(module $reference_test.wasm
   (type (;0;) (func (result i32)))
   (type (;1;) (func (param i32)))
   (func $classbuilder_builder (;0;) (type 0) (result i32))
diff --git a/crates/cli/tests/reference/constructor.wat b/crates/cli/tests/reference/constructor.wat
index bad14a1d..f6d7e3ba 100644
--- a/crates/cli/tests/reference/constructor.wat
+++ b/crates/cli/tests/reference/constructor.wat
@@ -1,4 +1,4 @@
-(module
+(module $reference_test.wasm
   (type (;0;) (func (result i32)))
   (type (;1;) (func (param i32)))
   (func $classconstructor_new (;0;) (type 0) (result i32))
diff --git a/crates/cli/tests/reference/empty.wat b/crates/cli/tests/reference/empty.wat
index 887f8cfa..78e51189 100644
--- a/crates/cli/tests/reference/empty.wat
+++ b/crates/cli/tests/reference/empty.wat
@@ -1,4 +1,4 @@
-(module
+(module $reference_test.wasm
   (memory (;0;) 16)
   (export "memory" (memory 0))
 )
diff --git a/crates/cli/tests/reference/enums.wat b/crates/cli/tests/reference/enums.wat
index 2cfcab37..4928e4e4 100644
--- a/crates/cli/tests/reference/enums.wat
+++ b/crates/cli/tests/reference/enums.wat
@@ -1,4 +1,4 @@
-(module
+(module $reference_test.wasm
   (type (;0;) (func (param i32) (result i32)))
   (func $enum_echo (;0;) (type 0) (param i32) (result i32))
   (func $option_enum_echo (;1;) (type 0) (param i32) (result i32))
diff --git a/crates/cli/tests/reference/import-catch.wat b/crates/cli/tests/reference/import-catch.wat
index 614e0b61..2c00b925 100644
--- a/crates/cli/tests/reference/import-catch.wat
+++ b/crates/cli/tests/reference/import-catch.wat
@@ -1,4 +1,4 @@
-(module
+(module $reference_test.wasm
   (type (;0;) (func (param i32)))
   (type (;1;) (func (param i32) (result i32)))
   (func $exported (;0;) (type 0) (param i32))
diff --git a/crates/cli/tests/reference/nop.wat b/crates/cli/tests/reference/nop.wat
index 82c51874..27e6124a 100644
--- a/crates/cli/tests/reference/nop.wat
+++ b/crates/cli/tests/reference/nop.wat
@@ -1,4 +1,4 @@
-(module
+(module $reference_test.wasm
   (type (;0;) (func))
   (func $nop (;0;) (type 0))
   (memory (;0;) 17)
diff --git a/crates/cli/tests/reference/pointers.wat b/crates/cli/tests/reference/pointers.wat
index e624bd83..a011881f 100644
--- a/crates/cli/tests/reference/pointers.wat
+++ b/crates/cli/tests/reference/pointers.wat
@@ -1,4 +1,4 @@
-(module
+(module $reference_test.wasm
   (type (;0;) (func (param i32) (result i32)))
   (func $const_pointer (;0;) (type 0) (param i32) (result i32))
   (func $mut_pointer (;1;) (type 0) (param i32) (result i32))
diff --git a/crates/cli/tests/reference/result-string.wat b/crates/cli/tests/reference/result-string.wat
index ff21a91d..c887f70d 100644
--- a/crates/cli/tests/reference/result-string.wat
+++ b/crates/cli/tests/reference/result-string.wat
@@ -1,4 +1,4 @@
-(module
+(module $reference_test.wasm
   (type (;0;) (func (param i32)))
   (type (;1;) (func (param i32) (result i32)))
   (type (;2;) (func (param i32 i32 i32)))
diff --git a/crates/cli/tests/reference/skip-jsdoc.wat b/crates/cli/tests/reference/skip-jsdoc.wat
index 31d66a20..c4e8b32b 100644
--- a/crates/cli/tests/reference/skip-jsdoc.wat
+++ b/crates/cli/tests/reference/skip-jsdoc.wat
@@ -1,4 +1,4 @@
-(module
+(module $reference_test.wasm
   (type (;0;) (func (param i32) (result i32)))
   (func $docme (;0;) (type 0) (param i32) (result i32))
   (memory (;0;) 17)
diff --git a/crates/cli/tests/reference/string-arg.wat b/crates/cli/tests/reference/string-arg.wat
index 120d0f15..759fe869 100644
--- a/crates/cli/tests/reference/string-arg.wat
+++ b/crates/cli/tests/reference/string-arg.wat
@@ -1,4 +1,4 @@
-(module
+(module $reference_test.wasm
   (type (;0;) (func (param i32 i32)))
   (type (;1;) (func (param i32 i32) (result i32)))
   (type (;2;) (func (param i32 i32 i32 i32) (result i32)))
diff --git a/tests/wasm/slice.rs b/tests/wasm/slice.rs
index 9f9066fe..15e9a9ac 100644
--- a/tests/wasm/slice.rs
+++ b/tests/wasm/slice.rs
@@ -233,6 +233,7 @@ impl ReturnVecApplication {
         ReturnVecApplication { thing }
     }
 
+    #[allow(clippy::assigning_clones)] // false positive, should be fixed by https://github.com/rust-lang/rust-clippy/pull/12756
     pub fn tick(&mut self) {
         self.thing = self.thing.clone();
     }