Skip to content

Commit 6816a8d

Browse files
Dylan-DPCDylan-DPC
authored
Rollup merge of rust-lang#99070 - tamird:update-tracking-issue, r=RalfJung
Update integer_atomics tracking issue Updates rust-lang#32976. Updates rust-lang#99069. r? `@RalfJung`
2 parents 50545d7 + a491d45 commit 6816a8d

File tree

3 files changed

+40
-40
lines changed

3 files changed

+40
-40
lines changed

‎compiler/rustc_codegen_cranelift/patches/0027-sysroot-128bit-atomic-operations.patch

+16-16
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ index 092b7cf..158cf71 100644
1919
#[stable(feature = "integer_atomics_stable", since = "1.34.0")]
2020
impl RefUnwindSafe for crate::sync::atomic::AtomicI64 {}
2121
-#[cfg(target_has_atomic_load_store = "128")]
22-
-#[unstable(feature = "integer_atomics", issue = "32976")]
22+
-#[unstable(feature = "integer_atomics", issue = "99069")]
2323
-impl RefUnwindSafe for crate::sync::atomic::AtomicI128 {}
2424

2525
#[cfg(target_has_atomic_load_store = "ptr")]
@@ -29,7 +29,7 @@ index 092b7cf..158cf71 100644
2929
#[stable(feature = "integer_atomics_stable", since = "1.34.0")]
3030
impl RefUnwindSafe for crate::sync::atomic::AtomicU64 {}
3131
-#[cfg(target_has_atomic_load_store = "128")]
32-
-#[unstable(feature = "integer_atomics", issue = "32976")]
32+
-#[unstable(feature = "integer_atomics", issue = "99069")]
3333
-impl RefUnwindSafe for crate::sync::atomic::AtomicU128 {}
3434

