Skip to content

Commit 75074e0

Browse files
compiler-errorscompiler-errors
committed
Delay normalization bugs instead of reporting them
1 parent 6ec8c13 commit 75074e0

File tree

4 files changed

+19
-33
lines changed

4 files changed

+19
-33
lines changed

‎compiler/rustc_trait_selection/src/traits/misc.rs

+4-8
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ use rustc_infer::infer::{RegionResolutionError, TyCtxtInferExt};
88
use rustc_infer::{infer::outlives::env::OutlivesEnvironment, traits::FulfillmentError};
99
use rustc_middle::ty::{self, Ty, TyCtxt, TypeVisitable};
1010

11-
use crate::traits::error_reporting::TypeErrCtxtExt;
12-
1311
use super::outlives_bounds::InferCtxtExt;
1412

1513
pub enum CopyImplementationError<'tcx> {
@@ -60,8 +58,8 @@ pub fn type_allowed_to_implement_copy<'tcx>(
6058
let infcx = tcx.infer_ctxt().build();
6159
let ocx = traits::ObligationCtxt::new(&infcx);
6260

63-
let ty = field.ty(tcx, substs);
64-
if ty.references_error() {
61+
let unnormalized_ty = field.ty(tcx, substs);
62+
if unnormalized_ty.references_error() {
6563
continue;
6664
}
6765

@@ -84,12 +82,10 @@ pub fn type_allowed_to_implement_copy<'tcx>(
8482
} else {
8583
ObligationCause::dummy_with_span(field_ty_span)
8684
};
87-
let ty = ocx.normalize(&normalization_cause, param_env, ty);
85+
let ty = ocx.normalize(&normalization_cause, param_env, unnormalized_ty);
8886
let normalization_errors = ocx.select_where_possible();
8987
if !normalization_errors.is_empty() {
90-
// Don't report this as a field that doesn't implement Copy,
91-
// but instead just implement this as a field that isn't WF.
92-
infcx.err_ctxt().report_fulfillment_errors(&normalization_errors, None);
88+
tcx.sess.delay_span_bug(field_span, format!("couldn't normalize struct field `{unnormalized_ty}` when checking Copy implementation"));
9389
continue;
9490
}
9591

‎tests/ui/traits/copy-impl-cannot-normalize.stderr

+10
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,16 @@ error[E0277]: the trait bound `T: TraitFoo` is not satisfied
44
LL | impl<T> Copy for Foo<T> {}
55
| ^^^^^^ the trait `TraitFoo` is not implemented for `T`
66
|
7+
note: required for `Foo<T>` to implement `Clone`
8+
--> $DIR/copy-impl-cannot-normalize.rs:12:9
9+
|
10+
LL | impl<T> Clone for Foo<T>
11+
| ^^^^^ ^^^^^^
12+
LL | where
13+
LL | T: TraitFoo,
14+
| -------- unsatisfied trait bound introduced here
15+
note: required by a bound in `Copy`
16+
--> $SRC_DIR/core/src/marker.rs:LL:COL
717
help: consider restricting type parameter `T`
818
|
919
LL | impl<T: TraitFoo> Copy for Foo<T> {}

‎tests/ui/traits/issue-50480.rs

-2
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,11 @@ struct Foo(N, NotDefined, <i32 as Iterator>::Item, Vec<i32>, String);
55
//~| ERROR cannot find type `NotDefined` in this scope
66
//~| ERROR cannot find type `N` in this scope
77
//~| ERROR cannot find type `N` in this scope
8-
//~| ERROR `i32` is not an iterator
98

109
#[derive(Clone, Copy)]
1110
//~^ ERROR the trait `Copy` may not be implemented for this type
1211
struct Bar<T>(T, N, NotDefined, <i32 as Iterator>::Item, Vec<i32>, String);
1312
//~^ ERROR cannot find type `NotDefined` in this scope
1413
//~| ERROR cannot find type `N` in this scope
15-
//~| ERROR `i32` is not an iterator
1614

1715
fn main() {}

‎tests/ui/traits/issue-50480.stderr

+5-23
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ LL | struct Foo<NotDefined>(N, NotDefined, <i32 as Iterator>::Item, Vec<i32>, St
3838
| ++++++++++++
3939

4040
error[E0412]: cannot find type `N` in this scope
41-
--> $DIR/issue-50480.rs:12:18
41+
--> $DIR/issue-50480.rs:11:18
4242
|
4343
LL | struct Bar<T>(T, N, NotDefined, <i32 as Iterator>::Item, Vec<i32>, String);
4444
| - ^
@@ -55,20 +55,11 @@ LL | struct Bar<T, N>(T, N, NotDefined, <i32 as Iterator>::Item, Vec<i32>, Strin
5555
| +++
5656

5757
error[E0412]: cannot find type `NotDefined` in this scope
58-
--> $DIR/issue-50480.rs:12:21
58+
--> $DIR/issue-50480.rs:11:21
5959
|
6060
LL | struct Bar<T>(T, N, NotDefined, <i32 as Iterator>::Item, Vec<i32>, String);
6161
| ^^^^^^^^^^ not found in this scope
6262

63-
error[E0277]: `i32` is not an iterator
64-
--> $DIR/issue-50480.rs:3:27
65-
|
66-
LL | struct Foo(N, NotDefined, <i32 as Iterator>::Item, Vec<i32>, String);
67-
| ^^^^^^^^^^^^^^^^^^^^^^^ `i32` is not an iterator
68-
|
69-
= help: the trait `Iterator` is not implemented for `i32`
70-
= note: if you want to iterate between `start` until a value `end`, use the exclusive range syntax `start..end` or the inclusive range syntax `start..=end`
71-
7263
error[E0204]: the trait `Copy` may not be implemented for this type
7364
--> $DIR/issue-50480.rs:1:17
7465
|
@@ -82,17 +73,8 @@ LL | struct Foo(N, NotDefined, <i32 as Iterator>::Item, Vec<i32>, String);
8273
|
8374
= note: this error originates in the derive macro `Copy` (in Nightly builds, run with -Z macro-backtrace for more info)
8475

85-
error[E0277]: `i32` is not an iterator
86-
--> $DIR/issue-50480.rs:12:33
87-
|
88-
LL | struct Bar<T>(T, N, NotDefined, <i32 as Iterator>::Item, Vec<i32>, String);
89-
| ^^^^^^^^^^^^^^^^^^^^^^^ `i32` is not an iterator
90-
|
91-
= help: the trait `Iterator` is not implemented for `i32`
92-
= note: if you want to iterate between `start` until a value `end`, use the exclusive range syntax `start..end` or the inclusive range syntax `start..=end`
93-
9476
error[E0204]: the trait `Copy` may not be implemented for this type
95-
--> $DIR/issue-50480.rs:10:17
77+
--> $DIR/issue-50480.rs:9:17
9678
|
9779
LL | #[derive(Clone, Copy)]
9880
| ^^^^
@@ -104,7 +86,7 @@ LL | struct Bar<T>(T, N, NotDefined, <i32 as Iterator>::Item, Vec<i32>, String);
10486
|
10587
= note: this error originates in the derive macro `Copy` (in Nightly builds, run with -Z macro-backtrace for more info)
10688

107-
error: aborting due to 10 previous errors
89+
error: aborting due to 8 previous errors
10890

109-
Some errors have detailed explanations: E0204, E0277, E0412.
91+
Some errors have detailed explanations: E0204, E0412.
11092
For more information about an error, try `rustc --explain E0204`.

0 commit comments

Comments
 (0)