mirror of https://github.com/rust-lang/rust.git
Fix `allow_internal_unstable` for `(min_)specialization`
This commit is contained in:
parent
1d8d7b16cb
commit
0529ccf341
|
@ -26,7 +26,7 @@ use rustc_middle::ty::{self, ImplSubject, Ty, TyCtxt, TypeVisitableExt};
|
|||
use rustc_middle::ty::{GenericArgs, GenericArgsRef};
|
||||
use rustc_session::lint::builtin::COHERENCE_LEAK_CHECK;
|
||||
use rustc_session::lint::builtin::ORDER_DEPENDENT_TRAIT_OBJECTS;
|
||||
use rustc_span::{ErrorGuaranteed, Span, DUMMY_SP};
|
||||
use rustc_span::{sym, ErrorGuaranteed, Span, DUMMY_SP};
|
||||
|
||||
use super::util;
|
||||
use super::SelectionContext;
|
||||
|
@ -144,9 +144,23 @@ pub(super) fn specializes(tcx: TyCtxt<'_>, (impl1_def_id, impl2_def_id): (DefId,
|
|||
// taking advantage of upstream ones.
|
||||
let features = tcx.features();
|
||||
let specialization_enabled = features.specialization || features.min_specialization;
|
||||
if !specialization_enabled && (impl1_def_id.is_local() || impl2_def_id.is_local()) {
|
||||
if !specialization_enabled && impl1_def_id.is_local() {
|
||||
let span = tcx.def_span(impl1_def_id);
|
||||
if !span.allows_unstable(sym::specialization)
|
||||
&& !span.allows_unstable(sym::min_specialization)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
if !specialization_enabled && impl2_def_id.is_local() {
|
||||
let span = tcx.def_span(impl2_def_id);
|
||||
if !span.allows_unstable(sym::specialization)
|
||||
&& !span.allows_unstable(sym::min_specialization)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
// We determine whether there's a subset relationship by:
|
||||
//
|
||||
|
|
|
@ -0,0 +1,18 @@
|
|||
// check-pass
|
||||
// test for #119950
|
||||
// compile-flags: --crate-type lib
|
||||
|
||||
#![allow(internal_features)]
|
||||
#![feature(allow_internal_unstable)]
|
||||
|
||||
#[allow_internal_unstable(min_specialization)]
|
||||
macro_rules! test {
|
||||
() => {
|
||||
struct T<U>(U);
|
||||
trait Tr {}
|
||||
impl<U> Tr for T<U> {}
|
||||
impl Tr for T<u8> {}
|
||||
}
|
||||
}
|
||||
|
||||
test! {}
|
Loading…
Reference in New Issue