Skip to content

Commit 1e72c7f

Browse files
compiler-errorscompiler-errors
committed
Add cycle errors to ScrubbedTraitError to remove a couple more calls to new_with_diagnostics
1 parent 27f5ecc commit 1e72c7f

File tree

14 files changed

+42
-64
lines changed

14 files changed

+42
-64
lines changed

‎compiler/rustc_borrowck/src/type_check/constraint_conversion.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ impl<'a, 'tcx> ConstraintConversion<'a, 'tcx> {
287287
ocx.infcx.at(&ObligationCause::dummy_with_span(self.span), self.param_env),
288288
ty,
289289
)
290-
.map_err(|_: Vec<ScrubbedTraitError>| NoSolution)
290+
.map_err(|_: Vec<ScrubbedTraitError<'tcx>>| NoSolution)
291291
},
292292
"normalize type outlives obligation",
293293
)

‎compiler/rustc_hir_analysis/src/coherence/orphan.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,8 @@ fn orphan_check<'tcx>(
319319
}
320320

321321
let ty = if infcx.next_trait_solver() {
322-
let mut fulfill_cx = <dyn traits::TraitEngine<'tcx, ScrubbedTraitError>>::new(&infcx);
322+
let mut fulfill_cx =
323+
<dyn traits::TraitEngine<'tcx, ScrubbedTraitError<'tcx>>>::new(&infcx);
323324
infcx
324325
.at(&cause, ty::ParamEnv::empty())
325326
.structurally_normalize(ty, &mut *fulfill_cx)

‎compiler/rustc_trait_selection/src/infer.rs

+4-10
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
1-
use crate::solve::NextSolverError;
21
use crate::traits::query::evaluate_obligation::InferCtxtExt as _;
3-
use crate::traits::{
4-
self, FromSolverError, Obligation, ObligationCause, ObligationCtxt, OldSolverError,
5-
SelectionContext,
6-
};
2+
use crate::traits::{self, Obligation, ObligationCause, ObligationCtxt, SelectionContext};
73

84
use rustc_hir::def_id::DefId;
95
use rustc_hir::lang_items::LangItem;
@@ -124,21 +120,19 @@ impl<'tcx> InferCtxtBuilder<'tcx> {
124120
/// bound for the closure and in part because it is convenient to
125121
/// have `'tcx` be free on this function so that we can talk about
126122
/// `K: TypeFoldable<TyCtxt<'tcx>>`.)
127-
fn enter_canonical_trait_query<K, R, E>(
123+
fn enter_canonical_trait_query<K, R>(
128124
self,
129125
canonical_key: &Canonical<'tcx, K>,
130-
operation: impl FnOnce(&ObligationCtxt<'_, 'tcx, E>, K) -> Result<R, NoSolution>,
126+
operation: impl FnOnce(&ObligationCtxt<'_, 'tcx>, K) -> Result<R, NoSolution>,
131127
) -> Result<CanonicalQueryResponse<'tcx, R>, NoSolution>
132128
where
133129
K: TypeFoldable<TyCtxt<'tcx>>,
134130
R: Debug + TypeFoldable<TyCtxt<'tcx>>,
135131
Canonical<'tcx, QueryResponse<'tcx, R>>: ArenaAllocatable<'tcx>,
136-
E: FromSolverError<'tcx, NextSolverError<'tcx>>
137-
+ FromSolverError<'tcx, OldSolverError<'tcx>>,
138132
{
139133
let (infcx, key, canonical_inference_vars) =
140134
self.build_with_canonical(DUMMY_SP, canonical_key);
141-
let ocx = ObligationCtxt::new_generic(&infcx);
135+
let ocx = ObligationCtxt::new(&infcx);
142136
let value = operation(&ocx, key)?;
143137
ocx.make_canonicalized_query_response(canonical_inference_vars, value)
144138
}

‎compiler/rustc_trait_selection/src/regions.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ impl<'tcx> InferCtxt<'tcx> {
2828
),
2929
ty,
3030
)
31-
.map_err(|_: Vec<ScrubbedTraitError>| NoSolution)
31+
.map_err(|_: Vec<ScrubbedTraitError<'tcx>>| NoSolution)
3232
} else {
3333
Ok(ty)
3434
}

‎compiler/rustc_trait_selection/src/solve/fulfill.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ impl<'tcx> FromSolverError<'tcx, NextSolverError<'tcx>> for FulfillmentError<'tc
225225
}
226226
}
227227

