diff --git a/.github/cross-linux-riscv64/Dockerfile b/.github/cross-linux-riscv64/Dockerfile index 887dcc69978..7ab4118cee5 100644 --- a/.github/cross-linux-riscv64/Dockerfile +++ b/.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.90 +RUN rustup -v toolchain install 1.91 # 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.90-x86_64-unknown-linux-gnu +RUN rustup target add riscv64gc-unknown-linux-gnu --toolchain 1.91-x86_64-unknown-linux-gnu # quickly install cargo nextest by using pre-built binary RUN curl -LsSf https://get.nexte.st/latest/linux | tar zxf - -C ${CARGO_HOME:-~/.cargo}/bin diff --git a/.github/workflows/benchmark.yaml b/.github/workflows/benchmark.yaml index 475c3bd2617..f0571978fbf 100644 --- a/.github/workflows/benchmark.yaml +++ b/.github/workflows/benchmark.yaml @@ -7,7 +7,7 @@ on: env: CARGO_REGISTRIES_CRATES_IO_PROTOCOL: git - MSRV: "1.90" + MSRV: "1.91" jobs: run_benchmark: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bc0bd0c1801..6a3fdc61fc4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,7 +3,7 @@ name: Builds env: RUST_BACKTRACE: 1 CARGO_REGISTRIES_CRATES_IO_PROTOCOL: git - MSRV: "1.90" + MSRV: "1.91" on: push: diff --git a/.github/workflows/cloudcompiler.yaml b/.github/workflows/cloudcompiler.yaml index 535efd1dd85..9c4969f37c6 100644 --- a/.github/workflows/cloudcompiler.yaml +++ b/.github/workflows/cloudcompiler.yaml @@ -2,7 +2,7 @@ name: Release cloudcompiler.wasm env: RUST_BACKTRACE: 1 - MSRV: "1.90" + MSRV: "1.91" on: push: diff --git a/.github/workflows/documentation.yaml b/.github/workflows/documentation.yaml index 80614933ca2..079ab014ddb 100644 --- a/.github/workflows/documentation.yaml +++ b/.github/workflows/documentation.yaml @@ -8,7 +8,7 @@ on: - "lib/**" env: - MSRV: "1.90" + MSRV: "1.91" jobs: documentation: diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 523292c959a..6328ade13bc 100644 --- a/.github/workflows/test.yaml +++ b/.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.90" + MSRV: "1.91" NEXTEST_PROFILE: "ci" RUSTUP_WINDOWS_PATH_ADD_BIN: 1 WASI_SDK_VERSION: "22" diff --git a/Cargo.toml b/Cargo.toml index 9750ebbc5fc..8d4a946fa71 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -80,7 +80,7 @@ edition = "2024" homepage = "https://wasmer.io/" license = "MIT" repository = "https://github.com/wasmerio/wasmer" -rust-version = "1.90" +rust-version = "1.91" version = "7.0.0-alpha.2" [workspace.dependencies] diff --git a/lib/virtual-fs/src/mem_fs/filesystem.rs b/lib/virtual-fs/src/mem_fs/filesystem.rs index a3e5c250a9d..745e7cc9771 100644 --- a/lib/virtual-fs/src/mem_fs/filesystem.rs +++ b/lib/virtual-fs/src/mem_fs/filesystem.rs @@ -1769,7 +1769,7 @@ mod test_filesystem { path, metadata: Ok(Metadata { ft, .. }), })) - if path == path!(buf "/foo") && ft.is_dir() + if path.as_path() == path!("/foo") && ft.is_dir() ), "checking entry #1", ); @@ -1780,7 +1780,7 @@ mod test_filesystem { path, metadata: Ok(Metadata { ft, .. }), })) - if path == path!(buf "/bar") && ft.is_dir() + if path.as_path() == path!("/bar") && ft.is_dir() ), "checking entry #2", ); @@ -1791,7 +1791,7 @@ mod test_filesystem { path, metadata: Ok(Metadata { ft, .. }), })) - if path == path!(buf "/baz") && ft.is_dir() + if path.as_path() == path!("/baz") && ft.is_dir() ), "checking entry #3", ); @@ -1802,7 +1802,7 @@ mod test_filesystem { path, metadata: Ok(Metadata { ft, .. }), })) - if path == path!(buf "/a.txt") && ft.is_file() + if path.as_path() == path!("/a.txt") && ft.is_file() ), "checking entry #4", ); @@ -1813,7 +1813,7 @@ mod test_filesystem { path, metadata: Ok(Metadata { ft, .. }), })) - if path == path!(buf "/b.txt") && ft.is_file() + if path.as_path() == path!("/b.txt") && ft.is_file() ), "checking entry #5", ); diff --git a/rust-toolchain b/rust-toolchain index e87fb34ea9f..0573181b967 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -1.90 +1.91