3535
#[cfg(target_has_atomic_load_store = "8")]
@@ -46,14 +46,14 @@ index d9de37e..8293fce 100644
4646
-atomic_int! {
4747
- cfg(target_has_atomic = "128"),
4848
- cfg(target_has_atomic_equal_alignment = "128"),
49-
- unstable(feature = "integer_atomics", issue = "32976"),
50-
- unstable(feature = "integer_atomics", issue = "32976"),
51-
- unstable(feature = "integer_atomics", issue = "32976"),
52-
- unstable(feature = "integer_atomics", issue = "32976"),
53-
- unstable(feature = "integer_atomics", issue = "32976"),
54-
- unstable(feature = "integer_atomics", issue = "32976"),
49+
- unstable(feature = "integer_atomics", issue = "99069"),
50+
- unstable(feature = "integer_atomics", issue = "99069"),
51+
- unstable(feature = "integer_atomics", issue = "99069"),
52+
- unstable(feature = "integer_atomics", issue = "99069"),
53+
- unstable(feature = "integer_atomics", issue = "99069"),
54+
- unstable(feature = "integer_atomics", issue = "99069"),
5555
- rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
56-
- unstable(feature = "integer_atomics", issue = "32976"),
56+
- unstable(feature = "integer_atomics", issue = "99069"),
5757
- cfg_attr(not(test), rustc_diagnostic_item = "AtomicI128"),
5858
- "i128",
5959
- "#![feature(integer_atomics)]\n\n",
@@ -66,14 +66,14 @@ index d9de37e..8293fce 100644
6666
-atomic_int! {
6767
- cfg(target_has_atomic = "128"),
6868
- cfg(target_has_atomic_equal_alignment = "128"),
69-
- unstable(feature = "integer_atomics", issue = "32976"),
70-
- unstable(feature = "integer_atomics", issue = "32976"),
71-
- unstable(feature = "integer_atomics", issue = "32976"),
72-
- unstable(feature = "integer_atomics", issue = "32976"),
73-
- unstable(feature = "integer_atomics", issue = "32976"),
74-
- unstable(feature = "integer_atomics", issue = "32976"),
69+
- unstable(feature = "integer_atomics", issue = "99069"),
70+
- unstable(feature = "integer_atomics", issue = "99069"),
71+
- unstable(feature = "integer_atomics", issue = "99069"),
72+
- unstable(feature = "integer_atomics", issue = "99069"),
73+
- unstable(feature = "integer_atomics", issue = "99069"),
74+
- unstable(feature = "integer_atomics", issue = "99069"),
7575
- rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
76-
- unstable(feature = "integer_atomics", issue = "32976"),
76+
- unstable(feature = "integer_atomics", issue = "99069"),
7777
- cfg_attr(not(test), rustc_diagnostic_item = "AtomicU128"),
7878
- "u128",
7979
- "#![feature(integer_atomics)]\n\n",

‎library/core/src/panic/unwind_safe.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ impl RefUnwindSafe for crate::sync::atomic::AtomicI32 {}
217217
#[stable(feature = "integer_atomics_stable", since = "1.34.0")]
218218
impl RefUnwindSafe for crate::sync::atomic::AtomicI64 {}
219219
#[cfg(target_has_atomic_load_store = "128")]
220-
#[unstable(feature = "integer_atomics", issue = "32976")]
220+
#[unstable(feature = "integer_atomics", issue = "99069")]
221221
impl RefUnwindSafe for crate::sync::atomic::AtomicI128 {}
222222

223223
#[cfg(target_has_atomic_load_store = "ptr")]
@@ -236,7 +236,7 @@ impl RefUnwindSafe for crate::sync::atomic::AtomicU32 {}
236236
#[stable(feature = "integer_atomics_stable", since = "1.34.0")]
237237
impl RefUnwindSafe for crate::sync::atomic::AtomicU64 {}
238238
#[cfg(target_has_atomic_load_store = "128")]
239-
#[unstable(feature = "integer_atomics", issue = "32976")]
239+
#[unstable(feature = "integer_atomics", issue = "99069")]
240240
impl RefUnwindSafe for crate::sync::atomic::AtomicU128 {}
241241

242242
#[cfg(target_has_atomic_load_store = "8")]

‎library/core/src/sync/atomic.rs

+22-22
Original file line numberDiff line numberDiff line change
@@ -2692,7 +2692,7 @@ atomic_int! {
26922692
stable(feature = "integer_atomics_stable", since = "1.34.0"),
26932693
stable(feature = "integer_atomics_stable", since = "1.34.0"),
26942694
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2695-
unstable(feature = "integer_atomics", issue = "32976"),
2695+
unstable(feature = "integer_atomics", issue = "99069"),
26962696
cfg_attr(not(test), rustc_diagnostic_item = "AtomicI8"),
26972697
"i8",
26982698
"",
@@ -2712,7 +2712,7 @@ atomic_int! {
27122712
stable(feature = "integer_atomics_stable", since = "1.34.0"),
27132713
stable(feature = "integer_atomics_stable", since = "1.34.0"),
27142714
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2715-
unstable(feature = "integer_atomics", issue = "32976"),
2715+
unstable(feature = "integer_atomics", issue = "99069"),
27162716
cfg_attr(not(test), rustc_diagnostic_item = "AtomicU8"),
27172717
"u8",
27182718
"",
@@ -2732,7 +2732,7 @@ atomic_int! {
27322732
stable(feature = "integer_atomics_stable", since = "1.34.0"),
27332733
stable(feature = "integer_atomics_stable", since = "1.34.0"),
27342734
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2735-
unstable(feature = "integer_atomics", issue = "32976"),
2735+
unstable(feature = "integer_atomics", issue = "99069"),
27362736
cfg_attr(not(test), rustc_diagnostic_item = "AtomicI16"),
27372737
"i16",
27382738
"",
@@ -2752,7 +2752,7 @@ atomic_int! {
27522752
stable(feature = "integer_atomics_stable", since = "1.34.0"),
27532753
stable(feature = "integer_atomics_stable", since = "1.34.0"),
27542754
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2755-
unstable(feature = "integer_atomics", issue = "32976"),
2755+
unstable(feature = "integer_atomics", issue = "99069"),
27562756
cfg_attr(not(test), rustc_diagnostic_item = "AtomicU16"),
27572757
"u16",
27582758
"",
@@ -2772,7 +2772,7 @@ atomic_int! {
27722772
stable(feature = "integer_atomics_stable", since = "1.34.0"),
27732773
stable(feature = "integer_atomics_stable", since = "1.34.0"),
27742774
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2775-
unstable(feature = "integer_atomics", issue = "32976"),
2775+
unstable(feature = "integer_atomics", issue = "99069"),
27762776
cfg_attr(not(test), rustc_diagnostic_item = "AtomicI32"),
27772777
"i32",
27782778
"",
@@ -2792,7 +2792,7 @@ atomic_int! {
27922792
stable(feature = "integer_atomics_stable", since = "1.34.0"),
27932793
stable(feature = "integer_atomics_stable", since = "1.34.0"),
27942794
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2795-
unstable(feature = "integer_atomics", issue = "32976"),
2795+
unstable(feature = "integer_atomics", issue = "99069"),
27962796
cfg_attr(not(test), rustc_diagnostic_item = "AtomicU32"),
27972797
"u32",
27982798
"",
@@ -2812,7 +2812,7 @@ atomic_int! {
28122812
stable(feature = "integer_atomics_stable", since = "1.34.0"),
28132813
stable(feature = "integer_atomics_stable", since = "1.34.0"),
28142814
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2815-
unstable(feature = "integer_atomics", issue = "32976"),
2815+
unstable(feature = "integer_atomics", issue = "99069"),
28162816
cfg_attr(not(test), rustc_diagnostic_item = "AtomicI64"),
28172817
"i64",
28182818
"",
@@ -2832,7 +2832,7 @@ atomic_int! {
28322832
stable(feature = "integer_atomics_stable", since = "1.34.0"),
28332833
stable(feature = "integer_atomics_stable", since = "1.34.0"),
28342834
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2835-
unstable(feature = "integer_atomics", issue = "32976"),
2835+
unstable(feature = "integer_atomics", issue = "99069"),
28362836
cfg_attr(not(test), rustc_diagnostic_item = "AtomicU64"),
28372837
"u64",
28382838
"",
@@ -2845,14 +2845,14 @@ atomic_int! {
28452845
atomic_int! {
28462846
cfg(target_has_atomic = "128"),
28472847
cfg(target_has_atomic_equal_alignment = "128"),
2848-
unstable(feature = "integer_atomics", issue = "32976"),
2849-
unstable(feature = "integer_atomics", issue = "32976"),
2850-
unstable(feature = "integer_atomics", issue = "32976"),
2851-
unstable(feature = "integer_atomics", issue = "32976"),
2852-
unstable(feature = "integer_atomics", issue = "32976"),
2853-
unstable(feature = "integer_atomics", issue = "32976"),
2848+
unstable(feature = "integer_atomics", issue = "99069"),
2849+
unstable(feature = "integer_atomics", issue = "99069"),
2850+
unstable(feature = "integer_atomics", issue = "99069"),
2851+
unstable(feature = "integer_atomics", issue = "99069"),
2852+
unstable(feature = "integer_atomics", issue = "99069"),
2853+
unstable(feature = "integer_atomics", issue = "99069"),
28542854
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2855-
unstable(feature = "integer_atomics", issue = "32976"),
2855+
unstable(feature = "integer_atomics", issue = "99069"),
28562856
cfg_attr(not(test), rustc_diagnostic_item = "AtomicI128"),
28572857
"i128",
28582858
"#![feature(integer_atomics)]\n\n",
@@ -2865,14 +2865,14 @@ atomic_int! {
28652865
atomic_int! {
28662866
cfg(target_has_atomic = "128"),
28672867
cfg(target_has_atomic_equal_alignment = "128"),
2868-
unstable(feature = "integer_atomics", issue = "32976"),
2869-
unstable(feature = "integer_atomics", issue = "32976"),
2870-
unstable(feature = "integer_atomics", issue = "32976"),
2871-
unstable(feature = "integer_atomics", issue = "32976"),
2872-
unstable(feature = "integer_atomics", issue = "32976"),
2873-
unstable(feature = "integer_atomics", issue = "32976"),
2868+
unstable(feature = "integer_atomics", issue = "99069"),
2869+
unstable(feature = "integer_atomics", issue = "99069"),
2870+
unstable(feature = "integer_atomics", issue = "99069"),
2871+
unstable(feature = "integer_atomics", issue = "99069"),
2872+
unstable(feature = "integer_atomics", issue = "99069"),
2873+
unstable(feature = "integer_atomics", issue = "99069"),
28742874
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2875-
unstable(feature = "integer_atomics", issue = "32976"),
2875+
unstable(feature = "integer_atomics", issue = "99069"),
28762876
cfg_attr(not(test), rustc_diagnostic_item = "AtomicU128"),
28772877
"u128",
28782878
"#![feature(integer_atomics)]\n\n",

0 commit comments

Comments
 (0)