Skip to content

Commit c1bb352

Browse files
oli-obkoli-obk
committed
Continue compilation even if inherent impl checks fail
1 parent ee9c7c9 commit c1bb352

13 files changed

+244
-60
lines changed

‎compiler/rustc_hir_analysis/src/lib.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,9 @@ pub fn check_crate(tcx: TyCtxt<'_>) -> Result<(), ErrorGuaranteed> {
178178
let _ = tcx.ensure().coherent_trait(trait_def_id);
179179
}
180180
// these queries are executed for side-effects (error reporting):
181-
res.and(tcx.ensure().crate_inherent_impls(()))
182-
.and(tcx.ensure().crate_inherent_impls_overlap_check(()))
181+
let _ = tcx.ensure().crate_inherent_impls(());
182+
let _ = tcx.ensure().crate_inherent_impls_overlap_check(());
183+
res
183184
})?;
184185

185186
if tcx.features().rustc_attrs {

‎tests/ui/const-generics/wrong-normalization.rs

+1
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,6 @@ pub struct I8<const F: i8>;
1515

1616
impl <I8<{i8::MIN}> as Identity>::Identity {
1717
//~^ ERROR no nominal type found for inherent implementation
18+
//~| ERROR no associated item named `MIN` found for type `i8`
1819
pub fn foo(&self) {}
1920
}

‎tests/ui/const-generics/wrong-normalization.stderr

+14-2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,18 @@ LL | impl <I8<{i8::MIN}> as Identity>::Identity {
66
|
77
= note: either implement a trait on it or create a newtype to wrap it instead
88

9-
error: aborting due to 1 previous error
9+
error[E0599]: no associated item named `MIN` found for type `i8` in the current scope
10+
--> $DIR/wrong-normalization.rs:16:15
11+
|
12+
LL | impl <I8<{i8::MIN}> as Identity>::Identity {
13+
| ^^^ associated item not found in `i8`
14+
|
15+
help: you are looking for the module in `std`, not the primitive type
16+
|
17+
LL | impl <I8<{std::i8::MIN}> as Identity>::Identity {
18+
| +++++
19+
20+
error: aborting due to 2 previous errors
1021

11-
For more information about this error, try `rustc --explain E0118`.
22+
Some errors have detailed explanations: E0118, E0599.
23+
For more information about an error, try `rustc --explain E0118`.

‎tests/ui/impl-trait/where-allowed.rs

+6
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ fn in_dyn_Fn_parameter_in_return() -> &'static dyn Fn(impl Debug) { panic!() }
4444

4545
// Allowed
4646
fn in_dyn_Fn_return_in_return() -> &'static dyn Fn() -> impl Debug { panic!() }
47+
//~^ ERROR: type annotations needed
4748

4849
// Disallowed
4950
fn in_impl_Fn_parameter_in_parameters(_: &impl Fn(impl Debug)) { panic!() }
@@ -58,9 +59,11 @@ fn in_impl_Fn_return_in_parameters(_: &impl Fn() -> impl Debug) { panic!() }
5859
fn in_impl_Fn_parameter_in_return() -> &'static impl Fn(impl Debug) { panic!() }
5960
//~^ ERROR `impl Trait` is not allowed in the parameters of `Fn` trait bounds
6061
//~| ERROR nested `impl Trait` is not allowed
62+
//~| ERROR: type annotations needed
6163

6264
// Allowed
6365
fn in_impl_Fn_return_in_return() -> &'static impl Fn() -> impl Debug { panic!() }
66+
//~^ ERROR: type annotations needed
6467

6568
// Disallowed
6669
fn in_Fn_parameter_in_generics<F: Fn(impl Debug)> (_: F) { panic!() }
@@ -77,6 +80,7 @@ fn in_impl_Trait_in_parameters(_: impl Iterator<Item = impl Iterator>) { panic!(
7780
// Allowed
7881
fn in_impl_Trait_in_return() -> impl IntoIterator<Item = impl IntoIterator> {
7982
vec![vec![0; 10], vec![12; 7], vec![8; 3]]
83+
//~^ ERROR: no function or associated item named `into_vec` found for slice `[_]`
8084
}
8185

8286
// Disallowed
@@ -118,11 +122,13 @@ trait DummyTrait {
118122
impl DummyTrait for () {
119123
type Out = impl Debug;
120124
//~^ ERROR `impl Trait` in associated types is unstable
125+
//~| ERROR unconstrained opaque type
121126

122127
fn in_trait_impl_parameter(_: impl Debug) { }
123128
// Allowed
124129

125130
fn in_trait_impl_return() -> impl Debug { () }
131+
//~^ ERROR `in_trait_impl_return` has an incompatible type for trait
126132
// Allowed
127133
}
128134

0 commit comments

Comments
 (0)