228-
impl<'tcx> FromSolverError<'tcx, NextSolverError<'tcx>> for ScrubbedTraitError {
228+
impl<'tcx> FromSolverError<'tcx, NextSolverError<'tcx>> for ScrubbedTraitError<'tcx> {
229229
fn from_solver_error(_infcx: &InferCtxt<'tcx>, error: NextSolverError<'tcx>) -> Self {
230230
match error {
231231
NextSolverError::TrueError(_) => ScrubbedTraitError::TrueError,

‎compiler/rustc_trait_selection/src/solve/normalize.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ impl<'tcx> TypeFolder<TyCtxt<'tcx>> for DeeplyNormalizeForDiagnosticsFolder<'_,
253253
ty,
254254
vec![None; ty.outer_exclusive_binder().as_usize()],
255255
)
256-
.unwrap_or_else(|_: Vec<ScrubbedTraitError>| ty.super_fold_with(self))
256+
.unwrap_or_else(|_: Vec<ScrubbedTraitError<'tcx>>| ty.super_fold_with(self))
257257
}
258258

259259
fn fold_const(&mut self, ct: ty::Const<'tcx>) -> ty::Const<'tcx> {
@@ -262,6 +262,6 @@ impl<'tcx> TypeFolder<TyCtxt<'tcx>> for DeeplyNormalizeForDiagnosticsFolder<'_,
262262
ct,
263263
vec![None; ct.outer_exclusive_binder().as_usize()],
264264
)
265-
.unwrap_or_else(|_: Vec<ScrubbedTraitError>| ct.super_fold_with(self))
265+
.unwrap_or_else(|_: Vec<ScrubbedTraitError<'tcx>>| ct.super_fold_with(self))
266266
}
267267
}

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

+2-11
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ impl<
5454

5555
/// Used if you want to have pleasant experience when dealing
5656
/// with obligations outside of hir or mir typeck.
57-
pub struct ObligationCtxt<'a, 'tcx, E = ScrubbedTraitError> {
57+
pub struct ObligationCtxt<'a, 'tcx, E = ScrubbedTraitError<'tcx>> {
5858
pub infcx: &'a InferCtxt<'tcx>,
5959
engine: RefCell<Box<dyn TraitEngine<'tcx, E>>>,
6060
}
@@ -65,21 +65,12 @@ impl<'a, 'tcx> ObligationCtxt<'a, 'tcx, FulfillmentError<'tcx>> {
6565
}
6666
}
6767

