Declare MSRV in Cargo.toml instead of rust-toolchain file

Having a `rust-toolchain` file forces rustup to download the defined toolchain version, effectively preventing developers from using the version they already have installed in case it doesn't match. Using the `rust-version` field in `Cargo.toml` is the proper way for declaring a minimum supported rust version in my opinion, and it works with rust toolchains not installed by rustup.
wasmerio · May 17, 2022 · c1095bd · c1095bd
1 parent 5e52b64
commit c1095bd
Show file tree

Hide file tree

Showing 35 changed files with 38 additions and 5 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -8,6 +8,7 @@ license = "MIT"
 edition = "2018"
 publish = false
 autoexamples = false
+rust-version = "1.59"
 
 [dependencies]
 wasmer = { version = "=2.2.1", path = "lib/api", default-features = false }

diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml
@@ -4,6 +4,7 @@ version = "0.0.0"
 authors = ["Automatically generated"]
 publish = false
 edition = "2018"
+rust-version = "1.59"
 
 [package.metadata]
 cargo-fuzz = true
@@ -61,4 +62,4 @@ required-features = ["dylib", "cranelift"]
 [[bin]]
 name = "deterministic"
 path = "fuzz_targets/deterministic.rs"
-required-features = ["universal", "dylib", "cranelift", "llvm", "singlepass"]
+required-features = ["universal", "dylib", "cranelift", "llvm", "singlepass"]
diff --git a/lib/api/Cargo.toml b/lib/api/Cargo.toml
@@ -9,6 +9,7 @@ repository = "https://github.com/wasmerio/wasmer"
 license = "MIT"
 readme = "README.md"
 edition = "2018"
+rust-version = "1.59"
 
 #####
 # This crate comes in 2 major flavors:

diff --git a/lib/artifact/Cargo.toml b/lib/artifact/Cargo.toml
@@ -9,6 +9,7 @@ repository = "https://github.com/wasmerio/wasmer"
 license = "MIT OR Apache-2.0 WITH LLVM-exception "
 readme = "README.md"
 edition = "2018"
+rust-version = "1.59"
 
 [dependencies]
 wasmer-types = { path = "../types", version = "=2.2.1" }

diff --git a/lib/c-api/Cargo.toml b/lib/c-api/Cargo.toml
@@ -10,6 +10,7 @@ documentation = "https://wasmerio.github.io/wasmer/c-api/"
 license = "MIT"
 readme = "README.md"
 edition = "2018"
+rust-version = "1.59"
 
 [lib]
 # The library name is `wasmer` so that we generate dylib like
@@ -101,4 +102,4 @@ native = ["dylib"]
 #emscripten = ["wasmer-emscripten"]
 
 [build-dependencies]
-cbindgen = "0.19"
+cbindgen = "0.19"
diff --git a/lib/cache/Cargo.toml b/lib/cache/Cargo.toml
@@ -9,6 +9,7 @@ repository = "https://github.com/wasmerio/wasmer"
 license = "MIT"
 readme = "README.md"
 edition = "2018"
+rust-version = "1.59"
 
 [dependencies]
 wasmer = { path = "../api", version = "=2.2.1", default-features = false}

diff --git a/lib/cli-compiler/Cargo.toml b/lib/cli-compiler/Cargo.toml
@@ -11,6 +11,7 @@ readme = "README.md"
 edition = "2018"
 default-run = "wasmer-compiler"
 build = "build.rs"
+rust-version = "1.59"
 
 [[bin]]
 name = "wasmer-compiler"

diff --git a/lib/cli/Cargo.toml b/lib/cli/Cargo.toml
@@ -11,6 +11,7 @@ readme = "README.md"
 edition = "2018"
 default-run = "wasmer"
 build = "build.rs"
+rust-version = "1.59"
 
 [[bin]]
 name = "wasmer"
