Upgrade all crates to the Rust 2021 edition (#3991)

* Upgrade all crates to the Rust 2021 edition I've personally started using the new format strings for things like `panic!("some message {foo}")` or similar and have been upgrading crates on a case-by-case basis, but I think it probably makes more sense to go ahead and blanket upgrade everything so 2021 features are always available. * Fix compile of the C API * Fix a warning * Fix another warning
bytecodealliance · Apr 4, 2022 · 7b5176b · 7b5176b
1 parent f18dbe4
commit 7b5176b
Show file tree

Hide file tree

Showing 59 changed files with 60 additions and 58 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -9,7 +9,7 @@ categories = ["wasm"]
 keywords = ["webassembly", "wasm"]
 repository = "https://github.com/bytecodealliance/wasmtime"
 readme = "README.md"
-edition = "2018"
+edition = "2021"
 default-run = "wasmtime"
 
 [lib]

diff --git a/cranelift/Cargo.toml b/cranelift/Cargo.toml
@@ -7,7 +7,7 @@ license = "Apache-2.0 WITH LLVM-exception"
 documentation = "https://github.com/bytecodealliance/wasmtime/blob/main/cranelift/docs/index.md"
 repository = "https://github.com/bytecodealliance/wasmtime"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [[bin]]
 name = "clif-util"

diff --git a/cranelift/bforest/Cargo.toml b/cranelift/bforest/Cargo.toml
@@ -9,7 +9,7 @@ repository = "https://github.com/bytecodealliance/wasmtime"
 categories = ["no-std"]
 readme = "README.md"
 keywords = ["btree", "forest", "set", "map"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 cranelift-entity = { path = "../entity", version = "0.83.0", default-features = false }

diff --git a/cranelift/codegen/Cargo.toml b/cranelift/codegen/Cargo.toml
@@ -10,7 +10,7 @@ categories = ["no-std"]
 readme = "README.md"
 keywords = ["compile", "compiler", "jit"]
 build = "build.rs"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 cranelift-codegen-shared = { path = "./shared", version = "0.83.0" }

diff --git a/cranelift/codegen/meta/Cargo.toml b/cranelift/codegen/meta/Cargo.toml
@@ -6,7 +6,7 @@ description = "Metaprogram for cranelift-codegen code generator library"
 license = "Apache-2.0 WITH LLVM-exception"
 repository = "https://github.com/bytecodealliance/wasmtime"
 readme = "README.md"
-edition = "2018"
+edition = "2021"
 
 # FIXME(rust-lang/cargo#9300): uncomment once that lands
 # [package.metadata.docs.rs]

diff --git a/cranelift/codegen/shared/Cargo.toml b/cranelift/codegen/shared/Cargo.toml
@@ -6,7 +6,7 @@ description = "For code shared between cranelift-codegen-meta and cranelift-code
 license = "Apache-2.0 WITH LLVM-exception"
 repository = "https://github.com/bytecodealliance/wasmtime"
 readme = "README.md"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 # Since this is a shared dependency of several packages, please strive to keep this dependency-free

diff --git a/cranelift/entity/Cargo.toml b/cranelift/entity/Cargo.toml
@@ -9,7 +9,7 @@ repository = "https://github.com/bytecodealliance/wasmtime"
 categories = ["no-std"]
 readme = "README.md"
 keywords = ["entity", "set", "map"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 serde = { version = "1.0.94", features = ["derive"], optional = true }

diff --git a/cranelift/filetests/Cargo.toml b/cranelift/filetests/Cargo.toml
@@ -7,7 +7,7 @@ license = "Apache-2.0 WITH LLVM-exception"
 documentation = "https://docs.rs/cranelift-filetests"
 repository = "https://github.com/bytecodealliance/wasmtime"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 cranelift-codegen = { path = "../codegen", version = "0.83.0", features = ["testing_hooks"] }

diff --git a/cranelift/frontend/Cargo.toml b/cranelift/frontend/Cargo.toml
@@ -8,7 +8,7 @@ documentation = "https://docs.rs/cranelift-frontend"
 categories = ["no-std"]
 repository = "https://github.com/bytecodealliance/wasmtime"
 readme = "README.md"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 cranelift-codegen = { path = "../codegen", version = "0.83.0", default-features = false }

diff --git a/cranelift/fuzzgen/Cargo.toml b/cranelift/fuzzgen/Cargo.toml
@@ -6,7 +6,7 @@ description = "Cranelift module generator"
 license = "Apache-2.0 WITH LLVM-exception"
 repository = "https://github.com/bytecodealliance/wasmtime"
 readme = "README.md"
-edition = "2018"
+edition = "2021"
 publish = false
 
 

diff --git a/cranelift/interpreter/Cargo.toml b/cranelift/interpreter/Cargo.toml
@@ -8,7 +8,7 @@ documentation = "https://docs.rs/cranelift-interpreter"
 categories = ["no-std"]
 license = "Apache-2.0 WITH LLVM-exception"
 readme = "README.md"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 cranelift-codegen = { path = "../codegen", version = "0.83.0" }

diff --git a/cranelift/isle/fuzz/Cargo.toml b/cranelift/isle/fuzz/Cargo.toml
@@ -3,7 +3,7 @@ name = "isle-fuzz"
 version = "0.0.0"
 authors = ["Automatically generated"]
 publish = false
-edition = "2018"
+edition = "2021"
 
 [package.metadata]
 cargo-fuzz = true

diff --git a/cranelift/isle/isle/Cargo.toml b/cranelift/isle/isle/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 authors = ["The Cranelift Project Developers"]
 description = "ISLE: Instruction Selection and Lowering Expressions. A domain-specific language for instruction selection in Cranelift."
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0 WITH LLVM-exception"
 name = "cranelift-isle"
 readme = "../README.md"

diff --git a/cranelift/isle/islec/Cargo.toml b/cranelift/isle/islec/Cargo.toml
@@ -2,7 +2,7 @@
 name = "islec"
 version = "0.1.0"
 authors = ["The Cranelift Project Developers"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0 WITH LLVM-exception"
 publish = false
 

diff --git a/cranelift/jit/Cargo.toml b/cranelift/jit/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/bytecodealliance/wasmtime"
 documentation = "https://docs.rs/cranelift-jit"
 license = "Apache-2.0 WITH LLVM-exception"
 readme = "README.md"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 cranelift-module = { path = "../module", version = "0.83.0" }

diff --git a/cranelift/module/Cargo.toml b/cranelift/module/Cargo.toml
@@ -8,7 +8,7 @@ documentation = "https://docs.rs/cranelift-module"
 categories = ["no-std"]
 license = "Apache-2.0 WITH LLVM-exception"
 readme = "README.md"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 cranelift-codegen = { path = "../codegen", version = "0.83.0", default-features = false }

diff --git a/cranelift/native/Cargo.toml b/cranelift/native/Cargo.toml
@@ -8,7 +8,7 @@ repository = "https://github.com/bytecodealliance/wasmtime"
 categories = ["no-std"]
 license = "Apache-2.0 WITH LLVM-exception"
 readme = "README.md"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 cranelift-codegen = { path = "../codegen", version = "0.83.0", default-features = false }

diff --git a/cranelift/object/Cargo.toml b/cranelift/object/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/bytecodealliance/wasmtime"
 documentation = "https://docs.rs/cranelift-object"
 license = "Apache-2.0 WITH LLVM-exception"
 readme = "README.md"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 cranelift-module = { path = "../module", version = "0.83.0" }

diff --git a/cranelift/preopt/Cargo.toml b/cranelift/preopt/Cargo.toml
@@ -9,7 +9,7 @@ repository = "https://github.com/bytecodealliance/wasmtime"
 categories = ["no-std"]
 readme = "README.md"
 keywords = ["optimize", "compile", "compiler", "jit"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 cranelift-codegen = { path = "../codegen", version = "0.83.0", default-features = false }

diff --git a/cranelift/reader/Cargo.toml b/cranelift/reader/Cargo.toml
@@ -7,7 +7,7 @@ license = "Apache-2.0 WITH LLVM-exception"
 documentation = "https://docs.rs/cranelift-reader"
 repository = "https://github.com/bytecodealliance/wasmtime"
 readme = "README.md"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 cranelift-codegen = { path = "../codegen", version = "0.83.0" }

diff --git a/cranelift/serde/Cargo.toml b/cranelift/serde/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/bytecodealliance/wasmtime"
 license = "Apache-2.0 WITH LLVM-exception"
 readme = "README.md"
 keywords = ["webassembly", "serde"]
-edition = "2018"
+edition = "2021"
 
 [[bin]]
 name = "clif-json"

diff --git a/cranelift/umbrella/Cargo.toml b/cranelift/umbrella/Cargo.toml
@@ -9,7 +9,7 @@ repository = "https://github.com/bytecodealliance/wasmtime"
 categories = ["no-std"]
 readme = "README.md"
 keywords = ["compile", "compiler", "jit"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 cranelift-codegen = { path = "../codegen", version = "0.83.0", default-features = false }

diff --git a/cranelift/wasm/Cargo.toml b/cranelift/wasm/Cargo.toml
@@ -9,7 +9,7 @@ license = "Apache-2.0 WITH LLVM-exception"
 categories = ["no-std", "wasm"]
 readme = "README.md"
 keywords = ["webassembly", "wasm"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 wasmparser = { version = "0.83.0", default-features = false }

diff --git a/crates/bench-api/Cargo.toml b/crates/bench-api/Cargo.toml
@@ -6,7 +6,7 @@ description = "Exposes a benchmarking API for the Wasmtime runtime"
 license = "Apache-2.0 WITH LLVM-exception"
 repository = "https://github.com/bytecodealliance/wasmtime"
 readme = "README.md"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [lib]

diff --git a/crates/c-api/Cargo.toml b/crates/c-api/Cargo.toml
@@ -6,7 +6,7 @@ description = "C API to expose the Wasmtime runtime"
 license = "Apache-2.0 WITH LLVM-exception"
 repository = "https://github.com/bytecodealliance/wasmtime"
 readme = "README.md"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [lib]

diff --git a/crates/c-api/macros/Cargo.toml b/crates/c-api/macros/Cargo.toml
@@ -2,7 +2,7 @@
 name = "wasmtime-c-api-macros"
 version = "0.19.0"
 authors = ["The Wasmtime Project Developers"]
-edition = "2018"
+edition = "2021"
 publish = false
 
 [lib]

diff --git a/crates/c-api/src/func.rs b/crates/c-api/src/func.rs
@@ -104,6 +104,7 @@ pub unsafe extern "C" fn wasm_func_new_with_env(
 ) -> Box<wasm_func_t> {
     let finalizer = crate::ForeignData { data, finalizer };
     create_function(store, ty, move |params, results| {
+        drop(&finalizer); // move entire finalizer into this closure
         callback(finalizer.data, params, results)
     })
 }
@@ -233,6 +234,8 @@ pub(crate) unsafe fn c_callback_to_rust_fn(
 ) -> impl Fn(Caller<'_, crate::StoreData>, &[Val], &mut [Val]) -> Result<(), Trap> {
     let foreign = crate::ForeignData { data, finalizer };
     move |mut caller, params, results| {
+        drop(&foreign); // move entire foreign into this closure
+
         // Convert `params/results` to `wasmtime_val_t`. Use the previous
         // storage in `hostcall_val_storage` to help avoid allocations all the
         // time.
@@ -295,6 +298,7 @@ pub(crate) unsafe fn c_unchecked_callback_to_rust_fn(
 ) -> impl Fn(Caller<'_, crate::StoreData>, *mut ValRaw) -> Result<(), Trap> {
     let foreign = crate::ForeignData { data, finalizer };
     move |caller, values| {
+        drop(&foreign); // move entire foreign into this closure
         let mut caller = wasmtime_caller_t { caller };
         match callback(foreign.data, &mut caller, values) {
             None => Ok(()),

diff --git a/crates/cache/Cargo.toml b/crates/cache/Cargo.toml
@@ -6,7 +6,7 @@ description = "Support for automatic module caching with Wasmtime"
 license = "Apache-2.0 WITH LLVM-exception"
 repository = "https://github.com/bytecodealliance/wasmtime"
 documentation = "https://docs.rs/wasmtime-cache/"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 anyhow = "1.0"

diff --git a/crates/cache/src/worker.rs b/crates/cache/src/worker.rs
@@ -230,7 +230,6 @@ impl WorkerThread {
 
     #[cfg(target_os = "windows")]
     fn lower_thread_priority() {
-        use std::convert::TryInto;
         use winapi::um::processthreadsapi::{GetCurrentThread, SetThreadPriority};
         use winapi::um::winbase::THREAD_MODE_BACKGROUND_BEGIN;
 

diff --git a/crates/environ/Cargo.toml b/crates/environ/Cargo.toml
@@ -8,7 +8,7 @@ repository = "https://github.com/bytecodealliance/wasmtime"
 documentation = "https://docs.rs/wasmtime-environ/"
 categories = ["wasm"]
 keywords = ["webassembly", "wasm"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 anyhow = "1.0"

diff --git a/crates/fiber/Cargo.toml b/crates/fiber/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["The Wasmtime Project Developers"]
 description = "Fiber support for Wasmtime"
 license = "Apache-2.0 WITH LLVM-exception"
 repository = "https://github.com/bytecodealliance/wasmtime"
-edition = "2018"
+edition = "2021"
 
 # We link to some native code with symbols that don't change often, so let Cargo
 # know that we can't show up multiple times in a crate graph. If this is an

diff --git a/crates/fuzzing/Cargo.toml b/crates/fuzzing/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 authors = ["The Wasmtime Project Developers"]
 description = "Fuzzing infrastructure for Wasmtime"
-edition = "2018"
+edition = "2021"
 name = "wasmtime-fuzzing"
 publish = false
 version = "0.19.0"

diff --git a/crates/fuzzing/wasm-spec-interpreter/Cargo.toml b/crates/fuzzing/wasm-spec-interpreter/Cargo.toml
@@ -4,7 +4,7 @@ description = "A Rust-to-OCaml wrapper for the WebAssembly specification interpr
 name = "wasm-spec-interpreter"
 version = "0.1.0"
 publish = false
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0 WITH LLVM-exception"
 
 # Until https://gitlab.com/ocaml-rust/ocaml-boxroot/-/issues/1 is resolved and

diff --git a/crates/jit-debug/Cargo.toml b/crates/jit-debug/Cargo.toml
@@ -8,7 +8,7 @@ categories = ["development-tools::debugging"]
 keywords = ["gdb", "jit"]
 repository = "https://github.com/bytecodealliance/wasmtime"
 readme = "README.md"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 lazy_static = {version = "1.3.0", optional = true }

diff --git a/crates/jit/Cargo.toml b/crates/jit/Cargo.toml
@@ -8,7 +8,7 @@ license = "Apache-2.0 WITH LLVM-exception"
 categories = ["wasm"]
 keywords = ["webassembly", "wasm"]
 repository = "https://github.com/bytecodealliance/wasmtime"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 wasmtime-environ = { path = "../environ", version = "=0.36.0" }

diff --git a/crates/misc/run-examples/Cargo.toml b/crates/misc/run-examples/Cargo.toml
@@ -2,7 +2,7 @@
 name = "run-examples"
 version = "0.19.0"
 authors = ["The Wasmtime Project Developers"]
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]

diff --git a/crates/runtime/Cargo.toml b/crates/runtime/Cargo.toml
@@ -8,7 +8,7 @@ license = "Apache-2.0 WITH LLVM-exception"
 categories = ["wasm"]
 keywords = ["webassembly", "wasm"]
 repository = "https://github.com/bytecodealliance/wasmtime"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 wasmtime-environ = { path = "../environ", version = "=0.36.0" }

diff --git a/crates/test-programs/Cargo.toml b/crates/test-programs/Cargo.toml
@@ -3,7 +3,7 @@ name = "test-programs"
 version = "0.19.0"
 authors = ["The Wasmtime Project Developers"]
 readme = "README.md"
-edition = "2018"
+edition = "2021"
 publish = false
 license = "Apache-2.0 WITH LLVM-exception"
 

diff --git a/crates/test-programs/wasi-tests/Cargo.toml b/crates/test-programs/wasi-tests/Cargo.toml
@@ -3,7 +3,7 @@ name = "wasi-tests"
 version = "0.19.0"
 authors = ["The Wasmtime Project Developers"]
 readme = "README.md"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]

diff --git a/crates/types/Cargo.toml b/crates/types/Cargo.toml
@@ -6,7 +6,7 @@ description = "WebAssembly type definitions for Cranelift"
 license = "Apache-2.0 WITH LLVM-exception"
 repository = "https://github.com/bytecodealliance/wasmtime"
 documentation = "https://docs.rs/wasmtime-types"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 cranelift-entity = { path = "../../cranelift/entity", version = "0.83.0", features = ['enable-serde'] }

diff --git a/crates/wasi-common/Cargo.toml b/crates/wasi-common/Cargo.toml
@@ -8,7 +8,7 @@ categories = ["wasm"]
 keywords = ["webassembly", "wasm"]
 repository = "https://github.com/bytecodealliance/wasmtime"
 readme = "README.md"
-edition = "2018"
+edition = "2021"
 include = ["src/**/*", "WASI/phases/**/*", "README.md", "LICENSE", "build.rs"]
 build = "build.rs"
 

diff --git a/crates/wasi-common/cap-std-sync/Cargo.toml b/crates/wasi-common/cap-std-sync/Cargo.toml
@@ -8,7 +8,7 @@ categories = ["wasm"]
 keywords = ["webassembly", "wasm"]
 repository = "https://github.com/bytecodealliance/wasmtime"
 readme = "README.md"
-edition = "2018"
+edition = "2021"
 include = ["src/**/*", "README.md", "LICENSE" ]
 
 [dependencies]