Skip to content

Commit 59c2bc1

Browse files
compiler-errorscompiler-errors
committed
Improve location reporting of trait placeholder error
1 parent c092b28 commit 59c2bc1

File tree

20 files changed

+166
-104
lines changed

20 files changed

+166
-104
lines changed

‎compiler/rustc_borrowck/src/diagnostics/region_errors.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ impl<'tcx> ConstraintDescription for ConstraintCategory<'tcx> {
6161
ConstraintCategory::OpaqueType => "opaque type ",
6262
ConstraintCategory::ClosureUpvar(_) => "closure capture ",
6363
ConstraintCategory::Usage => "this usage ",
64-
ConstraintCategory::Predicate(_)
64+
ConstraintCategory::Predicate(..)
6565
| ConstraintCategory::Boring
6666
| ConstraintCategory::BoringNoLocation
6767
| ConstraintCategory::Internal

‎compiler/rustc_borrowck/src/region_infer/mod.rs‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1989,7 +1989,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
19891989
continue;
19901990
};
19911991
debug!(?constraint, ?p);
1992-
let ConstraintCategory::Predicate(span) = constraint.category else {
1992+
let ConstraintCategory::Predicate(_, span) = constraint.category else {
19931993
continue;
19941994
};
19951995
extra_info.push(ExtraConstraintInfo::PlaceholderFromPredicate(span));
@@ -2004,11 +2004,13 @@ impl<'tcx> RegionInferenceContext<'tcx> {
20042004
let cause_code = path
20052005
.iter()
20062006
.find_map(|constraint| {
2007-
if let ConstraintCategory::Predicate(predicate_span) = constraint.category {
2007+
if let ConstraintCategory::Predicate(source_def_id, predicate_span) =
2008+
constraint.category
2009+
{
20082010
// We currently do not store the `DefId` in the `ConstraintCategory`
20092011
// for performances reasons. The error reporting code used by NLL only
20102012
// uses the span, so this doesn't cause any problems at the moment.
2011-
Some(ObligationCauseCode::WhereClause(CRATE_DEF_ID.to_def_id(), predicate_span))
2013+
Some(ObligationCauseCode::WhereClause(source_def_id, predicate_span))
20122014
} else {
20132015
None
20142016
}
@@ -2102,7 +2104,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
21022104
| ConstraintCategory::Boring
21032105
| ConstraintCategory::BoringNoLocation
21042106
| ConstraintCategory::Internal
2105-
| ConstraintCategory::Predicate(_) => false,
2107+
| ConstraintCategory::Predicate(..) => false,
21062108
ConstraintCategory::TypeAnnotation
21072109
| ConstraintCategory::Return(_)
21082110
| ConstraintCategory::Yield => true,
@@ -2115,7 +2117,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
21152117
| ConstraintCategory::Boring
21162118
| ConstraintCategory::BoringNoLocation
21172119
| ConstraintCategory::Internal
2118-
| ConstraintCategory::Predicate(_)
2120+
| ConstraintCategory::Predicate(..)
21192121
)
21202122
}
21212123
};

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,13 +101,13 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
101101
&mut self,
102102
// Keep this parameter for now, in case we start using
103103
// it in `ConstraintCategory` at some point.
104-
_def_id: DefId,
104+
def_id: DefId,
105105
instantiated_predicates: ty::InstantiatedPredicates<'tcx>,
106106
locations: Locations,
107107
) {
108108
for (predicate, span) in instantiated_predicates {
109109
debug!(?span, ?predicate);
110-
let category = ConstraintCategory::Predicate(span);
110+
let category = ConstraintCategory::Predicate(def_id, span);
111111
let predicate = self.normalize_with_category(predicate, locations, category);
112112
self.prove_predicate(predicate, locations, category);
113113
}

‎compiler/rustc_infer/src/infer/error_reporting/nice_region_error/placeholder_error.rs‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use crate::traits::{ObligationCause, ObligationCauseCode};
1010
use rustc_data_structures::intern::Interned;
1111
use rustc_errors::{Diag, IntoDiagArg};
1212
use rustc_hir::def::Namespace;
13-
use rustc_hir::def_id::{DefId, CRATE_DEF_ID};
13+
use rustc_hir::def_id::DefId;
1414
use rustc_middle::bug;
1515
use rustc_middle::ty::error::ExpectedFound;
1616
use rustc_middle::ty::print::{FmtPrinter, Print, PrintTraitRefExt as _, RegionHighlightMode};
@@ -240,21 +240,17 @@ impl<'tcx> NiceRegionError<'_, 'tcx> {
240240
) -> Diag<'tcx> {
241241
let span = cause.span();
242242

243-
let (leading_ellipsis, satisfy_span, where_span, dup_span, def_id) =
244-
if let ObligationCauseCode::WhereClause(def_id, span)
245-
| ObligationCauseCode::WhereClauseInExpr(def_id, span, ..) = *cause.code()
246-
&& def_id != CRATE_DEF_ID.to_def_id()
247-
{
248-
(
249-
true,
250-
Some(span),
251-
Some(self.tcx().def_span(def_id)),
252-
None,
253-
self.tcx().def_path_str(def_id),
254-
)
255-
} else {
256-
(false, None, None, Some(span), String::new())
257-
};
243+
let (leading_ellipsis, satisfy_span, where_span, dup_span, def_id) = match *cause.code() {
244+
ObligationCauseCode::WhereClause(def_id, pred_span)
245+
| ObligationCauseCode::WhereClauseInExpr(def_id, pred_span, ..) => (
246+
true,
247+
Some(span),
248+
if pred_span.is_dummy() { Some(span) } else { Some(pred_span) },
249+
None,
250+
self.tcx().def_path_str(def_id),
251+
),
252+
_ => (false, None, None, Some(span), String::new()),
253+
};
258254

259255
let expected_trait_ref = self.cx.resolve_vars_if_possible(ty::TraitRef::new_from_args(
260256
self.cx.tcx,

‎compiler/rustc_infer/src/infer/error_reporting/region.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
262262
infer::CheckAssociatedTypeBounds { ref parent, .. } => {
263263
self.note_region_origin(err, parent);
264264
}
265-
infer::AscribeUserTypeProvePredicate(span) => {
265+
infer::AscribeUserTypeProvePredicate(_, span) => {
266266
RegionOriginNote::Plain {
267267
span,
268268
msg: fluent::infer_ascribe_user_type_prove_predicate,
@@ -483,7 +483,7 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
483483
);
484484
err
485485
}
486-
infer::AscribeUserTypeProvePredicate(span) => {
486+
infer::AscribeUserTypeProvePredicate(_, span) => {
487487
let instantiated = note_and_explain::RegionExplanation::new(
488488
self.tcx,
489489
generic_param_scope,

‎compiler/rustc_infer/src/infer/mod.rs‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ pub enum SubregionOrigin<'tcx> {
413413
trait_item_def_id: DefId,
414414
},
415415

416-
AscribeUserTypeProvePredicate(Span),
416+
AscribeUserTypeProvePredicate(DefId, Span),
417417
}
418418

419419
// `SubregionOrigin` is used a lot. Make sure it doesn't unintentionally get bigger.
@@ -424,7 +424,9 @@ impl<'tcx> SubregionOrigin<'tcx> {
424424
pub fn to_constraint_category(&self) -> ConstraintCategory<'tcx> {
425425
match self {
426426
Self::Subtype(type_trace) => type_trace.cause.to_constraint_category(),
427-
Self::AscribeUserTypeProvePredicate(span) => ConstraintCategory::Predicate(*span),
427+
Self::AscribeUserTypeProvePredicate(def_id, span) => {
428+
ConstraintCategory::Predicate(*def_id, *span)
429+
}
428430
_ => ConstraintCategory::BoringNoLocation,
429431
}
430432
}
@@ -1766,7 +1768,7 @@ impl<'tcx> SubregionOrigin<'tcx> {
17661768
Reborrow(a) => a,
17671769
ReferenceOutlivesReferent(_, a) => a,
17681770
CompareImplItemObligation { span, .. } => span,
1769-
AscribeUserTypeProvePredicate(span) => span,
1771+
AscribeUserTypeProvePredicate(_, span) => span,
17701772
CheckAssociatedTypeBounds { ref parent, .. } => parent.span(),
17711773
}
17721774
}
@@ -1799,8 +1801,8 @@ impl<'tcx> SubregionOrigin<'tcx> {
17991801
parent: Box::new(default()),
18001802
},
18011803

1802-
traits::ObligationCauseCode::AscribeUserTypeProvePredicate(span) => {
1803-
SubregionOrigin::AscribeUserTypeProvePredicate(span)
1804+
traits::ObligationCauseCode::AscribeUserTypeProvePredicate(def_id, span) => {
1805+
SubregionOrigin::AscribeUserTypeProvePredicate(def_id, span)
18041806
}
18051807

18061808
_ => default(),

‎compiler/rustc_infer/src/infer/outlives/obligations.rs‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ use crate::infer::snapshot::undo_log::UndoLog;
6666
use crate::infer::{self, GenericKind, InferCtxt, RegionObligation, SubregionOrigin, VerifyBound};
6767
use crate::traits::{ObligationCause, ObligationCauseCode};
6868
use rustc_data_structures::undo_log::UndoLogs;
69+
use rustc_hir::def_id::CRATE_DEF_ID;
6970
use rustc_middle::bug;
7071
use rustc_middle::mir::ConstraintCategory;
7172
use rustc_middle::traits::query::NoSolution;
@@ -153,11 +154,20 @@ impl<'tcx> InferCtxt<'tcx> {
153154
Some(
154155
deeply_normalize_ty(
155156
outlives,
156-
SubregionOrigin::AscribeUserTypeProvePredicate(DUMMY_SP),
157+
SubregionOrigin::AscribeUserTypeProvePredicate(
158+
CRATE_DEF_ID.to_def_id(),
159+
DUMMY_SP,
160+
),
157161
)
158162
// FIXME(-Znext-solver): How do we accurately report an error span here :(
159163
.map_err(|NoSolution| {
160-
(outlives, SubregionOrigin::AscribeUserTypeProvePredicate(DUMMY_SP))
164+
(
165+
outlives,
166+
SubregionOrigin::AscribeUserTypeProvePredicate(
167+
CRATE_DEF_ID.to_def_id(),
168+
DUMMY_SP,
169+
),
170+
)
161171
}),
162172
)
163173
})

‎compiler/rustc_middle/src/mir/query.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use crate::mir;
44
use crate::ty::{self, CoroutineArgsExt, OpaqueHiddenType, Ty, TyCtxt};
55
use rustc_data_structures::fx::FxIndexMap;
66
use rustc_errors::ErrorGuaranteed;
7-
use rustc_hir::def_id::LocalDefId;
7+
use rustc_hir::def_id::{DefId, LocalDefId};
88
use rustc_index::bit_set::BitMatrix;
99
use rustc_index::{Idx, IndexVec};
1010
use rustc_macros::{HashStable, TyDecodable, TyEncodable, TypeFoldable, TypeVisitable};
@@ -263,7 +263,7 @@ pub enum ConstraintCategory<'tcx> {
263263
/// A constraint from a user-written predicate
264264
/// with the provided span, written on the item
265265
/// with the given `DefId`
266-
Predicate(Span),
266+
Predicate(#[derivative(PartialOrd = "ignore", Ord = "ignore")] DefId, Span),
267267

268268
/// A "boring" constraint (caused by the given location) is one that
269269
/// the user probably doesn't want to see described in diagnostics,

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@ impl<'tcx> ObligationCause<'tcx> {
140140
pub fn to_constraint_category(&self) -> ConstraintCategory<'tcx> {
141141
match self.code() {
142142
ObligationCauseCode::MatchImpl(cause, _) => cause.to_constraint_category(),
143-
ObligationCauseCode::AscribeUserTypeProvePredicate(predicate_span) => {
144-
ConstraintCategory::Predicate(*predicate_span)
143+
ObligationCauseCode::AscribeUserTypeProvePredicate(def_id, predicate_span) => {
144+
ConstraintCategory::Predicate(*def_id, *predicate_span)
145145
}
146146
_ => ConstraintCategory::BoringNoLocation,
147147
}
@@ -388,7 +388,7 @@ pub enum ObligationCauseCode<'tcx> {
388388
output_ty: Option<Ty<'tcx>>,
389389
},
390390

391-
AscribeUserTypeProvePredicate(Span),
391+
AscribeUserTypeProvePredicate(DefId, Span),
392392

393393
RustCall,
394394

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ fn relate_mir_and_user_args<'tcx>(
107107
let span = if span == DUMMY_SP { predicate_span } else { span };
108108
let cause = ObligationCause::new(
109109
span,
110-
CRATE_DEF_ID,
111-
ObligationCauseCode::AscribeUserTypeProvePredicate(predicate_span),
110+
def_id.as_local().unwrap_or(CRATE_DEF_ID),
111+
ObligationCauseCode::AscribeUserTypeProvePredicate(def_id, predicate_span),
112112
);
113113
let instantiated_predicate =
114114
ocx.normalize(&cause.clone(), param_env, instantiated_predicate);
@@ -118,7 +118,7 @@ fn relate_mir_and_user_args<'tcx>(
118118

119119
// Now prove the well-formedness of `def_id` with `args`.
120120
// Note for some items, proving the WF of `ty` is not sufficient because the
121-
// well-formedness of an item may depend on the WF of gneneric args not present in the
121+
// well-formedness of an item may depend on the WF of generic args not present in the
122122
// item's type. Currently this is true for associated consts, e.g.:
123123
// ```rust
124124
// impl<T> MyTy<T> {

0 commit comments

Comments
 (0)