Skip to content

Commit 28701aa

Browse files
committed
Sync from rust 759e07f
2 parents 616abf1 + 988f49d commit 28701aa

File tree

4 files changed

+11
-10
lines changed

4 files changed

+11
-10
lines changed

Diff for: example/mini_core.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ impl<T: ?Sized + Unsize<U>, U: ?Sized> DispatchFromDyn<*const U> for *const T {}
4747
impl<T: ?Sized + Unsize<U>, U: ?Sized> DispatchFromDyn<*mut U> for *mut T {}
4848
impl<T: ?Sized + Unsize<U>, U: ?Sized> DispatchFromDyn<Box<U>> for Box<T> {}
4949

50-
#[lang = "receiver"]
51-
pub trait Receiver {}
50+
#[lang = "legacy_receiver"]
51+
pub trait LegacyReceiver {}
5252

53-
impl<T: ?Sized> Receiver for &T {}
54-
impl<T: ?Sized> Receiver for &mut T {}
55-
impl<T: ?Sized> Receiver for Box<T> {}
53+
impl<T: ?Sized> LegacyReceiver for &T {}
54+
impl<T: ?Sized> LegacyReceiver for &mut T {}
55+
impl<T: ?Sized> LegacyReceiver for Box<T> {}
5656

5757
#[lang = "copy"]
5858
pub unsafe trait Copy {}

Diff for: patches/0027-stdlib-128bit-atomic-operations.patch

+5-3
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ 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-
@@ -2996,42 +2996,6 @@ atomic_int! {
41+
@@ -2996,44 +2996,6 @@ atomic_int! {
4242
8,
4343
u64 AtomicU64
4444
}
@@ -52,7 +52,8 @@ index d9de37e..8293fce 100644
5252
- unstable(feature = "integer_atomics", issue = "99069"),
5353
- unstable(feature = "integer_atomics", issue = "99069"),
5454
- unstable(feature = "integer_atomics", issue = "99069"),
55-
- rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
55+
- rustc_const_unstable(feature = "integer_atomics", issue = "99069"),
56+
- rustc_const_unstable(feature = "integer_atomics", issue = "99069"),
5657
- cfg_attr(not(test), rustc_diagnostic_item = "AtomicI128"),
5758
- "i128",
5859
- "#![feature(integer_atomics)]\n\n",
@@ -70,7 +71,8 @@ index d9de37e..8293fce 100644
7071
- unstable(feature = "integer_atomics", issue = "99069"),
7172
- unstable(feature = "integer_atomics", issue = "99069"),
7273
- unstable(feature = "integer_atomics", issue = "99069"),
73-
- rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
74+
- rustc_const_unstable(feature = "integer_atomics", issue = "99069"),
75+
- rustc_const_unstable(feature = "integer_atomics", issue = "99069"),
7476
- cfg_attr(not(test), rustc_diagnostic_item = "AtomicU128"),
7577
- "u128",
7678
- "#![feature(integer_atomics)]\n\n",

Diff for: src/abi/comments.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ pub(super) fn add_local_place_comments<'tcx>(
7979
return;
8080
}
8181
let TyAndLayout { ty, layout } = place.layout();
82-
let rustc_target::abi::LayoutS { size, align, .. } = layout.0.0;
82+
let rustc_abi::LayoutData { size, align, .. } = layout.0.0;
8383

8484
let (kind, extra) = place.debug_comment();
8585

Diff for: src/debuginfo/mod.rs

-1
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,6 @@ impl DebugContext {
211211
type_names::push_generic_params(
212212
tcx,
213213
tcx.normalize_erasing_regions(ty::ParamEnv::reveal_all(), args),
214-
enclosing_fn_def_id,
215214
&mut name,
216215
);
217216

0 commit comments

Comments
 (0)