Merge pull request #4434 from wasmerio/update-rust-toolchain

Update Rust toolchain to 1.73

.github/cross-linux-riscv64/Dockerfile

@@ -28,7 +28,7 @@ RUN apt-get update  && \
 # install rust tools
 RUN curl --proto "=https" --tlsv1.2 --retry 3 -sSfL https://sh.rustup.rs | sh -s -- -y
 ENV PATH="/root/.cargo/bin:${PATH}"
-RUN rustup -v toolchain install 1.70
+RUN rustup -v toolchain install 1.73
 # add docker the manual way
 COPY install_docker.sh /
 RUN /install_docker.sh
@@ -61,7 +61,7 @@ ENV CARGO_TARGET_RISCV64GC_UNKNOWN_LINUX_GNU_LINKER="$CROSS_TOOLCHAIN_PREFIX"gcc
     RUST_TEST_THREADS=1 \
     PKG_CONFIG_PATH="/usr/lib/riscv64-linux-gnu/pkgconfig/:${PKG_CONFIG_PATH}"
 
-RUN rustup target add riscv64gc-unknown-linux-gnu --toolchain 1.70-x86_64-unknown-linux-gnu
+RUN rustup target add riscv64gc-unknown-linux-gnu --toolchain 1.73-x86_64-unknown-linux-gnu
 
 #compile libssl-dev for riscv64!
 COPY build_openssl.sh /

.github/workflows/benchmark.yaml

@@ -7,7 +7,7 @@ on:
 
 env:
   CARGO_REGISTRIES_CRATES_IO_PROTOCOL: git
-  MSRV: "1.70"
+  MSRV: "1.73"
 
 jobs:
   run_benchmark:

.github/workflows/build.yml

@@ -3,7 +3,7 @@ name: Builds
 env:
   RUST_BACKTRACE: 1
   CARGO_REGISTRIES_CRATES_IO_PROTOCOL: git
-  MSRV: "1.70"
+  MSRV: "1.73"
 
 on:
   push:
@@ -98,11 +98,6 @@ jobs:
         with:
           toolchain: ${{ env.MSRV }}
           target: ${{ matrix.target }}
-      - name: Install Rust nightly (to build capi-headless)
-        uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: "nightly-2023-05-25"
-          target: ${{ matrix.metadata.target }}
       - uses: Swatinem/rust-cache@v2
         if: matrix.use_sccache != true
       - name: Install LLVM (macOS Apple Silicon)
@@ -226,7 +221,6 @@ jobs:
       - name: Install Nightly Rust for Headless
         uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: "nightly-2023-05-25"
           target: ${{ matrix.target }}
           components: "rust-src"
       - name: Build Minimal Wasmer Headless
@@ -244,7 +238,6 @@ jobs:
           echo "incremental = false" >> Cargo.toml
           echo "codegen-units = 1" >> Cargo.toml
           echo "rpath = false" >> Cargo.toml
-          rustup override set nightly-2023-05-25
           make build-wasmer-headless-minimal
           rustup override unset
       - name: Dist
@@ -278,11 +271,6 @@ jobs:
       - uses: dtolnay/rust-toolchain@stable
         with:
           target: x86_64-pc-windows-gnu
-      - name: Install Rust nightly (to build capi-headless)
-        uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: "nightly-2023-05-25"
-          target: x86_64-pc-windows-gnu
       - name: Install Windows-GNU target
         shell: bash
         run: |

.github/workflows/cloudcompiler.yaml

@@ -2,7 +2,7 @@ name: Release cloudcompiler.wasm
 
 env:
   RUST_BACKTRACE: 1
-  MSRV: "1.70"
+  MSRV: "1.73"
 
 on:
   push:

.github/workflows/documentation.yaml

@@ -8,7 +8,7 @@ on:
       - 'lib/**'
 
 env:
-  MSRV: "1.70"
+  MSRV: "1.73"
 
 jobs:
   documentation:

.github/workflows/test.yaml

@@ -24,7 +24,7 @@ env:
   # Rust, but it's not stable on 1.69 yet. By explicitly setting the protocol we
   # can override that behaviour
   CARGO_REGISTRIES_CRATES_IO_PROTOCOL: git
-  MSRV: "1.70"
+  MSRV: "1.73"
   NEXTEST_PROFILE: "ci"
 
 jobs:
@@ -161,7 +161,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: "nightly-2023-05-25"
+          toolchain: "nightly-2023-10-05"
           target: x86_64-unknown-linux-gnu
       - run: cargo install toml-cli # toml-cli is required to run `make test-build-docs-rs`
       - name: make test-build-docs-rs-ci
@@ -369,11 +369,6 @@ jobs:
         with:
           toolchain: ${{ env.MSRV }}
           target: ${{ matrix.metadata.target }}
