nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-05-14 02:49:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove SelectionContext::allow_negative_impls field

Browse Source
This commit is contained in:
Guillaume Gomez 2022-03-27 03:01:34 +02:00
parent ad88732254
commit bd51f174ed
2 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/rustc_trait_selection/src/traits/auto_trait.rs
View File

@ -87,7 +87,7 @@ impl<'tcx> AutoTraitFinder<'tcx> {
let trait_pred = ty::Binder::dummy(trait_ref); let trait_pred = ty::Binder::dummy(trait_ref);
let bail_out = tcx.infer_ctxt().enter(|infcx| { let bail_out = tcx.infer_ctxt().enter(|infcx| {
let mut selcx = SelectionContext::with_negative(&infcx, true); let mut selcx = SelectionContext::new(&infcx);
let result = selcx.select(&Obligation::new( let result = selcx.select(&Obligation::new(
ObligationCause::dummy(), ObligationCause::dummy(),
orig_env, orig_env,
@ -295,7 +295,7 @@ impl<'tcx> AutoTraitFinder<'tcx> {
fresh_preds.insert(self.clean_pred(infcx, predicate)); fresh_preds.insert(self.clean_pred(infcx, predicate));
} }
let mut select = SelectionContext::with_negative(&infcx, true); let mut select = SelectionContext::new(&infcx);
let mut already_visited = FxHashSet::default(); let mut already_visited = FxHashSet::default();
let mut predicates = VecDeque::new(); let mut predicates = VecDeque::new();

24
compiler/rustc_trait_selection/src/traits/select/mod.rs
View File

@ -119,11 +119,6 @@ pub struct SelectionContext<'cx, 'tcx> {
intercrate_ambiguity_causes: Option<Vec<IntercrateAmbiguityCause>>, intercrate_ambiguity_causes: Option<Vec<IntercrateAmbiguityCause>>,
/// Controls whether or not to filter out negative impls when selecting.
/// This is used in librustdoc to distinguish between the lack of an impl
/// and a negative impl
allow_negative_impls: bool,
/// The mode that trait queries run in, which informs our error handling /// The mode that trait queries run in, which informs our error handling
/// policy. In essence, canonicalized queries need their errors propagated /// policy. In essence, canonicalized queries need their errors propagated
/// rather than immediately reported because we do not have accurate spans. /// rather than immediately reported because we do not have accurate spans.
@ -215,7 +210,6 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
freshener: infcx.freshener_keep_static(), freshener: infcx.freshener_keep_static(),
intercrate: false, intercrate: false,
intercrate_ambiguity_causes: None, intercrate_ambiguity_causes: None,
allow_negative_impls: false,
query_mode: TraitQueryMode::Standard, query_mode: TraitQueryMode::Standard,
} }
} }
@ -226,22 +220,6 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
freshener: infcx.freshener_keep_static(), freshener: infcx.freshener_keep_static(),
intercrate: true, intercrate: true,
intercrate_ambiguity_causes: None, intercrate_ambiguity_causes: None,
allow_negative_impls: false,
query_mode: TraitQueryMode::Standard,
}
}
pub fn with_negative(
infcx: &'cx InferCtxt<'cx, 'tcx>,
allow_negative_impls: bool,
) -> SelectionContext<'cx, 'tcx> {
debug!(?allow_negative_impls, "with_negative");
SelectionContext {
infcx,
freshener: infcx.freshener_keep_static(),
intercrate: false,
intercrate_ambiguity_causes: None,
allow_negative_impls,
query_mode: TraitQueryMode::Standard, query_mode: TraitQueryMode::Standard,
} }
} }
@ -256,7 +234,6 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
freshener: infcx.freshener_keep_static(), freshener: infcx.freshener_keep_static(),
intercrate: false, intercrate: false,
intercrate_ambiguity_causes: None, intercrate_ambiguity_causes: None,
allow_negative_impls: false,
query_mode, query_mode,
} }
} }
@ -1192,7 +1169,6 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
if let ImplCandidate(def_id) = candidate { if let ImplCandidate(def_id) = candidate {
if ty::ImplPolarity::Reservation == tcx.impl_polarity(def_id) if ty::ImplPolarity::Reservation == tcx.impl_polarity(def_id)
|| obligation.polarity() == tcx.impl_polarity(def_id) || obligation.polarity() == tcx.impl_polarity(def_id)
|| self.allow_negative_impls
{ {
result.push(candidate); result.push(candidate);
} }