@@ -119,4 +120,4 @@ headless-minimal = ["headless", "disable-all-logging", "wasi", "dylib", "univers
 
 # Deprecated features.
 jit = ["universal"]
-native = ["dylib"] 
+native = ["dylib"] 
diff --git a/lib/compiler-cranelift/Cargo.toml b/lib/compiler-cranelift/Cargo.toml
@@ -10,6 +10,7 @@ documentation = "https://docs.rs/wasmer-compiler-cranelift/"
 license = "MIT OR Apache-2.0 WITH LLVM-exception"
 readme = "README.md"
 edition = "2018"
+rust-version = "1.59"
 
 [dependencies]
 wasmer-compiler = { path = "../compiler", version = "=2.2.1", features = ["translator"], default-features = false }

diff --git a/lib/compiler-llvm/Cargo.toml b/lib/compiler-llvm/Cargo.toml
@@ -10,6 +10,7 @@ documentation = "https://docs.rs/wasmer-compiler-llvm/"
 license = "MIT"
 readme = "README.md"
 edition = "2018"
+rust-version = "1.59"
 
 [dependencies]
 wasmer-compiler = { path = "../compiler", version = "=2.2.1", features = [

diff --git a/lib/compiler-singlepass/Cargo.toml b/lib/compiler-singlepass/Cargo.toml
@@ -10,6 +10,7 @@ documentation = "https://docs.rs/wasmer-compiler-singlepass/"
 license = "MIT"
 readme = "README.md"
 edition = "2018"
+rust-version = "1.59"
 
 [dependencies]
 wasmer-compiler = { path = "../compiler", version = "=2.2.1", features = ["translator"], default-features = false }

diff --git a/lib/compiler/Cargo.toml b/lib/compiler/Cargo.toml
@@ -9,6 +9,7 @@ repository = "https://github.com/wasmerio/wasmer"
 license = "MIT OR Apache-2.0 WITH LLVM-exception"
 readme = "README.md"
 edition = "2018"
+rust-version = "1.59"
 
 [dependencies]
 wasmer-types = { path = "../types", version = "=2.2.1", default-features = false }

diff --git a/lib/derive/Cargo.toml b/lib/derive/Cargo.toml
@@ -6,6 +6,7 @@ authors = ["Wasmer Engineering Team <engineering@wasmer.io>"]
 repository = "https://github.com/wasmerio/wasmer"
 license = "MIT"
 edition = "2018"
+rust-version = "1.59"
 
 [lib]
 proc-macro = true

diff --git a/lib/emscripten/Cargo.toml b/lib/emscripten/Cargo.toml
@@ -9,6 +9,7 @@ repository = "https://github.com/wasmerio/wasmer"
 license = "MIT"
 readme = "README.md"
 edition = "2018"
+rust-version = "1.59"
 
 [dependencies]
 byteorder = "1.3"

diff --git a/lib/engine-dylib/Cargo.toml b/lib/engine-dylib/Cargo.toml
@@ -9,6 +9,7 @@ repository = "https://github.com/wasmerio/wasmer"
 license = "MIT"
 readme = "README.md"
 edition = "2018"
+rust-version = "1.59"
 
 [dependencies]
 wasmer-artifact = { path = "../artifact", version = "=2.2.1" }

diff --git a/lib/engine-staticlib/Cargo.toml b/lib/engine-staticlib/Cargo.toml
@@ -9,6 +9,7 @@ repository = "https://github.com/wasmerio/wasmer"
 license = "MIT"
 readme = "README.md"
 edition = "2018"
+rust-version = "1.59"
 
 [dependencies]
 wasmer-artifact = { path = "../artifact", version = "=2.2.1" }

diff --git a/lib/engine-universal/Cargo.toml b/lib/engine-universal/Cargo.toml
@@ -9,6 +9,7 @@ repository = "https://github.com/wasmerio/wasmer"
 license = "MIT OR Apache-2.0 WITH LLVM-exception "
 readme = "README.md"
 edition = "2018"
+rust-version = "1.59"
 
 [dependencies]
 wasmer-engine-universal-artifact = { path = "../universal-artifact", version = "=2.2.1", features = [

diff --git a/lib/engine/Cargo.toml b/lib/engine/Cargo.toml
@@ -9,6 +9,7 @@ repository = "https://github.com/wasmerio/wasmer"
 license = "MIT OR Apache-2.0 WITH LLVM-exception "
 readme = "README.md"
 edition = "2018"
+rust-version = "1.59"
 
 [dependencies]
 wasmer-types = { path = "../types", version = "=2.2.1" }

diff --git a/lib/middlewares/Cargo.toml b/lib/middlewares/Cargo.toml
@@ -9,6 +9,7 @@ keywords = ["webassembly", "wasm"]
 repository = "https://github.com/wasmerio/wasmer"
 readme = "README.md"
 edition = "2018"
+rust-version = "1.59"
 
 [dependencies]
 wasmer = { path = "../api", version = "=2.2.1", default-features = false, features = ["compiler"] }

diff --git a/lib/object/Cargo.toml b/lib/object/Cargo.toml
@@ -9,6 +9,7 @@ repository = "https://github.com/wasmerio/wasmer"
 license = "MIT"
 readme = "README.md"
 edition = "2018"
+rust-version = "1.59"
 
 [dependencies]
 wasmer-types = { path = "../types", version = "=2.2.1" }

diff --git a/lib/types/Cargo.toml b/lib/types/Cargo.toml
@@ -9,6 +9,7 @@ repository = "https://github.com/wasmerio/wasmer"
 license = "MIT OR Apache-2.0 WITH LLVM-exception"
 readme = "README.md"
 edition = "2018"
+rust-version = "1.59"
 
 [dependencies]
 serde = { version = "1.0", features = ["derive", "rc"], optional = true, default-features = false }

diff --git a/lib/universal-artifact/Cargo.toml b/lib/universal-artifact/Cargo.toml
@@ -9,6 +9,7 @@ repository = "https://github.com/wasmerio/wasmer"
 license = "MIT OR Apache-2.0 WITH LLVM-exception "
 readme = "README.md"
 edition = "2018"
+rust-version = "1.59"
 
 [dependencies]
 wasmer-artifact = { path = "../artifact", version = "=2.2.1" }

diff --git a/lib/vfs/Cargo.toml b/lib/vfs/Cargo.toml
@@ -5,6 +5,7 @@ description = "Wasmer Virtual FileSystem"
 authors = ["Wasmer Engineering Team <engineering@wasmer.io>"]
 license = "MIT"
 edition = "2018"
+rust-version = "1.59"
 
 [dependencies]
 libc = { version = "^0.2", default-features = false, optional = true }
@@ -22,4 +23,4 @@ enable-serde = [
     "serde",
     "typetag"
 ]
-no-time = []
+no-time = []
diff --git a/lib/vm/Cargo.toml b/lib/vm/Cargo.toml
@@ -9,6 +9,7 @@ repository = "https://github.com/wasmerio/wasmer"
 license = "MIT OR Apache-2.0 WITH LLVM-exception"
 readme = "README.md"
 edition = "2018"
+rust-version = "1.59"
 
 [dependencies]
 wasmer-types = { path = "../types", version = "=2.2.1" }

diff --git a/lib/wasi-experimental-io-devices/Cargo.toml b/lib/wasi-experimental-io-devices/Cargo.toml
@@ -9,6 +9,7 @@ repository = "https://github.com/wasmerio/wasmer"
 license = "MIT"
 readme = "README.md"
 edition = "2018"
+rust-version = "1.59"
 
 [badges]
 maintenance = { status = "experimental" }

diff --git a/lib/wasi-types/Cargo.toml b/lib/wasi-types/Cargo.toml
@@ -9,6 +9,7 @@ repository = "https://github.com/wasmerio/wasmer"
 license = "MIT"
 readme = "README.md"
 edition = "2018"
+rust-version = "1.59"
 
 [dependencies]
 wasmer-types = { path = "../types", version = "=2.2.1" }

diff --git a/lib/wasi/Cargo.toml b/lib/wasi/Cargo.toml
@@ -9,6 +9,7 @@ repository = "https://github.com/wasmerio/wasmer"
 license = "MIT"
 readme = "README.md"
 edition = "2018"
+rust-version = "1.59"
 
 [lib]
 crate-type = ["cdylib", "rlib"]

diff --git a/rust-toolchain b/rust-toolchain
diff --git a/tests/integration/cli/Cargo.toml b/tests/integration/cli/Cargo.toml
@@ -6,6 +6,7 @@ description = "CLI integration tests"
 repository = "https://github.com/wasmerio/wasmer"
 edition = "2018"
 publish = false
+rust-version = "1.59"
 
 [dependencies]
 anyhow = "1"

diff --git a/tests/integration/ios/Cargo.toml b/tests/integration/ios/Cargo.toml
@@ -6,3 +6,4 @@ description = "iOS integration tests"
 repository = "https://github.com/wasmerio/wasmer"
 edition = "2018"
 publish = false
+rust-version = "1.59"
diff --git a/tests/lib/compiler-test-derive/Cargo.toml b/tests/lib/compiler-test-derive/Cargo.toml
@@ -7,6 +7,7 @@ version = "0.0.1"
 authors = ["Wasmer Engineering <engineering@wasmer.io>"]
 edition = "2018"
 license = "MIT"
+rust-version = "1.59"
 
 description = "A macro to generate easily tests across compilers and engines"
 keywords = ["unsafe", "body", "fn", "safety", "hygiene"]

diff --git a/tests/lib/engine-dummy/Cargo.toml b/tests/lib/engine-dummy/Cargo.toml
@@ -6,6 +6,7 @@ description = "Wasmer placeholder engine"
 license = "MIT"
 edition = "2018"
 publish = false
+rust-version = "1.59"
 
 [dependencies]
 wasmer-artifact = { path = "../../../lib/artifact", version = "=2.2.1" }

diff --git a/tests/lib/test-generator/Cargo.toml b/tests/lib/test-generator/Cargo.toml
@@ -4,6 +4,7 @@ version = "0.1.0"
 edition = "2018"
 publish = false
 license = "Apache-2.0 WITH LLVM-exception"
+rust-version = "1.59"
 
 [dependencies]
 anyhow = "1.0"

diff --git a/tests/lib/wast/Cargo.toml b/tests/lib/wast/Cargo.toml
@@ -9,6 +9,7 @@ keywords = ["wasm", "webassembly"]
 repository = "https://github.com/wasmerio/wasmer"
 readme = "README.md"
 edition = "2018"
+rust-version = "1.59"
 
 [dependencies]
 anyhow = "1.0"

diff --git a/tests/wasi-wast/Cargo.toml b/tests/wasi-wast/Cargo.toml
@@ -6,6 +6,7 @@ license = "MIT"
 authors = ["Wasmer Engineering Team <engineering@wasmer.io>"]
 edition = "2018"
 publish = false
+rust-version = "1.59"
 
 [dependencies]
 glob = "0.3"