-      - name: Install Rust nightly (to build capi-headless)
-        uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: "nightly-2023-05-25"
-          target: ${{ matrix.metadata.target }}
       - name: Install Nextest
         uses: taiki-e/install-action@nextest
       - name: Install Windows-GNU linker

Cargo.toml

@@ -81,7 +81,7 @@ edition = "2021"
 homepage = "https://wasmer.io/"
 license = "MIT"
 repository = "https://github.com/wasmerio/wasmer"
-rust-version = "1.70"
+rust-version = "1.73"
 version = "4.2.5"
 
 [workspace.dependencies]

Makefile

@@ -468,10 +468,10 @@ test-build-docs-rs-ci:
 		fi; \
 		printf "*** Building doc for package with manifest $$manifest_path ***\n\n"; \
 		if [ -z "$$features" ]; then \
-			RUSTDOCFLAGS="--cfg=docsrs" $(CARGO_BINARY) +nightly-2023-05-25 doc $(CARGO_TARGET_FLAG) --manifest-path "$$manifest_path" --no-deps --locked || exit 1; \
+			RUSTDOCFLAGS="--cfg=docsrs" $(CARGO_BINARY) +nightly-2023-10-05  doc $(CARGO_TARGET_FLAG) --manifest-path "$$manifest_path" --no-deps --locked || exit 1; \
 		else \
 			printf "Following features are inferred from Cargo.toml: $$features\n\n\n"; \
-			RUSTDOCFLAGS="--cfg=docsrs" $(CARGO_BINARY) +nightly-2023-05-25 doc $(CARGO_TARGET_FLAG) --manifest-path "$$manifest_path" --no-deps --features "$$features" --locked || exit 1; \
+			RUSTDOCFLAGS="--cfg=docsrs" $(CARGO_BINARY) +nightly-2023-10-05 doc $(CARGO_TARGET_FLAG) --manifest-path "$$manifest_path" --no-deps --features "$$features" --locked || exit 1; \
 		fi; \
 	done
 

lib/api/src/ptr.rs

@@ -259,10 +259,7 @@ unsafe impl<T: ValueType, M: MemorySize> ValueType for WasmPtr<T, M> {
 
 impl<T: ValueType, M: MemorySize> Clone for WasmPtr<T, M> {
     fn clone(&self) -> Self {
-        Self {
-            offset: self.offset,
-            _phantom: PhantomData,
-        }
+        *self
     }
 }
 

lib/api/src/sys/engine.rs

@@ -8,41 +8,35 @@ pub use wasmer_compiler::{
 use wasmer_types::Features;
 use wasmer_types::{DeserializeError, Target};
 
-/// Returns the default engine for the Sys engine
-pub(crate) fn default_engine() -> Engine {
-    // We store them on a function that returns to make
-    // sure this function doesn't emit a compile error even if
-    // more than one compiler is enabled.
-    #[allow(unreachable_code)]
-    #[cfg(any(feature = "cranelift", feature = "llvm", feature = "singlepass"))]
-    fn get_config() -> impl wasmer_compiler::CompilerConfig + 'static {
-        cfg_if::cfg_if! {
-            if #[cfg(feature = "cranelift")] {
-                wasmer_compiler_cranelift::Cranelift::default()
-            } else if #[cfg(feature = "llvm")] {
-                wasmer_compiler_llvm::LLVM::default()
-            } else if #[cfg(feature = "singlepass")] {
-                wasmer_compiler_singlepass::Singlepass::default()
-            } else {
-                compile_error!("No default compiler chosen")
-            }
+/// Get the default config for the sys Engine
+#[allow(unreachable_code)]
+pub fn get_default_compiler_config() -> Option<Box<dyn wasmer_compiler::CompilerConfig>> {
+    cfg_if::cfg_if! {
+        if #[cfg(feature = "cranelift")] {
+            Some(Box::<wasmer_compiler_cranelift::Cranelift>::default())
+        } else if #[cfg(feature = "llvm")] {
+            Some(Box::<wasmer_compiler_llvm::LLVM>::default())
+        } else if #[cfg(feature = "singlepass")] {
+            Some(Box::<wasmer_compiler_singlepass::Singlepass>::default())
+        }
+        else {
+            None
         }
     }
+}
 
