From 72c85efc832d82a7784dce1036920a3e51707cdd Mon Sep 17 00:00:00 2001 From: Anton-4 <17049058+Anton-4@users.noreply.github.com> Date: Sat, 29 Apr 2023 19:56:44 +0200 Subject: [PATCH] switch to rust 1.67 --- .github/workflows/windows_release_build.yml | 4 ++-- .github/workflows/windows_tests.yml | 4 ++-- crates/compiler/build/src/link.rs | 2 +- crates/compiler/mono/src/ir.rs | 4 ++-- devtools/flake.lock | 4 ++-- examples/platform-switching/rust-platform/rust-toolchain.toml | 2 +- rust-toolchain.toml | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/windows_release_build.yml b/.github/workflows/windows_release_build.yml index 86cca232e1..a889900b0c 100644 --- a/.github/workflows/windows_release_build.yml +++ b/.github/workflows/windows_release_build.yml @@ -32,8 +32,8 @@ jobs: - name: zig version run: zig version - - name: install rust nightly 1.66 - run: rustup install nightly-2022-10-30 + - name: install rust nightly 1.67 + run: rustup install nightly-2022-12-09 - name: set up llvm 13 run: | diff --git a/.github/workflows/windows_tests.yml b/.github/workflows/windows_tests.yml index 9ccf82d3ea..2fe095b711 100644 --- a/.github/workflows/windows_tests.yml +++ b/.github/workflows/windows_tests.yml @@ -36,8 +36,8 @@ jobs: - name: zig version run: zig version - - name: install rust nightly 1.66 - run: rustup install nightly-2022-10-30 + - name: install rust nightly 1.67 + run: rustup install nightly-2022-12-09 - name: set up llvm 13 run: | diff --git a/crates/compiler/build/src/link.rs b/crates/compiler/build/src/link.rs index a48e57c173..575f88b408 100644 --- a/crates/compiler/build/src/link.rs +++ b/crates/compiler/build/src/link.rs @@ -530,7 +530,7 @@ pub fn rebuild_host( // on windows, we need the nightly toolchain so we can use `-Z export-executable-symbols` // using `+nightly` only works when running cargo through rustup let mut cmd = rustup(); - cmd.args(["run", "nightly-2022-10-30", "cargo"]); + cmd.args(["run", "nightly-2022-12-09", "cargo"]); cmd } else { diff --git a/crates/compiler/mono/src/ir.rs b/crates/compiler/mono/src/ir.rs index 49e89196ac..45686fae6c 100644 --- a/crates/compiler/mono/src/ir.rs +++ b/crates/compiler/mono/src/ir.rs @@ -74,8 +74,8 @@ roc_error_macros::assert_sizeof_wasm!(Call, 44); roc_error_macros::assert_sizeof_wasm!(CallType, 36); roc_error_macros::assert_sizeof_non_wasm!(Literal, 3 * 8); -roc_error_macros::assert_sizeof_non_wasm!(Expr, 9 * 8); -roc_error_macros::assert_sizeof_non_wasm!(Stmt, 12 * 8); +roc_error_macros::assert_sizeof_non_wasm!(Expr, 10 * 8); +roc_error_macros::assert_sizeof_non_wasm!(Stmt, 13 * 8); roc_error_macros::assert_sizeof_non_wasm!(ProcLayout, 5 * 8); roc_error_macros::assert_sizeof_non_wasm!(Call, 9 * 8); roc_error_macros::assert_sizeof_non_wasm!(CallType, 7 * 8); diff --git a/devtools/flake.lock b/devtools/flake.lock index dd655bc0b4..beb73d0808 100644 --- a/devtools/flake.lock +++ b/devtools/flake.lock @@ -115,8 +115,8 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1682761608, - "narHash": "sha256-+6tHbEK8GYDSCLasgawufSLegyJ0cqHV2nfmJICwzrk=", + "lastModified": 1682784625, + "narHash": "sha256-QUncKiwgpmHajo601NNHOjeUG2/vrGp1oMgxnPhq900=", "path": "/home/username/gitrepos/roc9/roc", "type": "path" }, diff --git a/examples/platform-switching/rust-platform/rust-toolchain.toml b/examples/platform-switching/rust-platform/rust-toolchain.toml index bfaab275a2..9e80c03829 100644 --- a/examples/platform-switching/rust-platform/rust-toolchain.toml +++ b/examples/platform-switching/rust-platform/rust-toolchain.toml @@ -1,5 +1,5 @@ [toolchain] -channel = "1.66.1" +channel = "1.67.1" profile = "default" diff --git a/rust-toolchain.toml b/rust-toolchain.toml index fd2c2a81d4..8a17faa5c3 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -9,9 +9,9 @@ # - update nightly-OLD_DATE in .github/workflows/windows_release_build.yml # - update nightly-OLD_DATE in crates/compiler/build/src/link.rs -channel = "1.66.1" # check ^^^ when changing this +channel = "1.67.1" # check ^^^ when changing this # -# channel = "nightly-2022-10-30" # 1.66.0 nightly to be able to use unstable features +# channel = "nightly-2022-12-09" # 1.67.0 nightly to be able to use unstable features profile = "default" components = [ # for usages of rust-analyzer or similar tools inside `nix develop`