Skip to content

Commit 5db6df4

Browse files
author
The Miri Cronjob Bot
committed
Merge from rustc
2 parents e3f0b00 + 924a1b7 commit 5db6df4

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

core/src/marker.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -465,9 +465,13 @@ impl<T: ?Sized> Copy for &T {}
465465
/// Notably, this doesn't include all trivially-destructible types for semver
466466
/// reasons.
467467
///
468-
/// Bikeshed name for now.
468+
/// Bikeshed name for now. This trait does not do anything other than reflect the
469+
/// set of types that are allowed within unions for field validity.
469470
#[unstable(feature = "bikeshed_guaranteed_no_drop", issue = "none")]
470471
#[lang = "bikeshed_guaranteed_no_drop"]
472+
#[rustc_deny_explicit_impl]
473+
#[rustc_do_not_implement_via_object]
474+
#[doc(hidden)]
471475
pub trait BikeshedGuaranteedNoDrop {}
472476

473477
/// Types for which it is safe to share references between threads.

core/src/ptr/const_ptr.rs

-1
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,6 @@ impl<T: ?Sized> *const T {
193193
/// This is an [Exposed Provenance][crate::ptr#exposed-provenance] API.
194194
///
195195
/// [`with_exposed_provenance`]: with_exposed_provenance
196-
#[must_use]
197196
#[inline(always)]
198197
#[stable(feature = "exposed_provenance", since = "1.84.0")]
199198
pub fn expose_provenance(self) -> usize {

0 commit comments

Comments
 (0)