Skip to content

Commit 8c9a75b

Browse files
borsbors
committed
Auto merge of #121154 - oli-obk:track_errors11, r=estebank
Merge `check_mod_impl_wf` and `check_mod_type_wf` This still causes some funny diagnostics, but I'm not sure they can be fixed without a larger change, which I'd like to avoid here. Reducing the number of times we iterate over the same items at this high level helps avoid parallel-compiler bottlenecks.
2 parents 51f4839 + 8206cff commit 8c9a75b

File tree

63 files changed

+736
-245
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+736
-245
lines changed

‎compiler/rustc_hir_analysis/src/check/wfcheck.rs

+2
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,8 @@ fn check_item<'tcx>(tcx: TyCtxt<'tcx>, item: &'tcx hir::Item<'tcx>) -> Result<()
248248
let header = tcx.impl_trait_header(def_id);
249249
let is_auto = header
250250
.is_some_and(|header| tcx.trait_is_auto(header.skip_binder().trait_ref.def_id));
251+
252+
crate::impl_wf_check::check_impl_wf(tcx, def_id)?;
251253
let mut res = Ok(());
252254
if let (hir::Defaultness::Default { .. }, true) = (impl_.defaultness, is_auto) {
253255
let sp = impl_.of_trait.as_ref().map_or(item.span, |t| t.path.span);

‎compiler/rustc_hir_analysis/src/impl_wf_check.rs

+7-15
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ use min_specialization::check_min_specialization;
1414
use rustc_data_structures::fx::FxHashSet;
1515
use rustc_errors::{codes::*, struct_span_code_err};
1616
use rustc_hir::def::DefKind;
17-
use rustc_hir::def_id::{LocalDefId, LocalModDefId};
18-
use rustc_middle::query::Providers;
17+
use rustc_hir::def_id::LocalDefId;
1918
use rustc_middle::ty::{self, TyCtxt, TypeVisitableExt};
2019
use rustc_span::{ErrorGuaranteed, Span, Symbol};
2120

@@ -51,23 +50,16 @@ mod min_specialization;
5150
/// impl<'a> Trait<Foo> for Bar { type X = &'a i32; }
5251
/// // ^ 'a is unused and appears in assoc type, error
5352
/// ```
54-
fn check_mod_impl_wf(tcx: TyCtxt<'_>, module_def_id: LocalModDefId) -> Result<(), ErrorGuaranteed> {
53+
pub fn check_impl_wf(tcx: TyCtxt<'_>, impl_def_id: LocalDefId) -> Result<(), ErrorGuaranteed> {
5554
let min_specialization = tcx.features().min_specialization;
56-
let module = tcx.hir_module_items(module_def_id);
5755
let mut res = Ok(());
58-
for id in module.items() {
59-
if matches!(tcx.def_kind(id.owner_id), DefKind::Impl { .. }) {
60-
res = res.and(enforce_impl_params_are_constrained(tcx, id.owner_id.def_id));
61-
if min_specialization {
62-
res = res.and(check_min_specialization(tcx, id.owner_id.def_id));
63-
}
64-
}
56+
debug_assert!(matches!(tcx.def_kind(impl_def_id), DefKind::Impl { .. }));
57+
res = res.and(enforce_impl_params_are_constrained(tcx, impl_def_id));
58+
if min_specialization {
59+
res = res.and(check_min_specialization(tcx, impl_def_id));
6560
}
66-
res
67-
}
6861

69-
pub fn provide(providers: &mut Providers) {
70-
*providers = Providers { check_mod_impl_wf, ..*providers };
62+
res
7163
}
7264

7365
fn enforce_impl_params_are_constrained(

‎compiler/rustc_hir_analysis/src/lib.rs

+4-12
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@ pub fn provide(providers: &mut Providers) {
153153
check_unused::provide(providers);
154154
variance::provide(providers);
155155
outlives::provide(providers);
156-
impl_wf_check::provide(providers);
157156
hir_wf_check::provide(providers);
158157
}
159158

@@ -171,29 +170,22 @@ pub fn check_crate(tcx: TyCtxt<'_>) -> Result<(), ErrorGuaranteed> {
171170
}
172171

173172
tcx.sess.time("coherence_checking", || {
174-
// Check impls constrain their parameters
175-
let res =
176-
tcx.hir().try_par_for_each_module(|module| tcx.ensure().check_mod_impl_wf(module));
173+
tcx.hir().par_for_each_module(|module| {
174+
let _ = tcx.ensure().check_mod_type_wf(module);
175+
});
177176

178177
for &trait_def_id in tcx.all_local_trait_impls(()).keys() {
179178
let _ = tcx.ensure().coherent_trait(trait_def_id);
180179
}
181180
// these queries are executed for side-effects (error reporting):
182181
let _ = tcx.ensure().crate_inherent_impls(());
183182
let _ = tcx.ensure().crate_inherent_impls_overlap_check(());
184-
res
185-
})?;
183+
});
186184

187185
if tcx.features().rustc_attrs {
188186
tcx.sess.time("variance_testing", || variance::test::test_variance(tcx))?;
189187
}
190188

191-
tcx.sess.time("wf_checking", || {
192-
tcx.hir().par_for_each_module(|module| {
193-
let _ = tcx.ensure().check_mod_type_wf(module);
194-
})
195-
});
196-
197189
if tcx.features().rustc_attrs {
198190
collect::test_opaque_hidden_types(tcx)?;
199191
}

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

-5
Original file line numberDiff line numberDiff line change
@@ -955,11 +955,6 @@ rustc_queries! {
955955
desc { |tcx| "checking deathness of variables in {}", describe_as_module(key, tcx) }
956956
}
957957

958-
query check_mod_impl_wf(key: LocalModDefId) -> Result<(), ErrorGuaranteed> {
959-
desc { |tcx| "checking that impls are well-formed in {}", describe_as_module(key, tcx) }
960-
ensure_forwards_result_if_red
961-
}
962-
963958
query check_mod_type_wf(key: LocalModDefId) -> Result<(), ErrorGuaranteed> {
964959
desc { |tcx| "checking that types are well-formed in {}", describe_as_module(key, tcx) }
965960
ensure_forwards_result_if_red

‎compiler/rustc_resolve/src/late.rs

+13-4
Original file line numberDiff line numberDiff line change
@@ -2593,10 +2593,19 @@ impl<'a: 'ast, 'b, 'ast, 'tcx> LateResolutionVisitor<'a, 'b, 'ast, 'tcx> {
25932593
let span = *entry.get();
25942594
let err = ResolutionError::NameAlreadyUsedInParameterList(ident.name, span);
25952595
self.report_error(param.ident.span, err);
2596-
if let GenericParamKind::Lifetime = param.kind {
2597-
// Record lifetime res, so lowering knows there is something fishy.
2598-
self.record_lifetime_param(param.id, LifetimeRes::Error);
2599-
}
2596+
let rib = match param.kind {
2597+
GenericParamKind::Lifetime => {
2598+
// Record lifetime res, so lowering knows there is something fishy.
2599+
self.record_lifetime_param(param.id, LifetimeRes::Error);
2600+
continue;
2601+
}
2602+
GenericParamKind::Type { .. } => &mut function_type_rib,
2603+
GenericParamKind::Const { .. } => &mut function_value_rib,
2604+
};
2605+
2606+
// Taint the resolution in case of errors to prevent follow up errors in typeck
2607+
self.r.record_partial_res(param.id, PartialRes::new(Res::Err));
2608+
rib.bindings.insert(ident, Res::Err);
26002609
continue;
26012610
}
26022611
Entry::Vacant(entry) => {

‎compiler/rustc_traits/src/codegen.rs

+8-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
use rustc_infer::infer::TyCtxtInferExt;
77
use rustc_infer::traits::{FulfillmentErrorCode, TraitEngineExt as _};
88
use rustc_middle::traits::CodegenObligationError;
9-
use rustc_middle::ty::{self, TyCtxt};
9+
use rustc_middle::ty::{self, TyCtxt, TypeVisitableExt};
1010
use rustc_trait_selection::traits::error_reporting::TypeErrCtxtExt;
1111
use rustc_trait_selection::traits::{
1212
ImplSource, Obligation, ObligationCause, SelectionContext, TraitEngine, TraitEngineExt,
@@ -72,6 +72,13 @@ pub fn codegen_select_candidate<'tcx>(
7272

7373
let impl_source = infcx.resolve_vars_if_possible(impl_source);
7474
let impl_source = infcx.tcx.erase_regions(impl_source);
75+
if impl_source.has_infer() {
76+
// Unused lifetimes on an impl get replaced with inference vars, but never resolved,
77+
// causing the return value of a query to contain inference vars. We do not have a concept
78+
// for this and will in fact ICE in stable hashing of the return value. So bail out instead.
79+
infcx.tcx.dcx().has_errors().unwrap();
80+
return Err(CodegenObligationError::FulfillmentError);
81+
}
7582

7683
Ok(&*tcx.arena.alloc(impl_source))
7784
}

‎tests/rustdoc-ui/not-wf-ambiguous-normalization.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ struct DefaultAllocator;
1212
// `<DefaultAllocator as Allocator>::Buffer` to be ambiguous,
1313
// which caused an ICE with `-Znormalize-docs`.
1414
impl<T> Allocator for DefaultAllocator {
15-
//~^ ERROR: type annotations needed
15+
//~^ ERROR: the type parameter `T` is not constrained
1616
type Buffer = ();
1717
}
1818

‎tests/rustdoc-ui/not-wf-ambiguous-normalization.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
error[E0282]: type annotations needed
2-
--> $DIR/not-wf-ambiguous-normalization.rs:14:23
1+
error[E0207]: the type parameter `T` is not constrained by the impl trait, self type, or predicates
2+
--> $DIR/not-wf-ambiguous-normalization.rs:14:6
33
|
44
LL | impl<T> Allocator for DefaultAllocator {
5-
| ^^^^^^^^^^^^^^^^ cannot infer type for type parameter `T`
5+
| ^ unconstrained type parameter
66

77
error: aborting due to 1 previous error
88

9-
For more information about this error, try `rustc --explain E0282`.
9+
For more information about this error, try `rustc --explain E0207`.

‎tests/ui/associated-types/issue-38821.stderr

+19-19
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,3 @@
1-
error[E0277]: the trait bound `<Col as Expression>::SqlType: NotNull` is not satisfied
2-
--> $DIR/issue-38821.rs:23:17
3-
|
4-
LL | #[derive(Debug, Copy, Clone)]
5-
| ^^^^ the trait `NotNull` is not implemented for `<Col as Expression>::SqlType`, which is required by `<Col as Expression>::SqlType: IntoNullable`
6-
|
7-
note: required for `<Col as Expression>::SqlType` to implement `IntoNullable`
8-
--> $DIR/issue-38821.rs:9:18
9-
|
10-
LL | impl<T: NotNull> IntoNullable for T {
11-
| ------- ^^^^^^^^^^^^ ^
12-
| |
13-
| unsatisfied trait bound introduced here
14-
= note: this error originates in the derive macro `Copy` (in Nightly builds, run with -Z macro-backtrace for more info)
15-
help: consider further restricting the associated type
16-
|
17-
LL | Expr: Expression<SqlType=<Col::SqlType as IntoNullable>::Nullable>, <Col as Expression>::SqlType: NotNull,
18-
| +++++++++++++++++++++++++++++++++++++++
19-
201
error[E0277]: the trait bound `<Col as Expression>::SqlType: NotNull` is not satisfied
212
--> $DIR/issue-38821.rs:40:1
223
|
@@ -129,6 +110,25 @@ LL | impl<T: NotNull> IntoNullable for T {
129110
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
130111
= note: this error originates in the derive macro `Debug` (in Nightly builds, run with -Z macro-backtrace for more info)
131112

113+
error[E0277]: the trait bound `<Col as Expression>::SqlType: NotNull` is not satisfied
114+
--> $DIR/issue-38821.rs:23:17
115+
|
116+
LL | #[derive(Debug, Copy, Clone)]
117+
| ^^^^ the trait `NotNull` is not implemented for `<Col as Expression>::SqlType`, which is required by `<Col as Expression>::SqlType: IntoNullable`
118+
|
119+
note: required for `<Col as Expression>::SqlType` to implement `IntoNullable`
120+
--> $DIR/issue-38821.rs:9:18
121+
|
122+
LL | impl<T: NotNull> IntoNullable for T {
123+
| ------- ^^^^^^^^^^^^ ^
124+
| |
125+
| unsatisfied trait bound introduced here
126+
= note: this error originates in the derive macro `Copy` (in Nightly builds, run with -Z macro-backtrace for more info)
127+
help: consider further restricting the associated type
128+
|
129+
LL | Expr: Expression<SqlType=<Col::SqlType as IntoNullable>::Nullable>, <Col as Expression>::SqlType: NotNull,
130+
| +++++++++++++++++++++++++++++++++++++++
131+
132132
error[E0277]: the trait bound `<Col as Expression>::SqlType: NotNull` is not satisfied
133133
--> $DIR/issue-38821.rs:23:17
134134
|

‎tests/ui/coherence/coherence-orphan.stderr

+11-11
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,6 @@ LL | impl TheTrait<usize> for isize {}
1010
|
1111
= note: define and implement a trait or new type instead
1212

13-
error[E0117]: only traits defined in the current crate can be implemented for types defined outside of the crate
14-
--> $DIR/coherence-orphan.rs:20:1
15-
|
16-
LL | impl !Send for Vec<isize> {}
17-
| ^^^^^^^^^^^^^^^----------
18-
| | |
19-
| | `Vec` is not defined in the current crate
20-
| impl doesn't use only types from inside the current crate
21-
|
22-
= note: define and implement a trait or new type instead
23-
2413
error[E0046]: not all trait items implemented, missing: `the_fn`
2514
--> $DIR/coherence-orphan.rs:10:1
2615
|
@@ -45,6 +34,17 @@ LL | impl TheTrait<isize> for TheType {}
4534
|
4635
= help: implement the missing item: `fn the_fn(&self) { todo!() }`
4736

37+
error[E0117]: only traits defined in the current crate can be implemented for types defined outside of the crate
38+
--> $DIR/coherence-orphan.rs:20:1
39+
|
40+
LL | impl !Send for Vec<isize> {}
41+
| ^^^^^^^^^^^^^^^----------
42+
| | |
43+
| | `Vec` is not defined in the current crate
44+
| impl doesn't use only types from inside the current crate
45+
|
46+
= note: define and implement a trait or new type instead
47+
4848
error: aborting due to 5 previous errors
4949

5050
Some errors have detailed explanations: E0046, E0117.

‎tests/ui/const-generics/issues/issue-68366.full.stderr

+23-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
1+
error: `Option<usize>` is forbidden as the type of a const generic parameter
2+
--> $DIR/issue-68366.rs:9:25
3+
|
4+
LL | struct Collatz<const N: Option<usize>>;
5+
| ^^^^^^^^^^^^^
6+
|
7+
= note: the only supported types are integers, `bool` and `char`
8+
= help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
9+
110
error[E0207]: the const parameter `N` is not constrained by the impl trait, self type, or predicates
2-
--> $DIR/issue-68366.rs:11:7
11+
--> $DIR/issue-68366.rs:12:7
312
|
413
LL | impl <const N: usize> Collatz<{Some(N)}> {}
514
| ^^^^^^^^^^^^^^ unconstrained const parameter
@@ -8,14 +17,25 @@ LL | impl <const N: usize> Collatz<{Some(N)}> {}
817
= note: proving the result of expressions other than the parameter are unique is not supported
918

1019
error[E0207]: the const parameter `N` is not constrained by the impl trait, self type, or predicates
11-
--> $DIR/issue-68366.rs:17:6
20+
--> $DIR/issue-68366.rs:19:6
1221
|
1322
LL | impl<const N: usize> Foo {}
1423
| ^^^^^^^^^^^^^^ unconstrained const parameter
1524
|
1625
= note: expressions using a const parameter must map each value to a distinct output value
1726
= note: proving the result of expressions other than the parameter are unique is not supported
1827

19-
error: aborting due to 2 previous errors
28+
error: overly complex generic constant
29+
--> $DIR/issue-68366.rs:12:31
30+
|
31+
LL | impl <const N: usize> Collatz<{Some(N)}> {}
32+
| ^-------^
33+
| |
34+
| struct/enum construction is not supported in generic constants
35+
|
36+
= help: consider moving this anonymous constant into a `const` function
37+
= note: this operation may be supported in the future
38+
39+
error: aborting due to 4 previous errors
2040

2141
For more information about this error, try `rustc --explain E0207`.

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

+13-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,23 @@
11
error: generic parameters may not be used in const operations
2-
--> $DIR/issue-68366.rs:11:37
2+
--> $DIR/issue-68366.rs:12:37
33
|
44
LL | impl <const N: usize> Collatz<{Some(N)}> {}
55
| ^ cannot perform const operation using `N`
66
|
77
= help: const parameters may only be used as standalone arguments, i.e. `N`
88
= help: add `#![feature(generic_const_exprs)]` to allow generic const expressions
99

10+
error: `Option<usize>` is forbidden as the type of a const generic parameter
11+
--> $DIR/issue-68366.rs:9:25
12+
|
13+
LL | struct Collatz<const N: Option<usize>>;
14+
| ^^^^^^^^^^^^^
15+
|
16+
= note: the only supported types are integers, `bool` and `char`
17+
= help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
18+
1019
error[E0207]: the const parameter `N` is not constrained by the impl trait, self type, or predicates
11-
--> $DIR/issue-68366.rs:11:7
20+
--> $DIR/issue-68366.rs:12:7
1221
|
1322
LL | impl <const N: usize> Collatz<{Some(N)}> {}
1423
| ^^^^^^^^^^^^^^ unconstrained const parameter
@@ -17,14 +26,14 @@ LL | impl <const N: usize> Collatz<{Some(N)}> {}
1726
= note: proving the result of expressions other than the parameter are unique is not supported
1827

1928
error[E0207]: the const parameter `N` is not constrained by the impl trait, self type, or predicates
20-
--> $DIR/issue-68366.rs:17:6
29+
--> $DIR/issue-68366.rs:19:6
2130
|
2231
LL | impl<const N: usize> Foo {}
2332
| ^^^^^^^^^^^^^^ unconstrained const parameter
2433
|
2534
= note: expressions using a const parameter must map each value to a distinct output value
2635
= note: proving the result of expressions other than the parameter are unique is not supported
2736

28-
error: aborting due to 3 previous errors
37+
error: aborting due to 4 previous errors
2938

3039
For more information about this error, try `rustc --explain E0207`.

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

+2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@
77
#![cfg_attr(full, allow(incomplete_features))]
88

99
struct Collatz<const N: Option<usize>>;
10+
//~^ ERROR: `Option<usize>` is forbidden
1011

1112
impl <const N: usize> Collatz<{Some(N)}> {}
1213
//~^ ERROR the const parameter
1314
//[min]~^^ generic parameters may not be used in const operations
15+
//[full]~^^^ ERROR overly complex
1416

1517
struct Foo;
1618

‎tests/ui/duplicate/duplicate-type-parameter.rs

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ trait Qux<T,T> {}
2323

2424
impl<T,T> Qux<T,T> for Option<T> {}
2525
//~^ ERROR the name `T` is already used
26-
//~^^ ERROR the type parameter `T` is not constrained
2726

2827
fn main() {
2928
}

‎tests/ui/duplicate/duplicate-type-parameter.stderr

+2-9
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,6 @@ LL | impl<T,T> Qux<T,T> for Option<T> {}
5454
| |
5555
| first use of `T`
5656

57-
error[E0207]: the type parameter `T` is not constrained by the impl trait, self type, or predicates
58-
--> $DIR/duplicate-type-parameter.rs:24:8
59-
|
60-
LL | impl<T,T> Qux<T,T> for Option<T> {}
61-
| ^ unconstrained type parameter
62-
63-
error: aborting due to 8 previous errors
57+
error: aborting due to 7 previous errors
6458

65-
Some errors have detailed explanations: E0207, E0403.
66-
For more information about an error, try `rustc --explain E0207`.
59+
For more information about this error, try `rustc --explain E0403`.

0 commit comments

Comments
 (0)