Skip to content

Commit

Permalink
Merge pull request #6632 from roc-lang/rust-1-73-0-update
Browse files Browse the repository at this point in the history
Rust 1.73.0 update
  • Loading branch information
Anton-4 authored Apr 8, 2024
2 parents 93884e3 + 62d39e8 commit ab0d626
Show file tree
Hide file tree
Showing 11 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/windows_release_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
run: zig version

- name: install rust nightly 1.72.0
run: rustup install nightly-2023-07-09
run: rustup install nightly-2023-08-20

- name: set up llvm 16
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/windows_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ jobs:
cd crates\compiler\builtins\bitcode\
zig build test
- name: install rust nightly 1.72.0
run: rustup install nightly-2023-07-09
- name: install rust nightly 1.73.0
run: rustup install nightly-2023-08-20

- name: set up llvm 16
run: |
Expand Down
2 changes: 1 addition & 1 deletion Earthfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

VERSION 0.6
FROM rust:1.72.1-slim-buster # make sure to update rust-toolchain.toml too so that everything uses the same rust version
FROM rust:1.73.0-slim-buster # make sure to update rust-toolchain.toml too so that everything uses the same rust version
WORKDIR /earthbuild

prep-debian:
Expand Down
2 changes: 1 addition & 1 deletion crates/compiler/build/src/link.rs
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,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-2023-07-09", "cargo"]);
cmd.args(["run", "nightly-2023-08-20", "cargo"]);

cmd
} else {
Expand Down
2 changes: 1 addition & 1 deletion crates/glue/src/RustGlue.roc
Original file line number Diff line number Diff line change
Expand Up @@ -2063,9 +2063,9 @@ fileHeader =
#![allow(clippy::missing_safety_doc)]
#![allow(clippy::let_and_return)]
#![allow(clippy::missing_safety_doc)]
#![allow(clippy::redundant_static_lifetimes)]
#![allow(clippy::needless_borrow)]
#![allow(clippy::clone_on_copy)]
#![allow(clippy::incorrect_partial_ord_impl_on_ord_type)]
Expand Down
2 changes: 1 addition & 1 deletion crates/glue/src/glue.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
#![allow(clippy::missing_safety_doc)]
#![allow(clippy::let_and_return)]
#![allow(clippy::missing_safety_doc)]
#![allow(clippy::redundant_static_lifetimes)]
#![allow(clippy::needless_borrow)]
#![allow(clippy::clone_on_copy)]
#![allow(clippy::incorrect_partial_ord_impl_on_ord_type)]

#[cfg(any(target_arch = "arm", target_arch = "wasm32", target_arch = "x86"))]
#[derive(Clone, Debug, Eq, Ord, Hash, PartialEq, PartialOrd)]
Expand Down
2 changes: 1 addition & 1 deletion crates/glue/src/roc_type/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
#![allow(clippy::missing_safety_doc)]
#![allow(clippy::let_and_return)]
#![allow(clippy::missing_safety_doc)]
#![allow(clippy::redundant_static_lifetimes)]
#![allow(clippy::needless_borrow)]
#![allow(clippy::clone_on_copy)]
#![allow(clippy::incorrect_partial_ord_impl_on_ord_type)]

#[cfg(any(
target_arch = "arm",
Expand Down
2 changes: 1 addition & 1 deletion examples/glue/rust-platform/rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[toolchain]
channel = "1.72.1"
channel = "1.73.0"

profile = "default"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[toolchain]
channel = "1.72.1"
channel = "1.73.0"

profile = "default"

Expand Down
18 changes: 9 additions & 9 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions rust-toolchain.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,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.72.1" # check ^^^ when changing this
channel = "1.73.0" # check ^^^ when changing this
#
# channel = "nightly-2023-07-09" # 1.72.0 nightly to be able to use unstable features
# channel = "nightly-2023-08-20" # 1.73.0 nightly to be able to use unstable features
profile = "default"
components = [
# for usages of rust-analyzer or similar tools inside `nix develop`
Expand Down

0 comments on commit ab0d626

Please sign in to comment.