diff options
| author | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2024-10-17 10:55:09 +0000 |
|---|---|---|
| committer | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2024-10-17 10:55:09 +0000 |
| commit | 47a7e994f2b7d8663b0559bc9327190fefe9e4ef (patch) | |
| tree | f45f12943e01aff8510ec6c215338c2989f28d50 | |
| parent | bf2da675c8b4dc94a9cace1866bc54942740eeae (diff) | |
| download | rust-47a7e994f2b7d8663b0559bc9327190fefe9e4ef.tar.gz rust-47a7e994f2b7d8663b0559bc9327190fefe9e4ef.zip | |
Rustup to rustc 1.84.0-nightly (798fb83f7 2024-10-16)
| -rw-r--r-- | patches/0022-coretests-Disable-not-compiling-tests.patch | 2 | ||||
| -rw-r--r-- | patches/0027-coretests-128bit-atomic-operations.patch | 2 | ||||
| -rw-r--r-- | patches/0028-coretests-Disable-long-running-tests.patch | 2 | ||||
| -rw-r--r-- | rust-toolchain | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/patches/0022-coretests-Disable-not-compiling-tests.patch b/patches/0022-coretests-Disable-not-compiling-tests.patch index 5117b04fd34..161173d4765 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_mut_refs))] #![cfg_attr(target_has_atomic = "128", feature(integer_atomics))] + #![cfg_attr(test, feature(cfg_match))] -- 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 efd721d9df8..5f5baae2fd6 100644 --- a/patches/0027-coretests-128bit-atomic-operations.patch +++ b/patches/0027-coretests-128bit-atomic-operations.patch @@ -17,10 +17,10 @@ index 1e336bf..35e6f54 100644 @@ -1,6 +1,5 @@ #![cfg(test)] // tidy-alphabetical-start - #![cfg_attr(bootstrap, feature(const_mut_refs))] -#![cfg_attr(target_has_atomic = "128", feature(integer_atomics))] #![cfg_attr(test, feature(cfg_match))] #![feature(alloc_layout_extra)] + #![feature(array_chunks)] diff --git a/atomic.rs b/atomic.rs index b735957..ea728b6 100644 --- a/atomic.rs diff --git a/patches/0028-coretests-Disable-long-running-tests.patch b/patches/0028-coretests-Disable-long-running-tests.patch index d7204add7a7..5009b24c9d0 100644 --- a/patches/0028-coretests-Disable-long-running-tests.patch +++ b/patches/0028-coretests-Disable-long-running-tests.patch @@ -12,7 +12,7 @@ index 8402833..84592e0 100644 --- a/slice.rs +++ b/slice.rs @@ -1809,6 +1809,7 @@ fn sort_unstable() { - assert!(v == [0xDEADBEEF]); + } } +/* diff --git a/rust-toolchain b/rust-toolchain index 775402b2b5e..0aa0f9e21cb 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1,4 +1,4 @@ [toolchain] -channel = "nightly-2024-10-10" +channel = "nightly-2024-10-17" components = ["rust-src", "rustc-dev", "llvm-tools"] profile = "minimal" |