Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit d54cdff

Browse files
Dylan-DPCDylan-DPC
authored
Rollup merge of rust-lang#99746 - compiler-errors:more-trait-engine, r=jackh726
Use `TraitEngine` in more places that don't specifically need `FulfillmentContext::new_in_snapshot` Not sure if this change is worthwhile, but couldn't hurt re: chalkification r? types
2 parents cff371c + 58f107a commit d54cdff

File tree

11 files changed

+23
-22
lines changed

11 files changed

+23
-22
lines changed

‎compiler/rustc_const_eval/src/transform/check_consts/qualifs.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use rustc_middle::mir::*;
1010
use rustc_middle::ty::{self, subst::SubstsRef, AdtDef, Ty};
1111
use rustc_span::DUMMY_SP;
1212
use rustc_trait_selection::traits::{
13-
self, FulfillmentContext, ImplSource, Obligation, ObligationCause, SelectionContext,
13+
self, ImplSource, Obligation, ObligationCause, SelectionContext, TraitEngineExt,
1414
};
1515

1616
use super::ConstCx;
@@ -191,7 +191,7 @@ impl Qualif for NeedsNonConstDrop {
191191

192192
// If we successfully found one, then select all of the predicates
193193
// implied by our const drop impl.
194-
let mut fcx = FulfillmentContext::new();
194+
let mut fcx = <dyn TraitEngine<'tcx>>::new(cx.tcx);
195195
for nested in impl_src.nested_obligations() {
196196
fcx.register_predicate_obligation(&infcx, nested);
197197
}

‎compiler/rustc_trait_selection/src/traits/auto_trait.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ impl<'tcx> AutoTraitFinder<'tcx> {
205205
// At this point, we already have all of the bounds we need. FulfillmentContext is used
206206
// to store all of the necessary region/lifetime bounds in the InferContext, as well as
207207
// an additional sanity check.
208-
let mut fulfill = FulfillmentContext::new();
208+
let mut fulfill = <dyn TraitEngine<'tcx>>::new(tcx);
209209
fulfill.register_bound(&infcx, full_env, ty, trait_did, ObligationCause::dummy());
210210
let errors = fulfill.select_all_or_error(&infcx);
211211

‎compiler/rustc_trait_selection/src/traits/codegen.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
use crate::infer::{DefiningAnchor, TyCtxtInferExt};
77
use crate::traits::{
8-
FulfillmentContext, ImplSource, Obligation, ObligationCause, SelectionContext, TraitEngine,
8+
ImplSource, Obligation, ObligationCause, SelectionContext, TraitEngine, TraitEngineExt,
99
Unimplemented,
1010
};
1111
use rustc_middle::traits::CodegenObligationError;
@@ -53,7 +53,7 @@ pub fn codegen_fulfill_obligation<'tcx>(
5353
// Currently, we use a fulfillment context to completely resolve
5454
// all nested obligations. This is because they can inform the
5555
// inference of the impl's type parameters.
56-
let mut fulfill_cx = FulfillmentContext::new();
56+
let mut fulfill_cx = <dyn TraitEngine<'tcx>>::new(tcx);
5757
let impl_source = selection.map(|predicate| {
5858
fulfill_cx.register_predicate_obligation(&infcx, predicate);
5959
});

‎compiler/rustc_trait_selection/src/traits/coherence.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use crate::traits::util::impl_subject_and_oblig;
1111
use crate::traits::SkipLeakCheck;
1212
use crate::traits::{
1313
self, FulfillmentContext, Normalized, Obligation, ObligationCause, PredicateObligation,
14-
PredicateObligations, SelectionContext,
14+
PredicateObligations, SelectionContext, TraitEngineExt,
1515
};
1616
use rustc_data_structures::fx::FxIndexSet;
1717
use rustc_errors::Diagnostic;
@@ -385,7 +385,7 @@ fn resolve_negative_obligation<'cx, 'tcx>(
385385
return false;
386386
};
387387

388-
let mut fulfillment_cx = FulfillmentContext::new();
388+
let mut fulfillment_cx = <dyn TraitEngine<'tcx>>::new(infcx.tcx);
389389
fulfillment_cx.register_predicate_obligation(infcx, o);
390390

391391
let errors = fulfillment_cx.select_all_or_error(infcx);

‎compiler/rustc_trait_selection/src/traits/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ pub fn type_known_to_meet_bound_modulo_regions<'a, 'tcx>(
164164
// The handling of regions in this area of the code is terrible,
165165
// see issue #29149. We should be able to improve on this with
166166
// NLL.
167-
let mut fulfill_cx = FulfillmentContext::new();
167+
let mut fulfill_cx = <dyn TraitEngine<'tcx>>::new(infcx.tcx);
168168

169169
// We can use a dummy node-id here because we won't pay any mind
170170
// to region obligations that arise (there shouldn't really be any

‎compiler/rustc_trait_selection/src/traits/specialize/mod.rs‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ use specialization_graph::GraphExt;
1414

1515
use crate::infer::{InferCtxt, InferOk, TyCtxtInferExt};
1616
use crate::traits::select::IntercrateAmbiguityCause;
17-
use crate::traits::{self, coherence, FutureCompatOverlapErrorKind, ObligationCause, TraitEngine};
17+
use crate::traits::{
18+
self, coherence, FutureCompatOverlapErrorKind, ObligationCause, TraitEngine, TraitEngineExt,
19+
};
1820
use rustc_data_structures::fx::{FxHashSet, FxIndexSet};
1921
use rustc_errors::{struct_span_err, EmissionGuarantee, LintDiagnosticBuilder};
2022
use rustc_hir::def_id::{DefId, LocalDefId};
@@ -24,8 +26,8 @@ use rustc_session::lint::builtin::COHERENCE_LEAK_CHECK;
2426
use rustc_session::lint::builtin::ORDER_DEPENDENT_TRAIT_OBJECTS;
2527
use rustc_span::{Span, DUMMY_SP};
2628

27-
use super::util;
28-
use super::{FulfillmentContext, SelectionContext};
29+
use super::SelectionContext;
30+
use super::{util, FulfillmentContext};
2931

3032
/// Information pertinent to an overlapping impl error.
3133
#[derive(Debug)]
@@ -207,7 +209,7 @@ fn fulfill_implication<'a, 'tcx>(
207209
// (which are packed up in penv)
208210

209211
infcx.save_and_restore_in_snapshot_flag(|infcx| {
210-
let mut fulfill_cx = FulfillmentContext::new();
212+
let mut fulfill_cx = <dyn TraitEngine<'tcx>>::new(infcx.tcx);
211213
for oblig in obligations.chain(more_obligations) {
212214
fulfill_cx.register_predicate_obligation(&infcx, oblig);
213215
}

‎compiler/rustc_trait_selection/src/traits/structural_match.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::infer::{InferCtxt, TyCtxtInferExt};
22
use crate::traits::ObligationCause;
3-
use crate::traits::{self, TraitEngine};
3+
use crate::traits::{TraitEngine, TraitEngineExt};
44

55
use rustc_data_structures::fx::FxHashSet;
66
use rustc_hir as hir;
@@ -72,7 +72,7 @@ fn type_marked_structural<'tcx>(
7272
adt_ty: Ty<'tcx>,
7373
cause: ObligationCause<'tcx>,
7474
) -> bool {
75-
let mut fulfillment_cx = traits::FulfillmentContext::new();
75+
let mut fulfillment_cx = <dyn TraitEngine<'tcx>>::new(infcx.tcx);
7676
// require `#[derive(PartialEq)]`
7777
let structural_peq_def_id =
7878
infcx.tcx.require_lang_item(LangItem::StructuralPeq, Some(cause.span));

‎compiler/rustc_traits/src/implied_outlives_bounds.rs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ use rustc_span::source_map::DUMMY_SP;
1414
use rustc_trait_selection::infer::InferCtxtBuilderExt;
1515
use rustc_trait_selection::traits::query::{CanonicalTyGoal, Fallible, NoSolution};
1616
use rustc_trait_selection::traits::wf;
17-
use rustc_trait_selection::traits::FulfillmentContext;
18-
use rustc_trait_selection::traits::TraitEngine;
17+
use rustc_trait_selection::traits::{TraitEngine, TraitEngineExt};
1918
use smallvec::{smallvec, SmallVec};
2019

2120
pub(crate) fn provide(p: &mut Providers) {
@@ -52,7 +51,7 @@ fn compute_implied_outlives_bounds<'tcx>(
5251

5352
let mut implied_bounds = vec![];
5453

55-
let mut fulfill_cx = FulfillmentContext::new();
54+
let mut fulfill_cx = <dyn TraitEngine<'tcx>>::new(tcx);
5655

5756
while let Some(arg) = wf_args.pop() {
5857
if !checked_wf_args.insert(arg) {

‎compiler/rustc_typeck/src/coherence/builtin.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ fn visit_implementation_of_copy(tcx: TyCtxt<'_>, impl_did: LocalDefId) {
109109
// it is not immediately clear why Copy is not implemented for a field, since
110110
// all we point at is the field itself.
111111
tcx.infer_ctxt().ignoring_regions().enter(|infcx| {
112-
let mut fulfill_cx = traits::FulfillmentContext::new();
112+
let mut fulfill_cx = <dyn TraitEngine<'_>>::new(tcx);
113113
fulfill_cx.register_bound(
114114
&infcx,
115115
param_env,

‎compiler/rustc_typeck/src/hir_wf_check.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use rustc_infer::traits::TraitEngine;
77
use rustc_infer::traits::{ObligationCause, WellFormedLoc};
88
use rustc_middle::ty::query::Providers;
99
use rustc_middle::ty::{self, Region, ToPredicate, TyCtxt, TypeFoldable, TypeFolder};
10-
use rustc_trait_selection::traits;
10+
use rustc_trait_selection::traits::{self, TraitEngineExt};
1111

1212
pub fn provide(providers: &mut Providers) {
1313
*providers = Providers { diagnostic_hir_wf_check, ..*providers };
@@ -66,7 +66,7 @@ fn diagnostic_hir_wf_check<'tcx>(
6666
impl<'tcx> Visitor<'tcx> for HirWfCheck<'tcx> {
6767
fn visit_ty(&mut self, ty: &'tcx hir::Ty<'tcx>) {
6868
self.tcx.infer_ctxt().enter(|infcx| {
69-
let mut fulfill = traits::FulfillmentContext::new();
69+
let mut fulfill = <dyn TraitEngine<'tcx>>::new(self.tcx);
7070
let tcx_ty =
7171
self.icx.to_ty(ty).fold_with(&mut EraseAllBoundRegions { tcx: self.tcx });
7272
let cause = traits::ObligationCause::new(

0 commit comments

Comments
 (0)