Skip to content

Commit 4eabaf3

Browse files
committed
Rustup to rustc 1.73.0-nightly (0308df2 2023-07-21)
1 parent a8a722f commit 4eabaf3

File tree

5 files changed

+23
-14
lines changed

5 files changed

+23
-14
lines changed

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,18 @@ Cranelift doesn't support them yet
1010
library/core/tests/atomic.rs | 4 ---
1111
4 files changed, 4 insertions(+), 50 deletions(-)
1212

13+
diff --git a/lib.rs b/lib.rs
14+
index 897a5e9..331f66f 100644
15+
--- a/lib.rs
16+
+++ b/lib.rs
17+
@@ -93,7 +93,6 @@
18+
#![feature(const_option)]
19+
#![feature(const_option_ext)]
20+
#![feature(const_result)]
21+
-#![cfg_attr(target_has_atomic = "128", feature(integer_atomics))]
22+
#![feature(int_roundings)]
23+
#![feature(slice_group_by)]
24+
#![feature(split_array)]
1325
diff --git a/atomic.rs b/atomic.rs
1426
index b735957..ea728b6 100644
1527
--- a/atomic.rs

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

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ diff --git a/library/core/src/sync/atomic.rs b/library/core/src/sync/atomic.rs
3838
index d9de37e..8293fce 100644
3939
--- a/library/core/src/sync/atomic.rs
4040
+++ b/library/core/src/sync/atomic.rs
41-
@@ -2234,46 +2234,6 @@ atomic_int! {
42-
"AtomicU64::new(0)",
43-
u64 AtomicU64 ATOMIC_U64_INIT
41+
@@ -2996,42 +2996,6 @@ atomic_int! {
42+
8,
43+
u64 AtomicU64
4444
}
4545
-#[cfg(target_has_atomic_load_store = "128")]
4646
-atomic_int! {
@@ -53,14 +53,12 @@ index d9de37e..8293fce 100644
5353
- unstable(feature = "integer_atomics", issue = "99069"),
5454
- unstable(feature = "integer_atomics", issue = "99069"),
5555
- rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
56-
- unstable(feature = "integer_atomics", issue = "99069"),
5756
- cfg_attr(not(test), rustc_diagnostic_item = "AtomicI128"),
5857
- "i128",
5958
- "#![feature(integer_atomics)]\n\n",
6059
- atomic_min, atomic_max,
6160
- 16,
62-
- "AtomicI128::new(0)",
63-
- i128 AtomicI128 ATOMIC_I128_INIT
61+
- i128 AtomicI128
6462
-}
6563
-#[cfg(target_has_atomic_load_store = "128")]
6664
-atomic_int! {
@@ -73,16 +71,15 @@ index d9de37e..8293fce 100644
7371
- unstable(feature = "integer_atomics", issue = "99069"),
7472
- unstable(feature = "integer_atomics", issue = "99069"),
7573
- rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
76-
- unstable(feature = "integer_atomics", issue = "99069"),
7774
- cfg_attr(not(test), rustc_diagnostic_item = "AtomicU128"),
7875
- "u128",
7976
- "#![feature(integer_atomics)]\n\n",
8077
- atomic_umin, atomic_umax,
8178
- 16,
82-
- "AtomicU128::new(0)",
83-
- u128 AtomicU128 ATOMIC_U128_INIT
79+
- u128 AtomicU128
8480
-}
8581

82+
#[cfg(target_has_atomic_load_store = "ptr")]
8683
macro_rules! atomic_int_ptr_sized {
8784
( $($target_pointer_width:literal $align:literal)* ) => { $(
8885
--

patches/stdlib-lock.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,9 @@ dependencies = [
163163

164164
[[package]]
165165
name = "hermit-abi"
166-
version = "0.3.1"
166+
version = "0.3.2"
167167
source = "registry+https://github.com/rust-lang/crates.io-index"
168-
checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
168+
checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
169169
dependencies = [
170170
"compiler_builtins",
171171
"rustc-std-workspace-alloc",

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-2023-07-12"
2+
channel = "nightly-2023-07-22"
33
components = ["rust-src", "rustc-dev", "llvm-tools"]

src/driver/jit.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,9 @@ pub(crate) fn run_jit(tcx: TyCtxt<'_>, backend_config: BackendConfig) -> ! {
114114
.iter()
115115
.map(|cgu| cgu.items_in_deterministic_order(tcx).into_iter())
116116
.flatten()
117-
.collect::<FxHashMap<_, (_, _)>>()
117+
.collect::<FxHashMap<_, _>>()
118118
.into_iter()
119-
.collect::<Vec<(_, (_, _))>>();
119+
.collect::<Vec<(_, _)>>();
120120

121121
tcx.sess.time("codegen mono items", || {
122122
super::predefine_mono_items(tcx, &mut jit_module, &mono_items);

0 commit comments

Comments
 (0)