+/// Returns the default engine for the Sys engine
+pub(crate) fn default_engine() -> Engine {
     #[allow(unreachable_code, unused_mut)]
     fn get_engine() -> Engine {
         cfg_if::cfg_if! {
             if #[cfg(feature = "compiler")] {
-                cfg_if::cfg_if! {
-                    if #[cfg(any(feature = "cranelift", feature = "llvm", feature = "singlepass"))]
-                    {
-                        let config = get_config();
-                        EngineBuilder::new(Box::new(config) as Box<dyn wasmer_compiler::CompilerConfig>)
-                            .engine()
-                    } else {
-                        EngineBuilder::headless()
-                            .engine()
-                    }
+                if let Some(config) = get_default_compiler_config() {
+                    EngineBuilder::new(config)
+                        .engine()
+                } else {
+                    EngineBuilder::headless()
+                        .engine()
                 }
             } else {
                 EngineBuilder::headless().engine()

lib/api/src/sys/externals/table.rs

@@ -120,7 +120,6 @@ impl Table {
                 "cross-`Store` table copies are not supported",
             ));
         }
-        let store = store;
         if dst_table.handle.internal_handle() == src_table.handle.internal_handle() {
             let table = dst_table.handle.get_mut(store.objects_mut());
             table.copy_within(dst_index, src_index, len)

lib/api/src/sys/mod.rs

@@ -8,7 +8,7 @@ pub(crate) mod module;
 pub(super) mod tunables;
 pub(crate) mod typed_function;
 
-pub use crate::sys::engine::NativeEngineExt;
+pub use crate::sys::engine::{get_default_compiler_config, NativeEngineExt};
 pub use crate::sys::tunables::BaseTunables;
 #[cfg(feature = "compiler")]
 pub use wasmer_compiler::{

lib/c-api/src/wasm_c_api/store.rs

@@ -1,11 +1,11 @@
 use super::engine::wasm_engine_t;
 use std::cell::UnsafeCell;
-use std::sync::Arc;
+use std::rc::Rc;
 use wasmer_api::{AsStoreMut, AsStoreRef, Store, StoreMut, StoreRef as BaseStoreRef};
 
 #[derive(Clone)]
 pub struct StoreRef {
-    inner: Arc<UnsafeCell<Store>>,
+    inner: Rc<UnsafeCell<Store>>,
 }
 
 impl StoreRef {
@@ -38,7 +38,7 @@ pub unsafe extern "C" fn wasm_store_new(
 
     Some(Box::new(wasm_store_t {
         inner: StoreRef {
-            inner: Arc::new(UnsafeCell::new(store)),
+            inner: Rc::new(UnsafeCell::new(store)),
         },
     }))
 }

lib/cli/src/commands/create_exe.rs

@@ -673,7 +673,7 @@ impl PrefixMapCompilation {
 
     fn split_prefix(s: &str) -> Vec<String> {
         let regex =
-            regex::Regex::new(r#"^([a-zA-Z0-9\-_]+)(:([a-zA-Z0-9\.\-_]+))?(:(.+*))?"#).unwrap();
+            regex::Regex::new(r"^([a-zA-Z0-9\-_]+)(:([a-zA-Z0-9\.\-_]+))?(:(.+*))?").unwrap();
         let mut captures = regex
             .captures(s.trim())
             .map(|c| {
@@ -1480,11 +1480,9 @@ fn generate_wasmer_main_c(
         .iter()
         .map(|v| utils::normalize_atom_name(&v.name).to_uppercase())
         .map(|uppercase| {
-            vec![
-                format!("extern size_t {uppercase}_LENGTH asm(\"{uppercase}_LENGTH\");"),
-                format!("extern char {uppercase}_DATA asm(\"{uppercase}_DATA\");"),
-            ]
-            .join("\r\n")
+            format!(
+                "extern size_t {uppercase}_LENGTH asm(\"{uppercase}_LENGTH\");\r\nextern char {uppercase}_DATA asm(\"{uppercase}_DATA\");"
+            )
         })
         .collect::<Vec<_>>();
 

lib/cli/src/commands/run/wasi.rs

@@ -561,7 +561,7 @@ impl Wasi {
         }
 
         if !self.no_tty {
-            let tty = Arc::new(SysTty::default());
+            let tty = Arc::new(SysTty);
             tty.reset();
             rt.set_tty(tty);
         }

lib/cli/src/store.rs

@@ -351,7 +351,7 @@ impl ToString for CompilerType {
     }
 }
 
-#[cfg(all(feature = "compiler"))]
+#[cfg(feature = "compiler")]
 impl StoreOptions {
     /// Gets the store for the host target, with the compiler name selected
     pub fn get_store(&self) -> Result<(Store, CompilerType)> {

lib/compiler-singlepass/src/codegen.rs

@@ -2998,7 +2998,7 @@ impl<'a, M: Machine> FuncGen<'a, M> {
                 self.release_locations_value(stack_depth)?;
                 self.value_stack.truncate(stack_depth);
                 self.fp_stack.truncate(fp_depth);
-                let mut frame = &mut self.control_stack.last_mut().unwrap();
+                let frame = &mut self.control_stack.last_mut().unwrap();
 
                 match frame.if_else {
                     IfElseState::If(label) => {