Skip to content

Commit bd61caf

Browse files
matthiaskrgrmatthiaskrgr
authored
Rollup merge of #119813 - oli-obk:even_more_follow_up_errors2, r=estebank
Silence some follow-up errors [2/x] this is one piece of the requested cleanups from #117449 the `type_of` query frequently uses astconv to convert a `hir::Ty` to a `ty::Ty`. This process is infallible, but may produce errors as it goes. All the error reporting sites that had access to the `ItemCtxt` are now tainting it, causing `type_of` to return a `ty::Error` instead of anything else.
2 parents fe97e93 + 55cab53 commit bd61caf

35 files changed

+100
-266
lines changed

‎compiler/rustc_hir_analysis/src/astconv/bounds.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,13 +300,15 @@ impl<'tcx> dyn AstConv<'tcx> + '_ {
300300
.expect("missing associated item");
301301

302302
if !assoc_item.visibility(tcx).is_accessible_from(def_scope, tcx) {
303-
tcx.dcx()
303+
let reported = tcx
304+
.dcx()
304305
.struct_span_err(
305306
binding.span,
306307
format!("{} `{}` is private", assoc_item.kind, binding.item_name),
307308
)
308309
.with_span_label(binding.span, format!("private {}", assoc_item.kind))
309310
.emit();
311+
self.set_tainted_by_errors(reported);
310312
}
311313
tcx.check_stability(assoc_item.def_id, Some(hir_ref_id), binding.span, None);
312314

‎compiler/rustc_hir_analysis/src/astconv/errors.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,9 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
354354
);
355355
err.span_label(name.span, format!("multiple `{name}` found"));
356356
self.note_ambiguous_inherent_assoc_type(&mut err, candidates, span);
357-
err.emit()
357+
let reported = err.emit();
358+
self.set_tainted_by_errors(reported);
359+
reported
358360
}
359361

360362
// FIXME(fmease): Heavily adapted from `rustc_hir_typeck::method::suggest`. Deduplicate.
@@ -843,7 +845,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
843845
}
844846
}
845847

846-
err.emit();
848+
self.set_tainted_by_errors(err.emit());
847849
}
848850
}
849851

‎compiler/rustc_hir_analysis/src/astconv/mod.rs

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -390,6 +390,12 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
390390
infer_args,
391391
);
392392

393+
if let Err(err) = &arg_count.correct
394+
&& let Some(reported) = err.reported
395+
{
396+
self.set_tainted_by_errors(reported);
397+
}
398+
393399
// Skip processing if type has no generic parameters.
394400
// Traits always have `Self` as a generic parameter, which means they will not return early
395401
// here and so associated type bindings will be handled regardless of whether there are any
@@ -568,6 +574,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
568574
span,
569575
modifier: constness.as_str(),
570576
});
577+
self.set_tainted_by_errors(e);
571578
arg_count.correct =
572579
Err(GenericArgCountMismatch { reported: Some(e), invalid_args: vec![] });
573580
}
@@ -966,7 +973,9 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
966973
}
967974
}
968975
}
969-
err.emit()
976+
let reported = err.emit();
977+
self.set_tainted_by_errors(reported);
978+
reported
970979
}
971980

972981
// Search for a bound on a type parameter which includes the associated item
@@ -1043,6 +1052,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
10431052
span,
10441053
binding,
10451054
);
1055+
self.set_tainted_by_errors(reported);
10461056
return Err(reported);
10471057
};
10481058
debug!(?bound);
@@ -1120,6 +1130,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
11201130
));
11211131
}
11221132
let reported = err.emit();
1133+
self.set_tainted_by_errors(reported);
11231134
if !where_bounds.is_empty() {
11241135
return Err(reported);
11251136
}
@@ -1374,6 +1385,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
13741385
assoc_ident.name,
13751386
)
13761387
};
1388+
self.set_tainted_by_errors(reported);
13771389
return Err(reported);
13781390
}
13791391
};
@@ -1616,12 +1628,14 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
16161628
let kind = tcx.def_kind_descr(kind, item);
16171629
let msg = format!("{kind} `{name}` is private");
16181630
let def_span = tcx.def_span(item);
1619-
tcx.dcx()
1631+
let reported = tcx
1632+
.dcx()
16201633
.struct_span_err(span, msg)
16211634
.with_code(rustc_errors::error_code!(E0624))
16221635
.with_span_label(span, format!("private {kind}"))
16231636
.with_span_label(def_span, format!("{kind} defined here"))
16241637
.emit();
1638+
self.set_tainted_by_errors(reported);
16251639
}
16261640
tcx.check_stability(item, Some(block), span, None);
16271641
}
@@ -1862,7 +1876,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
18621876
err.span_label(span, format!("not allowed on {what}"));
18631877
}
18641878
extend(&mut err);
1865-
err.emit();
1879+
self.set_tainted_by_errors(err.emit());
18661880
emitted = true;
18671881
}
18681882