68-
impl<'a, 'tcx> ObligationCtxt<'a, 'tcx, ScrubbedTraitError> {
68+
impl<'a, 'tcx> ObligationCtxt<'a, 'tcx, ScrubbedTraitError<'tcx>> {
6969
pub fn new(infcx: &'a InferCtxt<'tcx>) -> Self {
7070
Self { infcx, engine: RefCell::new(<dyn TraitEngine<'tcx, _>>::new(infcx)) }
7171
}
7272
}
7373

74-
impl<'a, 'tcx, E> ObligationCtxt<'a, 'tcx, E>
75-
where
76-
E: FromSolverError<'tcx, NextSolverError<'tcx>> + FromSolverError<'tcx, OldSolverError<'tcx>>,
77-
{
78-
pub fn new_generic(infcx: &'a InferCtxt<'tcx>) -> Self {
79-
Self { infcx, engine: RefCell::new(<dyn TraitEngine<'tcx, _>>::new(infcx)) }
80-
}
81-
}
82-
8374
impl<'a, 'tcx, E> ObligationCtxt<'a, 'tcx, E>
8475
where
8576
E: FulfillmentErrorLike<'tcx>,

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

+3-4
Original file line numberDiff line numberDiff line change
@@ -856,16 +856,15 @@ impl<'tcx> FromSolverError<'tcx, OldSolverError<'tcx>> for FulfillmentError<'tcx
856856
}
857857
}
858858

859-
impl<'tcx> FromSolverError<'tcx, OldSolverError<'tcx>> for ScrubbedTraitError {
859+
impl<'tcx> FromSolverError<'tcx, OldSolverError<'tcx>> for ScrubbedTraitError<'tcx> {
860860
fn from_solver_error(_infcx: &InferCtxt<'tcx>, error: OldSolverError<'tcx>) -> Self {
861861
match error.error {
862862
FulfillmentErrorCode::Select(_)
863863
| FulfillmentErrorCode::Project(_)
864864
| FulfillmentErrorCode::Subtype(_, _)
865865
| FulfillmentErrorCode::ConstEquate(_, _) => ScrubbedTraitError::TrueError,
866-
FulfillmentErrorCode::Cycle(_) | FulfillmentErrorCode::Ambiguity { overflow: _ } => {
867-
ScrubbedTraitError::Ambiguity
868-
}
866+
FulfillmentErrorCode::Ambiguity { overflow: _ } => ScrubbedTraitError::Ambiguity,
867+
FulfillmentErrorCode::Cycle(cycle) => ScrubbedTraitError::Cycle(cycle),
869868
}
870869
}
871870
}

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

+7-5
Original file line numberDiff line numberDiff line change
@@ -77,24 +77,26 @@ pub use rustc_infer::traits::*;
7777
/// error itself (except for if it's an ambiguity or true error).
7878
///
7979
/// use [`ObligationCtxt::new_with_diagnostics`] to get a [`FulfillmentError`].
80-
#[derive(Copy, Clone, Debug)]
81-
pub enum ScrubbedTraitError {
80+
#[derive(Clone, Debug)]
81+
pub enum ScrubbedTraitError<'tcx> {
8282
/// A real error. This goal definitely does not hold.
8383
TrueError,
8484
/// An ambiguity. This goal may hold if further inference is done.
8585
Ambiguity,
86+
/// An old-solver-style cycle error, which will fatal.
87+
Cycle(Vec<PredicateObligation<'tcx>>),
8688
}
8789

88-
impl ScrubbedTraitError {
90+
impl<'tcx> ScrubbedTraitError<'tcx> {
8991
fn is_true_error(&self) -> bool {
9092
match self {
9193
ScrubbedTraitError::TrueError => true,
92-
ScrubbedTraitError::Ambiguity => false,
94+
ScrubbedTraitError::Ambiguity | ScrubbedTraitError::Cycle(_) => false,
9395
}
9496
}
9597
}
9698

97-
impl<'tcx> FulfillmentErrorLike<'tcx> for ScrubbedTraitError {
99+
impl<'tcx> FulfillmentErrorLike<'tcx> for ScrubbedTraitError<'tcx> {
98100
fn is_true_error(&self) -> bool {
99101
self.is_true_error()
100102
}

‎compiler/rustc_trait_selection/src/traits/query/normalize.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ impl<'cx, 'tcx> At<'cx, 'tcx> {
7676
};
7777

7878
if self.infcx.next_trait_solver() {
79-
match crate::solve::deeply_normalize_with_skipped_universes::<_, ScrubbedTraitError>(
79+
match crate::solve::deeply_normalize_with_skipped_universes::<_, ScrubbedTraitError<'tcx>>(
8080
self, value, universes,
8181
) {
8282
Ok(value) => return Ok(Normalized { value, obligations: vec![] }),

‎compiler/rustc_trait_selection/src/traits/query/type_op/implied_outlives_bounds.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ pub fn compute_implied_outlives_bounds_compat_inner<'tcx>(
267267
ocx.infcx.at(&ObligationCause::dummy(), param_env),
268268
ty_a,
269269
)
270-
.map_err(|_errs: Vec<ScrubbedTraitError>| NoSolution)?;
270+
.map_err(|_errs: Vec<ScrubbedTraitError<'tcx>>| NoSolution)?;
271271
}
272272
let mut components = smallvec![];
273273
push_outlives_components(tcx, ty_a, &mut components);

‎compiler/rustc_traits/src/codegen.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ use rustc_middle::traits::CodegenObligationError;
99
use rustc_middle::ty::{self, TyCtxt, TypeVisitableExt};
1010
use rustc_trait_selection::traits::error_reporting::TypeErrCtxtExt;
1111
use rustc_trait_selection::traits::{
12-
FulfillmentErrorCode, ImplSource, Obligation, ObligationCause, ObligationCtxt,
13-
SelectionContext, Unimplemented,
12+
ImplSource, Obligation, ObligationCause, ObligationCtxt, ScrubbedTraitError, SelectionContext,
13+
Unimplemented,
1414
};
1515
use tracing::debug;
1616

@@ -51,7 +51,7 @@ pub fn codegen_select_candidate<'tcx>(
5151
// all nested obligations. This is because they can inform the
5252
// inference of the impl's type parameters.
5353
// FIXME(-Znext-solver): Doesn't need diagnostics if new solver.
54-
let ocx = ObligationCtxt::new_with_diagnostics(&infcx);
54+
let ocx = ObligationCtxt::new(&infcx);
5555
let impl_source = selection.map(|obligation| {
5656
ocx.register_obligation(obligation);
5757
});
@@ -65,7 +65,7 @@ pub fn codegen_select_candidate<'tcx>(
6565
// Cycle errors are the only post-monomorphization errors possible; emit them now so
6666
// `rustc_ty_utils::resolve_associated_item` doesn't return `None` post-monomorphization.
6767
for err in errors {
68-
if let FulfillmentErrorCode::Cycle(cycle) = err.code {
68+
if let ScrubbedTraitError::Cycle(cycle) = err {
6969
infcx.err_ctxt().report_overflow_obligation_cycle(&cycle);
7070
}
7171
}

‎compiler/rustc_traits/src/normalize_projection_ty.rs

+5-8
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ use rustc_trait_selection::traits::error_reporting::TypeErrCtxtExt;
77
use rustc_trait_selection::traits::query::{
88
normalize::NormalizationResult, CanonicalAliasGoal, NoSolution,
99
};
10-
use rustc_trait_selection::traits::{
11-
self, FulfillmentError, FulfillmentErrorCode, ObligationCause, ObligationCtxt, SelectionContext,
12-
};
10+
use rustc_trait_selection::traits::{self, ObligationCause, ScrubbedTraitError, SelectionContext};
1311
use tracing::debug;
1412

1513
pub(crate) fn provide(p: &mut Providers) {
@@ -29,8 +27,7 @@ fn normalize_canonicalized_projection_ty<'tcx>(
2927

3028
tcx.infer_ctxt().enter_canonical_trait_query(
3129
&goal,
32-
|ocx: &ObligationCtxt<'_, 'tcx, FulfillmentError<'tcx>>,
33-
ParamEnvAnd { param_env, value: goal }| {
30+
|ocx, ParamEnvAnd { param_env, value: goal }| {
3431
debug_assert!(!ocx.infcx.next_trait_solver());
3532
let selcx = &mut SelectionContext::new(ocx.infcx);
3633
let cause = ObligationCause::dummy();
@@ -50,7 +47,7 @@ fn normalize_canonicalized_projection_ty<'tcx>(
5047
// that impl vars are constrained by the signature, for example).
5148
if !tcx.sess.opts.actually_rustdoc {
5249
for error in &errors {
53-
if let FulfillmentErrorCode::Cycle(cycle) = &error.code {
50+
if let ScrubbedTraitError::Cycle(cycle) = &error {
5451
ocx.infcx.err_ctxt().report_overflow_obligation_cycle(cycle);
5552
}
5653
}
@@ -74,7 +71,7 @@ fn normalize_canonicalized_weak_ty<'tcx>(
7471

7572
tcx.infer_ctxt().enter_canonical_trait_query(
7673
&goal,
77-
|ocx: &ObligationCtxt<'_, 'tcx>, ParamEnvAnd { param_env, value: goal }| {
74+
|ocx, ParamEnvAnd { param_env, value: goal }| {
7875
let obligations = tcx.predicates_of(goal.def_id).instantiate_own(tcx, goal.args).map(
7976
|(predicate, span)| {
8077
traits::Obligation::new(
@@ -100,7 +97,7 @@ fn normalize_canonicalized_inherent_projection_ty<'tcx>(
10097

10198
tcx.infer_ctxt().enter_canonical_trait_query(
10299
&goal,
103-
|ocx: &ObligationCtxt<'_, 'tcx>, ParamEnvAnd { param_env, value: goal }| {
100+
|ocx, ParamEnvAnd { param_env, value: goal }| {
104101
let selcx = &mut SelectionContext::new(ocx.infcx);
105102
let cause = ObligationCause::dummy();
106103
let mut obligations = vec![];

‎compiler/rustc_traits/src/type_op.rs

+8-14
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,10 @@ fn type_op_eq<'tcx>(
4343
tcx: TyCtxt<'tcx>,
4444
canonicalized: Canonical<'tcx, ParamEnvAnd<'tcx, Eq<'tcx>>>,
4545
) -> Result<&'tcx Canonical<'tcx, QueryResponse<'tcx, ()>>, NoSolution> {
46-
tcx.infer_ctxt().enter_canonical_trait_query(
47-
&canonicalized,
48-
|ocx: &ObligationCtxt<'_, 'tcx>, key| {
49-
let (param_env, Eq { a, b }) = key.into_parts();
50-
Ok(ocx.eq(&ObligationCause::dummy(), param_env, a, b)?)
51-
},
52-
)
46+
tcx.infer_ctxt().enter_canonical_trait_query(&canonicalized, |ocx, key| {
47+
let (param_env, Eq { a, b }) = key.into_parts();
48+
Ok(ocx.eq(&ObligationCause::dummy(), param_env, a, b)?)
49+
})
5350
}
5451

5552
fn type_op_normalize<'tcx, T>(
@@ -98,13 +95,10 @@ fn type_op_subtype<'tcx>(
9895
tcx: TyCtxt<'tcx>,
9996
canonicalized: Canonical<'tcx, ParamEnvAnd<'tcx, Subtype<'tcx>>>,
10097
) -> Result<&'tcx Canonical<'tcx, QueryResponse<'tcx, ()>>, NoSolution> {
101-
tcx.infer_ctxt().enter_canonical_trait_query(
102-
&canonicalized,
103-
|ocx: &ObligationCtxt<'_, 'tcx>, key| {
104-
let (param_env, Subtype { sub, sup }) = key.into_parts();
105-
Ok(ocx.sup(&ObligationCause::dummy(), param_env, sup, sub)?)
106-
},
107-
)
98+
tcx.infer_ctxt().enter_canonical_trait_query(&canonicalized, |ocx, key| {
99+
let (param_env, Subtype { sub, sup }) = key.into_parts();
100+
Ok(ocx.sup(&ObligationCause::dummy(), param_env, sup, sub)?)
101+
})
108102
}
109103

110104
fn type_op_prove_predicate<'tcx>(

0 commit comments

Comments
 (0)