bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

allow_internal_unstable(min_specialization) on newtype_index

Browse source
This commit is contained in:
clubby789 2024-01-14 13:48:58 +00:00
parent 0529ccf341
commit eb63d3a49d
2 changed files with 22 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compiler/rustc_index_macros/src/lib.rs
View file

@ -36,6 +36,9 @@ mod newtype;
feature = "nightly", feature = "nightly",
allow_internal_unstable(step_trait, rustc_attrs, trusted_step, spec_option_partial_eq) allow_internal_unstable(step_trait, rustc_attrs, trusted_step, spec_option_partial_eq)
)] )]
// FIXME: Remove the above comment about `min_specialization` once bootstrap is bumped,
// and the corresponding one on SpecOptionPartialEq
#[cfg_attr(all(feature = "nightly", not(bootstrap)), allow_internal_unstable(min_specialization))]
pub fn newtype_index(input: TokenStream) -> TokenStream { pub fn newtype_index(input: TokenStream) -> TokenStream {
newtype::newtype(input) newtype::newtype(input)
} }

32
compiler/rustc_trait_selection/src/traits/specialize/mod.rs
View file

@ -142,23 +142,29 @@ pub fn translate_args_with_cause<'tcx>(
pub(super) fn specializes(tcx: TyCtxt<'_>, (impl1_def_id, impl2_def_id): (DefId, DefId)) -> bool { pub(super) fn specializes(tcx: TyCtxt<'_>, (impl1_def_id, impl2_def_id): (DefId, DefId)) -> bool {
// The feature gate should prevent introducing new specializations, but not // The feature gate should prevent introducing new specializations, but not
// taking advantage of upstream ones. // taking advantage of upstream ones.
// If specialization is enabled for this crate then no extra checks are needed.
// If it's not, and either of the `impl`s is local to this crate, then this definitely
// isn't specializing - unless specialization is enabled for the `impl` span,
// e.g. if it comes from an `allow_internal_unstable` macro
let features = tcx.features(); let features = tcx.features();
let specialization_enabled = features.specialization || features.min_specialization; let specialization_enabled = features.specialization || features.min_specialization;
if !specialization_enabled && impl1_def_id.is_local() { if !specialization_enabled {
let span = tcx.def_span(impl1_def_id); if impl1_def_id.is_local() {
if !span.allows_unstable(sym::specialization) let span = tcx.def_span(impl1_def_id);
&& !span.allows_unstable(sym::min_specialization) if !span.allows_unstable(sym::specialization)
{ && !span.allows_unstable(sym::min_specialization)
return false; {
return false;
}
} }
}
if !specialization_enabled && impl2_def_id.is_local() { if impl2_def_id.is_local() {
let span = tcx.def_span(impl2_def_id); let span = tcx.def_span(impl2_def_id);
if !span.allows_unstable(sym::specialization) if !span.allows_unstable(sym::specialization)
&& !span.allows_unstable(sym::min_specialization) && !span.allows_unstable(sym::min_specialization)
{ {
return false; return false;
}
} }
} }