@@ -2184,7 +2198,9 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
21842198
{
21852199
err.span_note(impl_.self_ty.span, "not a concrete type");
21862200
}
2187-
Ty::new_error(tcx, err.emit())
2201+
let reported = err.emit();
2202+
self.set_tainted_by_errors(reported);
2203+
Ty::new_error(tcx, reported)
21882204
} else {
21892205
ty
21902206
}
@@ -2586,7 +2602,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
25862602
);
25872603
}
25882604

2589-
diag.emit();
2605+
self.set_tainted_by_errors(diag.emit());
25902606
}
25912607

25922608
// Find any late-bound regions declared in return type that do
@@ -2686,7 +2702,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
26862702
err.note("consider introducing a named lifetime parameter");
26872703
}
26882704

2689-
err.emit();
2705+
self.set_tainted_by_errors(err.emit());
26902706
}
26912707
}
26922708

@@ -2725,7 +2741,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
27252741
// error.
27262742
let r = derived_region_bounds[0];
27272743
if derived_region_bounds[1..].iter().any(|r1| r != *r1) {
2728-
tcx.dcx().emit_err(AmbiguousLifetimeBound { span });
2744+
self.set_tainted_by_errors(tcx.dcx().emit_err(AmbiguousLifetimeBound { span }));
27292745
}
27302746
Some(r)
27312747
}

‎compiler/rustc_hir_analysis/src/astconv/object_safety.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
116116
for more information on them, visit \
117117
<https://doc.rust-lang.org/reference/special-types-and-traits.html#auto-traits>",
118118
);
119-
err.emit();
119+
self.set_tainted_by_errors(err.emit());
120120
}
121121

122122
if regular_traits.is_empty() && auto_traits.is_empty() {
@@ -127,6 +127,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
127127
.map(|trait_ref| tcx.def_span(trait_ref));
128128
let reported =
129129
tcx.dcx().emit_err(TraitObjectDeclaredWithNoTraits { span, trait_alias_span });
130+
self.set_tainted_by_errors(reported);
130131
return Ty::new_error(tcx, reported);
131132
}
132133

@@ -290,7 +291,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
290291

291292
if references_self {
292293
let def_id = i.bottom().0.def_id();
293-
struct_span_code_err!(
294+
let reported = struct_span_code_err!(
294295
tcx.dcx(),
295296
i.bottom().1,
296297
E0038,
@@ -303,6 +304,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
303304
.error_msg(),
304305
)
305306
.emit();
307+
self.set_tainted_by_errors(reported);
306308
}
307309

308310
ty::ExistentialTraitRef { def_id: trait_ref.def_id, args }
@@ -389,6 +391,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
389391
} else {
390392
err.emit()
391393
};
394+
self.set_tainted_by_errors(e);
392395
ty::Region::new_error(tcx, e)
393396
})
394397
}

‎compiler/rustc_hir_analysis/src/collect.rs

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ use rustc_target::spec::abi;
3535
use rustc_trait_selection::infer::InferCtxtExt;
3636
use rustc_trait_selection::traits::error_reporting::suggestions::NextTypeParamName;
3737
use rustc_trait_selection::traits::ObligationCtxt;
38+
use std::cell::Cell;
3839
use std::iter;
3940
use std::ops::Bound;
4041

@@ -119,6 +120,7 @@ pub fn provide(providers: &mut Providers) {
119120
pub struct ItemCtxt<'tcx> {
120121
tcx: TyCtxt<'tcx>,
121122
item_def_id: LocalDefId,
123+
tainted_by_errors: Cell<Option<ErrorGuaranteed>>,
122124
}
123125

