diff options
| author | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2024-10-24 09:16:08 +0000 |
|---|---|---|
| committer | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2024-10-24 09:16:08 +0000 |
| commit | 3f06952be310094145a12912836c50d44a97c29e (patch) | |
| tree | a389cecde95ae9f7a95d74a98cc27973f8868272 | |
| parent | 0093a4b92074239a4e8a29338286b7dabad3427b (diff) | |
| download | rust-3f06952be310094145a12912836c50d44a97c29e.tar.gz rust-3f06952be310094145a12912836c50d44a97c29e.zip | |
Rustup to rustc 1.84.0-nightly (4f2f477fd 2024-10-23)
| -rw-r--r-- | patches/0022-coretests-Disable-not-compiling-tests.patch | 4 | ||||
| -rw-r--r-- | patches/0027-coretests-128bit-atomic-operations.patch | 5 | ||||
| -rw-r--r-- | rust-toolchain | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/patches/0022-coretests-Disable-not-compiling-tests.patch b/patches/0022-coretests-Disable-not-compiling-tests.patch index 161173d4765..6ed22c5a18e 100644 --- a/patches/0022-coretests-Disable-not-compiling-tests.patch +++ b/patches/0022-coretests-Disable-not-compiling-tests.patch @@ -38,7 +38,7 @@ index 42a26ae..5ac1042 100644 @@ -1,3 +1,4 @@ +#![cfg(test)] // tidy-alphabetical-start - #![cfg_attr(target_has_atomic = "128", feature(integer_atomics))] - #![cfg_attr(test, feature(cfg_match))] + #![cfg_attr(bootstrap, feature(strict_provenance))] + #![cfg_attr(not(bootstrap), feature(strict_provenance_lints))] -- 2.21.0 (Apple Git-122) diff --git a/patches/0027-coretests-128bit-atomic-operations.patch b/patches/0027-coretests-128bit-atomic-operations.patch index 5f5baae2fd6..50a42aea322 100644 --- a/patches/0027-coretests-128bit-atomic-operations.patch +++ b/patches/0027-coretests-128bit-atomic-operations.patch @@ -14,9 +14,10 @@ diff --git a/lib.rs b/lib.rs index 1e336bf..35e6f54 100644 --- a/lib.rs +++ b/lib.rs -@@ -1,6 +1,5 @@ - #![cfg(test)] +@@ -2,7 +2,6 @@ // tidy-alphabetical-start + #![cfg_attr(bootstrap, feature(strict_provenance))] + #![cfg_attr(not(bootstrap), feature(strict_provenance_lints))] -#![cfg_attr(target_has_atomic = "128", feature(integer_atomics))] #![cfg_attr(test, feature(cfg_match))] #![feature(alloc_layout_extra)] diff --git a/rust-toolchain b/rust-toolchain index 79b24f20dd9..4eb104ed511 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1,4 +1,4 @@ [toolchain] -channel = "nightly-2024-10-20" +channel = "nightly-2024-10-24" components = ["rust-src", "rustc-dev", "llvm-tools"] profile = "minimal" |