Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit f606a58

Browse files
committed
Rustup to rustc 1.60.0-nightly (09cb29c 2022-02-15)
1 parent 4563abd commit f606a58

File tree

4 files changed

+5
-38
lines changed

4 files changed

+5
-38
lines changed

build_sysroot/Cargo.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build_system/prepare.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ fn prepare_sysroot() {
9292
clone_repo(
9393
"build_sysroot/compiler-builtins",
9494
"https://github.com/rust-lang/compiler-builtins.git",
95-
"0.1.68",
95+
"0.1.70",
9696
);
9797
apply_patches("compiler-builtins", Path::new("build_sysroot/compiler-builtins"));
9898
}

patches/0027-sysroot-128bit-atomic-operations.patch

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ Cranelift doesn't support them yet
88
library/core/src/panic/unwind_safe.rs | 6 -----
99
library/core/src/sync/atomic.rs | 38 ---------------------------
1010
library/core/tests/atomic.rs | 4 ---
11-
library/std/src/time/monotonic.rs | 6 +++--
1211
4 files changed, 4 insertions(+), 50 deletions(-)
1312

1413
diff --git a/library/core/src/panic/unwind_safe.rs b/library/core/src/panic/unwind_safe.rs
@@ -99,38 +98,6 @@ index b735957..ea728b6 100644
9998
#[cfg(target_has_atomic = "ptr")]
10099
assert_eq!(align_of::<AtomicUsize>(), size_of::<AtomicUsize>());
101100
#[cfg(target_has_atomic = "ptr")]
102-
diff --git a/library/std/src/time/monotonic.rs b/library/std/src/time/monotonic.rs
103-
index fa96b7a..2854f9c 100644
104-
--- a/library/std/src/time/monotonic.rs
105-
+++ b/library/std/src/time/monotonic.rs
106-
@@ -5,7 +5,7 @@ pub(super) fn monotonize(raw: time::Instant) -> time::Instant {
107-
inner::monotonize(raw)
108-
}
109-
110-
-#[cfg(any(all(target_has_atomic = "64", not(target_has_atomic = "128")), target_arch = "aarch64"))]
111-
+#[cfg(target_has_atomic = "64")]
112-
pub mod inner {
113-
use crate::sync::atomic::AtomicU64;
114-
use crate::sync::atomic::Ordering::*;
115-
@@ -70,6 +70,7 @@ pub mod inner {
116-
}
117-
}
118-
119-
+/*
120-
#[cfg(all(target_has_atomic = "128", not(target_arch = "aarch64")))]
121-
pub mod inner {
122-
use crate::sync::atomic::AtomicU128;
123-
@@ -94,8 +95,9 @@ pub mod inner {
124-
ZERO.checked_add_duration(&Duration::new(secs, nanos)).unwrap()
125-
}
126-
}
127-
+*/
128-
129-
-#[cfg(not(any(target_has_atomic = "64", target_has_atomic = "128")))]
130-
+#[cfg(not(target_has_atomic = "64"))]
131-
pub mod inner {
132-
use crate::cmp;
133-
use crate::sys::time;
134101
--
135102
2.26.2.7.g19db9cfb68
136103

rust-toolchain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[toolchain]
2-
channel = "nightly-2022-02-13"
2+
channel = "nightly-2022-02-16"
33
components = ["rust-src", "rustc-dev", "llvm-tools-preview"]

0 commit comments

Comments
 (0)