Skip to content

Commit af7f8f9

Browse files
oli-obkoli-obk
committed
Silence follow up errors if astconv already errored
1 parent 252ac15 commit af7f8f9

21 files changed

+56
-164
lines changed

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

Lines changed: 7 additions & 0 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
}

‎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(

‎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/const-generics/issues/issue-71381.full.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LL | pub fn call_me<Args: Sized, const IDX: usize, const FN: unsafe extern "
77
= note: type parameters may not be used in the type of const parameters
88

99
error[E0770]: the type of const parameters must not depend on other generic parameters
10-
--> $DIR/issue-71381.rs:23:40
10+
--> $DIR/issue-71381.rs:22:40
1111
|
1212
LL | const FN: unsafe extern "C" fn(Args),
1313
| ^^^^ the type must not depend on the parameter `Args`

‎tests/ui/const-generics/issues/issue-71381.min.stderr

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,13 @@ LL | pub fn call_me<Args: Sized, const IDX: usize, const FN: unsafe extern "
77
= note: type parameters may not be used in the type of const parameters
88

99
error[E0770]: the type of const parameters must not depend on other generic parameters
10-
--> $DIR/issue-71381.rs:23:40
10+
--> $DIR/issue-71381.rs:22:40
1111
|
1212
LL | const FN: unsafe extern "C" fn(Args),
1313
| ^^^^ the type must not depend on the parameter `Args`
1414
|
1515
= note: type parameters may not be used in the type of const parameters
1616

17-
error: using function pointers as const generic parameters is forbidden
18-
--> $DIR/issue-71381.rs:14:61
19-
|
20-
LL | pub fn call_me<Args: Sized, const IDX: usize, const FN: unsafe extern "C" fn(Args)>(&self) {
21-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
22-
|
23-
= note: the only supported types are integers, `bool` and `char`
24-
25-
error: using function pointers as const generic parameters is forbidden
26-
--> $DIR/issue-71381.rs:23:19
27-
|
28-
LL | const FN: unsafe extern "C" fn(Args),
29-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
30-
|
31-
= note: the only supported types are integers, `bool` and `char`
32-
33-
error: aborting due to 4 previous errors
17+
error: aborting due to 2 previous errors
3418

3519
For more information about this error, try `rustc --explain E0770`.

‎tests/ui/const-generics/issues/issue-71381.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,15 @@ unsafe extern "C" fn pass(args: PassArg) {
1212

1313
impl Test {
1414
pub fn call_me<Args: Sized, const IDX: usize, const FN: unsafe extern "C" fn(Args)>(&self) {
15-
//[min]~^ ERROR: using function pointers as const generic parameters is forbidden
16-
//~^^ ERROR: the type of const parameters must not depend on other generic parameters
15+
//~^ ERROR: the type of const parameters must not depend on other generic parameters
1716
self.0 = Self::trampiline::<Args, IDX, FN> as _
1817
}
1918

2019
unsafe extern "C" fn trampiline<
2120
Args: Sized,
2221
const IDX: usize,
2322
const FN: unsafe extern "C" fn(Args),
24-
//[min]~^ ERROR: using function pointers as const generic parameters is forbidden
25-
//~^^ ERROR: the type of const parameters must not depend on other generic parameters
23+
//~^ ERROR: the type of const parameters must not depend on other generic parameters
2624
>(
2725
args: Args,
2826
) {

‎tests/ui/const-generics/issues/issue-71611.min.stderr

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,6 @@ LL | fn func<A, const F: fn(inner: A)>(outer: A) {
66
|
77
= note: type parameters may not be used in the type of const parameters
88

9-
error: using function pointers as const generic parameters is forbidden
10-
--> $DIR/issue-71611.rs:5:21
11-
|
12-
LL | fn func<A, const F: fn(inner: A)>(outer: A) {
13-
| ^^^^^^^^^^^^
14-
|
15-
= note: the only supported types are integers, `bool` and `char`
16-
17-
error: aborting due to 2 previous errors
9+
error: aborting due to 1 previous error
1810

1911
For more information about this error, try `rustc --explain E0770`.

0 commit comments

Comments
 (0)