about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbjorn3 <17426603+bjorn3@users.noreply.github.com>2024-11-07 10:40:15 +0000
committerbjorn3 <17426603+bjorn3@users.noreply.github.com>2024-11-07 10:40:15 +0000
commitb71483b2a14a404932e1167d567468fefa43d27c (patch)
tree93957b51549a261ac9638c8b7a0e44c21321b8d6
parente7279c86be7f0ea2bb81690729966f25fb8ab462 (diff)
downloadrust-b71483b2a14a404932e1167d567468fefa43d27c.tar.gz
rust-b71483b2a14a404932e1167d567468fefa43d27c.zip
Rustup to rustc 1.84.0-nightly (854980293 2024-11-06)
-rw-r--r--patches/0022-coretests-Disable-not-compiling-tests.patch2
-rw-r--r--patches/0027-coretests-128bit-atomic-operations.patch2
-rw-r--r--rust-toolchain2
3 files changed, 3 insertions, 3 deletions
diff --git a/patches/0022-coretests-Disable-not-compiling-tests.patch b/patches/0022-coretests-Disable-not-compiling-tests.patch
index 6ed22c5a18e..1860810e7f3 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(bootstrap, feature(const_three_way_compare))]
  #![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 50a42aea322..59653c6e875 100644
--- a/patches/0027-coretests-128bit-atomic-operations.patch
+++ b/patches/0027-coretests-128bit-atomic-operations.patch
@@ -15,7 +15,7 @@ index 1e336bf..35e6f54 100644
 --- a/lib.rs
 +++ b/lib.rs
 @@ -2,7 +2,6 @@
- // tidy-alphabetical-start
+ #![cfg_attr(bootstrap, feature(const_three_way_compare))]
  #![cfg_attr(bootstrap, feature(strict_provenance))]
  #![cfg_attr(not(bootstrap), feature(strict_provenance_lints))]
 -#![cfg_attr(target_has_atomic = "128", feature(integer_atomics))]
diff --git a/rust-toolchain b/rust-toolchain
index 2f77f3326ae..af89725b72c 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1,4 +1,4 @@
 [toolchain]
-channel = "nightly-2024-11-03"
+channel = "nightly-2024-11-07"
 components = ["rust-src", "rustc-dev", "llvm-tools"]
 profile = "minimal"