124126
///////////////////////////////////////////////////////////////////////////
@@ -343,7 +345,7 @@ fn bad_placeholder<'tcx>(
343345

344346
impl<'tcx> ItemCtxt<'tcx> {
345347
pub fn new(tcx: TyCtxt<'tcx>, item_def_id: LocalDefId) -> ItemCtxt<'tcx> {
346-
ItemCtxt { tcx, item_def_id }
348+
ItemCtxt { tcx, item_def_id, tainted_by_errors: Cell::new(None) }
347349
}
348350

349351
pub fn to_ty(&self, ast_ty: &hir::Ty<'_>) -> Ty<'tcx> {
@@ -357,6 +359,13 @@ impl<'tcx> ItemCtxt<'tcx> {
357359
pub fn node(&self) -> hir::Node<'tcx> {
358360
self.tcx.hir_node(self.hir_id())
359361
}
362+
363+
fn check_tainted_by_errors(&self) -> Result<(), ErrorGuaranteed> {
364+
match self.tainted_by_errors.get() {
365+
Some(err) => Err(err),
366+
None => Ok(()),
367+
}
368+
}
360369
}
361370

362371
impl<'tcx> AstConv<'tcx> for ItemCtxt<'tcx> {
@@ -492,8 +501,8 @@ impl<'tcx> AstConv<'tcx> for ItemCtxt<'tcx> {
492501
ty.ty_adt_def()
493502
}
494503

495-
fn set_tainted_by_errors(&self, _: ErrorGuaranteed) {
496-
// There's no obvious place to track this, so just let it go.
504+
fn set_tainted_by_errors(&self, err: ErrorGuaranteed) {
505+
self.tainted_by_errors.set(Some(err));
497506
}
498507

499508
fn record_ty(&self, _hir_id: hir::HirId, _ty: Ty<'tcx>, _span: Span) {

‎compiler/rustc_hir_analysis/src/collect/type_of.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,11 @@ pub(super) fn type_of(tcx: TyCtxt<'_>, def_id: LocalDefId) -> ty::EarlyBinder<Ty
513513
bug!("unexpected sort of node in type_of(): {:?}", x);
514514
}
515515
};
516-
ty::EarlyBinder::bind(output)
516+
if let Err(e) = icx.check_tainted_by_errors() {
517+
ty::EarlyBinder::bind(Ty::new_error(tcx, e))
518+
} else {
519+
ty::EarlyBinder::bind(output)
520+
}
517521
}
518522

519523
pub(super) fn type_of_opaque(

‎compiler/rustc_hir_typeck/src/closure.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -802,7 +802,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
802802
.explicit_item_bounds(def_id)
803803
.iter_instantiated_copied(self.tcx, args)
804804
.find_map(|(p, s)| get_future_output(p.as_predicate(), s))?,
805-
ty::Error(_) => return None,
805+
ty::Error(_) => return Some(ret_ty),
806806
_ => span_bug!(
807807
closure_span,
808808
"async fn coroutine return type not an inference variable: {ret_ty}"

‎tests/rustdoc-ui/unable-fulfill-trait.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ pub struct Foo<'a, 'b, T> {
44
field1: dyn Bar<'a, 'b,>,
55
//~^ ERROR
66
//~| ERROR
7-
//~| ERROR
87
}
98

109
pub trait Bar<'x, 's, U>

‎tests/rustdoc-ui/unable-fulfill-trait.stderr

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ LL | field1: dyn Bar<'a, 'b,>,
55
| ^^^ expected 1 generic argument
66
|
77
note: trait defined here, with 1 generic parameter: `U`
8-
--> $DIR/unable-fulfill-trait.rs:10:11
8+
--> $DIR/unable-fulfill-trait.rs:9:11
99
|
1010
LL | pub trait Bar<'x, 's, U>
1111
| ^^^ -
@@ -20,24 +20,7 @@ error[E0227]: ambiguous lifetime bound, explicit lifetime bound required
2020
LL | field1: dyn Bar<'a, 'b,>,
2121
| ^^^^^^^^^^^^^^^^
2222

23-
error[E0478]: lifetime bound not satisfied
24-
--> $DIR/unable-fulfill-trait.rs:4:13
25-
|
26-
LL | field1: dyn Bar<'a, 'b,>,
27-
| ^^^^^^^^^^^^^^^^
28-
|
29-
note: lifetime parameter instantiated with the lifetime `'b` as defined here
30-
--> $DIR/unable-fulfill-trait.rs:3:20
31-
|
32-
LL | pub struct Foo<'a, 'b, T> {
33-
| ^^
34-
note: but lifetime parameter must outlive the lifetime `'a` as defined here
35-
--> $DIR/unable-fulfill-trait.rs:3:16
36-
|
37-
LL | pub struct Foo<'a, 'b, T> {
38-
| ^^
39-
40-
error: aborting due to 3 previous errors
23+
error: aborting due to 2 previous errors
4124

42-
Some errors have detailed explanations: E0107, E0227, E0478.
25+
Some errors have detailed explanations: E0107, E0227.
4326
For more information about an error, try `rustc --explain E0107`.

‎tests/ui/associated-inherent-types/issue-109071.no_gate.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ LL | type Item = &[T];
3030
= help: add `#![feature(inherent_associated_types)]` to the crate attributes to enable
3131

3232
error[E0223]: ambiguous associated type
33-
--> $DIR/issue-109071.rs:16:22
33+
--> $DIR/issue-109071.rs:15:22
3434
|
3535
LL | fn T() -> Option<Self::Item> {}
3636
| ^^^^^^^^^^

‎tests/ui/associated-inherent-types/issue-109071.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,11 @@ impl<T> Windows { //~ ERROR: missing generics for struct `Windows`
99
//[no_gate]~^ ERROR: inherent associated types are unstable
1010

1111
fn next() -> Option<Self::Item> {}
12-
//[with_gate]~^ ERROR type annotations needed
1312
}
1413

1514
impl<T> Windows<T> {
1615
fn T() -> Option<Self::Item> {}
17-
//[no_gate]~^ ERROR: ambiguous associated type
18-
//[with_gate]~^^ ERROR type annotations needed
16+
//~^ ERROR: ambiguous associated type
1917
}
2018

2119
fn main() {}

‎tests/ui/associated-inherent-types/issue-109071.with_gate.stderr

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,20 @@ help: add missing generic argument
2020
LL | impl<T> Windows<T> {
2121
| +++
2222

23-
error[E0282]: type annotations needed
24-
--> $DIR/issue-109071.rs:11:18
25-
|
26-
LL | fn next() -> Option<Self::Item> {}
27-
| ^^^^^^^^^^^^^^^^^^ cannot infer type for type parameter `T`
28-
29-
error[E0282]: type annotations needed
30-
--> $DIR/issue-109071.rs:16:15
23+
error[E0223]: ambiguous associated type
24+
--> $DIR/issue-109071.rs:15:22
3125
|
3226
LL | fn T() -> Option<Self::Item> {}
33-
| ^^^^^^^^^^^^^^^^^^ cannot infer type for type parameter `T`
27+
| ^^^^^^^^^^
28+
|
29+
help: use fully-qualified syntax
30+
|
31+
LL | fn T() -> Option<<Windows<T> as IntoAsyncIterator>::Item> {}
32+
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
33+
LL | fn T() -> Option<<Windows<T> as IntoIterator>::Item> {}
34+
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3435

35-
error: aborting due to 4 previous errors
36+
error: aborting due to 3 previous errors
3637

37-
Some errors have detailed explanations: E0107, E0282, E0637.
38+
Some errors have detailed explanations: E0107, E0223, E0637.
3839
For more information about an error, try `rustc --explain E0107`.

‎tests/ui/associated-types/issue-23595-1.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ use std::ops::Index;
55
trait Hierarchy {
66
type Value;
77
type ChildKey;
8-
type Children = dyn Index<Self::ChildKey, Output=dyn Hierarchy>;
8+
type Children = dyn Index<Self::ChildKey, Output = dyn Hierarchy>;
99
//~^ ERROR: the value of the associated types
10-
//~| ERROR: the size for values of type
1110

1211
fn data(&self) -> Option<(Self::Value, Self::Children)>;
1312
}

0 commit comments

Comments
 (0)