Skip to content

Commit 924a1b7

Browse files
committed
Auto merge of rust-lang#138506 - fmease:rollup-ve4h2eq, r=fmease
Rollup of 9 pull requests Successful merges: - rust-lang#134720 (Display valid crate types in error message for --crate-type flag) - rust-lang#137619 (Provide helpful diagnostics for shebang lookalikes) - rust-lang#138353 (remove must_use from <*const T>::expose_provenance) - rust-lang#138452 (Remove `RUN_CHECK_WITH_PARALLEL_QUERIES`) - rust-lang#138469 (remove comment regarding a removed test directive) - rust-lang#138477 (Deny impls for `BikeshedGuaranteedNoDrop`) - rust-lang#138485 (Rustc dev guide subtree update) - rust-lang#138487 (Pass `CI_JOB_DOC_URL` to Docker) - rust-lang#138495 (Take a break from reviews) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 54e9d10 + 6eec9b4 commit 924a1b7

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)