diff options
| author | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2024-10-31 09:20:43 +0000 |
|---|---|---|
| committer | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2024-10-31 09:20:43 +0000 |
| commit | 28701aa46d5176fbd43f97781c961003832681e0 (patch) | |
| tree | c34cb520077fcc3d1753376c94ac3c0a4ded1634 | |
| parent | 616abf15d9690d29fa62abbfe70c4139b85f4c50 (diff) | |
| parent | 988f49d04f0d9811aee75c4d54e8fe8f21835ca6 (diff) | |
| download | rust-28701aa46d5176fbd43f97781c961003832681e0.tar.gz rust-28701aa46d5176fbd43f97781c961003832681e0.zip | |
Sync from rust 759e07f063fb8e6306ff1bdaeb70af56a878b415
| -rw-r--r-- | example/mini_core.rs | 10 | ||||
| -rw-r--r-- | patches/0027-stdlib-128bit-atomic-operations.patch | 8 | ||||
| -rw-r--r-- | src/abi/comments.rs | 2 | ||||
| -rw-r--r-- | src/debuginfo/mod.rs | 1 |
4 files changed, 11 insertions, 10 deletions
diff --git a/example/mini_core.rs b/example/mini_core.rs index 9fc0318df5d..42c7f5f0dc6 100644 --- a/example/mini_core.rs +++ b/example/mini_core.rs @@ -47,12 +47,12 @@ impl<T: ?Sized + Unsize<U>, U: ?Sized> DispatchFromDyn<*const U> for *const T {} impl<T: ?Sized + Unsize<U>, U: ?Sized> DispatchFromDyn<*mut U> for *mut T {} impl<T: ?Sized + Unsize<U>, U: ?Sized> DispatchFromDyn<Box<U>> for Box<T> {} -#[lang = "receiver"] -pub trait Receiver {} +#[lang = "legacy_receiver"] +pub trait LegacyReceiver {} -impl<T: ?Sized> Receiver for &T {} -impl<T: ?Sized> Receiver for &mut T {} -impl<T: ?Sized> Receiver for Box<T> {} +impl<T: ?Sized> LegacyReceiver for &T {} +impl<T: ?Sized> LegacyReceiver for &mut T {} +impl<T: ?Sized> LegacyReceiver for Box<T> {} #[lang = "copy"] pub unsafe trait Copy {} diff --git a/patches/0027-stdlib-128bit-atomic-operations.patch b/patches/0027-stdlib-128bit-atomic-operations.patch index 646928893e9..3c81b04c0ea 100644 --- a/patches/0027-stdlib-128bit-atomic-operations.patch +++ b/patches/0027-stdlib-128bit-atomic-operations.patch @@ -38,7 +38,7 @@ diff --git a/library/core/src/sync/atomic.rs b/library/core/src/sync/atomic.rs index d9de37e..8293fce 100644 --- a/library/core/src/sync/atomic.rs +++ b/library/core/src/sync/atomic.rs -@@ -2996,42 +2996,6 @@ atomic_int! { +@@ -2996,44 +2996,6 @@ atomic_int! { 8, u64 AtomicU64 } @@ -52,7 +52,8 @@ index d9de37e..8293fce 100644 - unstable(feature = "integer_atomics", issue = "99069"), - unstable(feature = "integer_atomics", issue = "99069"), - unstable(feature = "integer_atomics", issue = "99069"), -- rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"), +- rustc_const_unstable(feature = "integer_atomics", issue = "99069"), +- rustc_const_unstable(feature = "integer_atomics", issue = "99069"), - cfg_attr(not(test), rustc_diagnostic_item = "AtomicI128"), - "i128", - "#![feature(integer_atomics)]\n\n", @@ -70,7 +71,8 @@ index d9de37e..8293fce 100644 - unstable(feature = "integer_atomics", issue = "99069"), - unstable(feature = "integer_atomics", issue = "99069"), - unstable(feature = "integer_atomics", issue = "99069"), -- rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"), +- rustc_const_unstable(feature = "integer_atomics", issue = "99069"), +- rustc_const_unstable(feature = "integer_atomics", issue = "99069"), - cfg_attr(not(test), rustc_diagnostic_item = "AtomicU128"), - "u128", - "#![feature(integer_atomics)]\n\n", diff --git a/src/abi/comments.rs b/src/abi/comments.rs index a318cae1722..daea789ee3e 100644 --- a/src/abi/comments.rs +++ b/src/abi/comments.rs @@ -79,7 +79,7 @@ pub(super) fn add_local_place_comments<'tcx>( return; } let TyAndLayout { ty, layout } = place.layout(); - let rustc_target::abi::LayoutS { size, align, .. } = layout.0.0; + let rustc_abi::LayoutData { size, align, .. } = layout.0.0; let (kind, extra) = place.debug_comment(); diff --git a/src/debuginfo/mod.rs b/src/debuginfo/mod.rs index a877d8ca9c9..78ae43b1c4d 100644 --- a/src/debuginfo/mod.rs +++ b/src/debuginfo/mod.rs @@ -211,7 +211,6 @@ impl DebugContext { type_names::push_generic_params( tcx, tcx.normalize_erasing_regions(ty::ParamEnv::reveal_all(), args), - enclosing_fn_def_id, &mut name, ); |