From 3304de173fba5a23c979be40ca7a191b6876def1 Mon Sep 17 00:00:00 2001 From: Remco Kuijper Date: Sat, 12 Feb 2022 12:24:38 -0600 Subject: [PATCH] misc: bump Rust to 2021 edition --- crates/mun/Cargo.toml | 2 +- crates/mun_abi/Cargo.toml | 2 +- crates/mun_codegen/Cargo.toml | 2 +- crates/mun_codegen_macros/Cargo.toml | 2 +- crates/mun_compiler/Cargo.toml | 2 +- crates/mun_compiler_daemon/Cargo.toml | 2 +- crates/mun_diagnostics/Cargo.toml | 2 +- crates/mun_hir/Cargo.toml | 2 +- crates/mun_language_server/Cargo.toml | 2 +- crates/mun_libloader/Cargo.toml | 2 +- crates/mun_lld/Cargo.toml | 2 +- crates/mun_memory/Cargo.toml | 2 +- crates/mun_paths/Cargo.toml | 2 +- crates/mun_project/Cargo.toml | 2 +- crates/mun_runtime/Cargo.toml | 2 +- crates/mun_runtime/benches/wasm-sources/empty/Cargo.toml | 2 +- crates/mun_runtime/benches/wasm-sources/fibonacci/Cargo.toml | 2 +- crates/mun_runtime/src/lib.rs | 4 ++-- crates/mun_runtime_capi/Cargo.toml | 2 +- crates/mun_skeptic/Cargo.toml | 2 +- crates/mun_syntax/Cargo.toml | 2 +- crates/mun_target/Cargo.toml | 2 +- crates/mun_test/Cargo.toml | 2 +- crates/mun_vfs/Cargo.toml | 2 +- crates/tools/Cargo.toml | 2 +- 25 files changed, 26 insertions(+), 26 deletions(-) diff --git a/crates/mun/Cargo.toml b/crates/mun/Cargo.toml index c67d2e049..0ae834a46 100644 --- a/crates/mun/Cargo.toml +++ b/crates/mun/Cargo.toml @@ -2,7 +2,7 @@ name = "mun" version = "0.3.0" authors = ["The Mun Team "] -edition = "2018" +edition = "2021" description = "Command-line interface for compiling, monitoring and running Mun code" documentation = "https://docs.mun-lang.org/v0.3" readme = "README.md" diff --git a/crates/mun_abi/Cargo.toml b/crates/mun_abi/Cargo.toml index 5387cbeb7..aa468fb3c 100644 --- a/crates/mun_abi/Cargo.toml +++ b/crates/mun_abi/Cargo.toml @@ -2,7 +2,7 @@ name = "mun_abi" version = "0.3.0" authors = ["The Mun Team "] -edition = "2018" +edition = "2021" description = "Rust wrapper for the Mun ABI" documentation = "https://docs.mun-lang.org/v0.3" readme = "README.md" diff --git a/crates/mun_codegen/Cargo.toml b/crates/mun_codegen/Cargo.toml index 97c36c62d..cacc8b89f 100644 --- a/crates/mun_codegen/Cargo.toml +++ b/crates/mun_codegen/Cargo.toml @@ -2,7 +2,7 @@ name = "mun_codegen" version = "0.3.0" authors = ["The Mun Team "] -edition = "2018" +edition = "2021" description = "LLVM IR code generation for Mun" documentation = "https://docs.mun-lang.org/v0.3" readme = "README.md" diff --git a/crates/mun_codegen_macros/Cargo.toml b/crates/mun_codegen_macros/Cargo.toml index d088bb636..53432118a 100644 --- a/crates/mun_codegen_macros/Cargo.toml +++ b/crates/mun_codegen_macros/Cargo.toml @@ -2,7 +2,7 @@ name = "mun_codegen_macros" version = "0.1.0" authors = ["The Mun Team "] -edition = "2018" +edition = "2021" description = "Macros used by mun code generation" documentation = "https://docs.mun-lang.org/v0.3" readme = "README.md" diff --git a/crates/mun_compiler/Cargo.toml b/crates/mun_compiler/Cargo.toml index 8c6222a3a..e0b8cfa1e 100644 --- a/crates/mun_compiler/Cargo.toml +++ b/crates/mun_compiler/Cargo.toml @@ -2,7 +2,7 @@ name = "mun_compiler" version = "0.3.0" authors = ["The Mun Team "] -edition = "2018" +edition = "2021" description = "Binary compilation functionality for Mun" documentation = "https://docs.mun-lang.org/v0.3" readme = "README.md" diff --git a/crates/mun_compiler_daemon/Cargo.toml b/crates/mun_compiler_daemon/Cargo.toml index 079028d9b..fc81a1ad6 100644 --- a/crates/mun_compiler_daemon/Cargo.toml +++ b/crates/mun_compiler_daemon/Cargo.toml @@ -2,7 +2,7 @@ name = "mun_compiler_daemon" version = "0.3.0" authors = ["The Mun Team "] -edition = "2018" +edition = "2021" description = "Functionality for continuously monitoring Mun source files for changes and triggering recompilation" documentation = "https://docs.mun-lang.org/v0.3" readme = "README.md" diff --git a/crates/mun_diagnostics/Cargo.toml b/crates/mun_diagnostics/Cargo.toml index d22eccc5b..d7f49c89b 100644 --- a/crates/mun_diagnostics/Cargo.toml +++ b/crates/mun_diagnostics/Cargo.toml @@ -2,7 +2,7 @@ name = "mun_diagnostics" version = "0.1.0" authors = ["The Mun Team "] -edition = "2018" +edition = "2021" description = "Provides in-depth diagnostic information for compiler errors" documentation = "https://docs.mun-lang.org/v0.3" readme = "README.md" diff --git a/crates/mun_hir/Cargo.toml b/crates/mun_hir/Cargo.toml index 694bdccc8..401ce835f 100644 --- a/crates/mun_hir/Cargo.toml +++ b/crates/mun_hir/Cargo.toml @@ -2,7 +2,7 @@ name = "mun_hir" version = "0.3.0" authors = ["The Mun Team "] -edition = "2018" +edition = "2021" description = "Provides high-level intermediate representation of Mun code" documentation = "https://docs.mun-lang.org/v0.3" readme = "README.md" diff --git a/crates/mun_language_server/Cargo.toml b/crates/mun_language_server/Cargo.toml index 4f0035bae..1eaaa0c2c 100644 --- a/crates/mun_language_server/Cargo.toml +++ b/crates/mun_language_server/Cargo.toml @@ -2,7 +2,7 @@ name = "mun_language_server" version = "0.1.0" authors = ["The Mun Team "] -edition = "2018" +edition = "2021" description = "Provides a language server protocol server for the Mun language" documentation = "https://docs.mun-lang.org/v0.3" readme = "README.md" diff --git a/crates/mun_libloader/Cargo.toml b/crates/mun_libloader/Cargo.toml index 6eefe9b95..5eb93ae8e 100644 --- a/crates/mun_libloader/Cargo.toml +++ b/crates/mun_libloader/Cargo.toml @@ -2,7 +2,7 @@ name = "mun_libloader" version = "0.1.0" authors = ["The Mun Team "] -edition = "2018" +edition = "2021" description = "Functionality for loading Mun libraries" documentation = "https://docs.mun-lang.org/v0.3" readme = "README.md" diff --git a/crates/mun_lld/Cargo.toml b/crates/mun_lld/Cargo.toml index 43a09d149..418453741 100644 --- a/crates/mun_lld/Cargo.toml +++ b/crates/mun_lld/Cargo.toml @@ -2,7 +2,7 @@ name = "mun_lld" version = "110.0.0" authors = ["The Mun Team "] -edition = "2018" +edition = "2021" description = "Bindings for LLD used to link Mun binaries" documentation = "https://docs.mun-lang.org/v0.3" readme = "README.md" diff --git a/crates/mun_memory/Cargo.toml b/crates/mun_memory/Cargo.toml index 7021eec20..437015ad0 100644 --- a/crates/mun_memory/Cargo.toml +++ b/crates/mun_memory/Cargo.toml @@ -2,7 +2,7 @@ name = "mun_memory" version = "0.2.0" authors = ["The Mun Team "] -edition = "2018" +edition = "2021" description = "Memory management functionality for Mun" documentation = "https://docs.mun-lang.org/v0.3" readme = "README.md" diff --git a/crates/mun_paths/Cargo.toml b/crates/mun_paths/Cargo.toml index 96ee615dc..f8b21e2e6 100644 --- a/crates/mun_paths/Cargo.toml +++ b/crates/mun_paths/Cargo.toml @@ -2,7 +2,7 @@ name = "mun_paths" version = "0.1.0" authors = ["The Mun Team "] -edition = "2018" +edition = "2021" description = "Provides convenience structures for handling relative- and absolute paths" documentation = "https://docs.mun-lang.org/v0.3" readme = "README.md" diff --git a/crates/mun_project/Cargo.toml b/crates/mun_project/Cargo.toml index bf78b839b..8c445d3e0 100644 --- a/crates/mun_project/Cargo.toml +++ b/crates/mun_project/Cargo.toml @@ -2,7 +2,7 @@ name = "mun_project" version = "0.1.0" authors = ["The Mun Team "] -edition = "2018" +edition = "2021" description = "Provides convenience structures for Mun projects" documentation = "https://docs.mun-lang.org/v0.3" readme = "README.md" diff --git a/crates/mun_runtime/Cargo.toml b/crates/mun_runtime/Cargo.toml index f894e9a87..cf7d5b175 100644 --- a/crates/mun_runtime/Cargo.toml +++ b/crates/mun_runtime/Cargo.toml @@ -2,7 +2,7 @@ name = "mun_runtime" version = "0.3.0" authors = ["The Mun Team "] -edition = "2018" +edition = "2021" description = "A runtime for hot reloading and invoking Mun from Rust" documentation = "https://docs.mun-lang.org/v0.3" readme = "README.md" diff --git a/crates/mun_runtime/benches/wasm-sources/empty/Cargo.toml b/crates/mun_runtime/benches/wasm-sources/empty/Cargo.toml index 3a2be7129..f8c2a404b 100644 --- a/crates/mun_runtime/benches/wasm-sources/empty/Cargo.toml +++ b/crates/mun_runtime/benches/wasm-sources/empty/Cargo.toml @@ -2,7 +2,7 @@ name = "empty-wasm" version = "0.1.0" authors = ["The Mun Team "] -edition = "2018" +edition = "2021" homepage = "https://mun-lang.org" repository = "https://github.com/mun-lang/mun" license = "MIT OR Apache-2.0" diff --git a/crates/mun_runtime/benches/wasm-sources/fibonacci/Cargo.toml b/crates/mun_runtime/benches/wasm-sources/fibonacci/Cargo.toml index e569f5f5f..5f41637ca 100644 --- a/crates/mun_runtime/benches/wasm-sources/fibonacci/Cargo.toml +++ b/crates/mun_runtime/benches/wasm-sources/fibonacci/Cargo.toml @@ -2,7 +2,7 @@ name = "fibonacci-wasm" version = "0.1.0" authors = ["The Mun Team "] -edition = "2018" +edition = "2021" homepage = "https://mun-lang.org" repository = "https://github.com/mun-lang/mun" license = "MIT OR Apache-2.0" diff --git a/crates/mun_runtime/src/lib.rs b/crates/mun_runtime/src/lib.rs index 78bd25680..12d1b956a 100644 --- a/crates/mun_runtime/src/lib.rs +++ b/crates/mun_runtime/src/lib.rs @@ -537,7 +537,7 @@ pub trait InvokeArgs { // Implement `InvokeTraits` for tuples up to and including 20 elements seq_macro::seq!(N in 0..=20 {#( seq_macro::seq!(I in 0..N { - impl<'arg, #(T#I: ArgumentReflection + Marshal<'arg>,)*> InvokeArgs for (#(T#I,)*) { + impl<'arg, #(T #I: ArgumentReflection + Marshal<'arg>,)*> InvokeArgs for (#(T #I,)*) { #[allow(unused_variables)] fn can_invoke<'runtime>(&self, runtime: &'runtime Runtime, signature: &FunctionSignature) -> Result<(), String> { let arg_types = signature.arg_types(); @@ -565,7 +565,7 @@ seq_macro::seq!(I in 0..N { unsafe fn invoke(self, fn_ptr: *const c_void) -> ReturnType { #[allow(clippy::type_complexity)] - let function: fn(#(T#I::MunType,)*) -> ReturnType = core::mem::transmute(fn_ptr); + let function: fn(#(T #I::MunType,)*) -> ReturnType = core::mem::transmute(fn_ptr); function(#(self.I.marshal_into(),)*) } } diff --git a/crates/mun_runtime_capi/Cargo.toml b/crates/mun_runtime_capi/Cargo.toml index 50fcd0b74..cf42c4a00 100644 --- a/crates/mun_runtime_capi/Cargo.toml +++ b/crates/mun_runtime_capi/Cargo.toml @@ -2,7 +2,7 @@ name = "mun_runtime_capi" version = "0.3.0" authors = ["The Mun Team "] -edition = "2018" +edition = "2021" description = "Provides a C API for the Mun runtime" documentation = "https://docs.mun-lang.org/v0.3" readme = "README.md" diff --git a/crates/mun_skeptic/Cargo.toml b/crates/mun_skeptic/Cargo.toml index 6b7a090f5..6f1545b0c 100644 --- a/crates/mun_skeptic/Cargo.toml +++ b/crates/mun_skeptic/Cargo.toml @@ -2,7 +2,7 @@ name = "mun_skeptic" version = "0.1.0" authors = ["The Mun Team "] -edition = "2018" +edition = "2021" description = "Provides the ability to test Mun code snippets in an mdbook" documentation = "https://docs.mun-lang.org/v0.3" readme = "README.md" diff --git a/crates/mun_syntax/Cargo.toml b/crates/mun_syntax/Cargo.toml index 86ab1acb4..25e9cf327 100644 --- a/crates/mun_syntax/Cargo.toml +++ b/crates/mun_syntax/Cargo.toml @@ -2,7 +2,7 @@ name = "mun_syntax" version = "0.3.0" authors = ["The Mun Team "] -edition = "2018" +edition = "2021" description = "Parsing functionality for the Mun programming language" documentation = "https://docs.mun-lang.org/v0.3" readme = "README.md" diff --git a/crates/mun_target/Cargo.toml b/crates/mun_target/Cargo.toml index 426fbcd09..aa090e079 100644 --- a/crates/mun_target/Cargo.toml +++ b/crates/mun_target/Cargo.toml @@ -2,7 +2,7 @@ name = "mun_target" version = "0.3.0" authors = ["The Mun Team "] -edition = "2018" +edition = "2021" description = "Describes compilation targets for Mun" documentation = "https://docs.mun-lang.org/v0.3" readme = "README.md" diff --git a/crates/mun_test/Cargo.toml b/crates/mun_test/Cargo.toml index b01198b54..103e48316 100644 --- a/crates/mun_test/Cargo.toml +++ b/crates/mun_test/Cargo.toml @@ -2,7 +2,7 @@ name = "mun_test" version = "0.1.0" authors = ["The Mun Team "] -edition = "2018" +edition = "2021" description = "Functionality for testing Mun code" documentation = "https://docs.mun-lang.org/v0.3" readme = "README.md" diff --git a/crates/mun_vfs/Cargo.toml b/crates/mun_vfs/Cargo.toml index bade6fc1a..64af3fdd3 100644 --- a/crates/mun_vfs/Cargo.toml +++ b/crates/mun_vfs/Cargo.toml @@ -2,7 +2,7 @@ name = "mun_vfs" version = "0.1.0" authors = ["The Mun Team "] -edition = "2018" +edition = "2021" description = "Provides an in-memory filesystem" documentation = "https://docs.mun-lang.org/v0.3" readme = "README.md" diff --git a/crates/tools/Cargo.toml b/crates/tools/Cargo.toml index b0b5d28ea..8a0fe1eb8 100644 --- a/crates/tools/Cargo.toml +++ b/crates/tools/Cargo.toml @@ -2,7 +2,7 @@ name = "tools" version = "0.3.0" authors = ["The Mun Team "] -edition = "2018" +edition = "2021" [dependencies] teraron = "0.1.0"