diff options
| author | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2024-09-11 19:31:20 +0000 |
|---|---|---|
| committer | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2024-09-11 19:31:20 +0000 |
| commit | dcae9acda04cb94117adb7e41d8d3d0b472872b7 (patch) | |
| tree | 7fb462f56dbc14bf0e1df5de245e3f7e5a6e23f4 | |
| parent | 17bcb2ff4609f9af22c47e1d576757d8409ae91c (diff) | |
| download | rust-dcae9acda04cb94117adb7e41d8d3d0b472872b7.tar.gz rust-dcae9acda04cb94117adb7e41d8d3d0b472872b7.zip | |
Rustup to rustc 1.83.0-nightly (0ee7cb5e3 2024-09-10)
| -rw-r--r-- | patches/0022-coretests-Disable-not-compiling-tests.patch | 2 | ||||
| -rw-r--r-- | patches/0027-coretests-128bit-atomic-operations.patch | 3 | ||||
| -rw-r--r-- | patches/0030-stdlib-Add-missing-dbghelp-link-directive.patch | 24 | ||||
| -rw-r--r-- | rust-toolchain | 2 |
4 files changed, 3 insertions, 28 deletions
diff --git a/patches/0022-coretests-Disable-not-compiling-tests.patch b/patches/0022-coretests-Disable-not-compiling-tests.patch index 8c404956bcc..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(offset_of_nested))] #![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 d579c9588f0..5f5baae2fd6 100644 --- a/patches/0027-coretests-128bit-atomic-operations.patch +++ b/patches/0027-coretests-128bit-atomic-operations.patch @@ -14,10 +14,9 @@ diff --git a/lib.rs b/lib.rs index 1e336bf..35e6f54 100644 --- a/lib.rs +++ b/lib.rs -@@ -1,7 +1,6 @@ +@@ -1,6 +1,5 @@ #![cfg(test)] // tidy-alphabetical-start - #![cfg_attr(bootstrap, feature(offset_of_nested))] -#![cfg_attr(target_has_atomic = "128", feature(integer_atomics))] #![cfg_attr(test, feature(cfg_match))] #![feature(alloc_layout_extra)] diff --git a/patches/0030-stdlib-Add-missing-dbghelp-link-directive.patch b/patches/0030-stdlib-Add-missing-dbghelp-link-directive.patch deleted file mode 100644 index 67eebaf6da0..00000000000 --- a/patches/0030-stdlib-Add-missing-dbghelp-link-directive.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 95de09ace678555e65e1d92a3c7f5b5c46053e13 Mon Sep 17 00:00:00 2001 -From: bjorn3 <17426603+bjorn3@users.noreply.github.com> -Date: Wed, 11 Sep 2024 17:37:06 +0000 -Subject: [PATCH] Add missing dbghelp link directive - ---- - library/windows_targets/src/lib.rs | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/library/windows_targets/src/lib.rs b/library/windows_targets/src/lib.rs -index 1965b6c..fa45a1e 100644 ---- a/library/windows_targets/src/lib.rs -+++ b/library/windows_targets/src/lib.rs -@@ -35,6 +35,7 @@ pub macro link { - - #[cfg(not(feature = "windows_raw_dylib"))] - #[link(name = "advapi32")] -+#[link(name = "dbghelp")] - #[link(name = "ntdll")] - #[link(name = "userenv")] - #[link(name = "ws2_32")] --- -2.34.1 - diff --git a/rust-toolchain b/rust-toolchain index 0ac239c441f..d7e92479327 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1,4 +1,4 @@ [toolchain] -channel = "nightly-2024-09-03" +channel = "nightly-2024-09-11" components = ["rust-src", "rustc-dev", "llvm-tools"] profile = "minimal" |