Skip to content

Commit 0465f71

Browse files
compiler-errorscompiler-errors
committed
Stop being so bail-y in candidate assembly
1 parent 2d0ea79 commit 0465f71

39 files changed

+328
-240
lines changed

‎compiler/rustc_trait_selection/src/traits/select/candidate_assembly.rs

-28
Original file line numberDiff line numberDiff line change
@@ -91,14 +91,6 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
9191
} else if tcx.is_lang_item(def_id, LangItem::Sized) {
9292
// Sized is never implementable by end-users, it is
9393
// always automatically computed.
94-
95-
// FIXME: Consider moving this check to the top level as it
96-
// may also be useful for predicates other than `Sized`
97-
// Error type cannot possibly implement `Sized` (fixes #123154)
98-
if let Err(e) = obligation.predicate.skip_binder().self_ty().error_reported() {
99-
return Err(SelectionError::Overflow(e.into()));
100-
}
101-
10294
let sized_conditions = self.sized_conditions(obligation);
10395
self.assemble_builtin_bound_candidates(sized_conditions, &mut candidates);
10496
} else if tcx.is_lang_item(def_id, LangItem::Unsize) {
@@ -230,13 +222,6 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
230222
) -> Result<(), SelectionError<'tcx>> {
231223
debug!(?stack.obligation);
232224

233-
// An error type will unify with anything. So, avoid
234-
// matching an error type with `ParamCandidate`.
235-
// This helps us avoid spurious errors like issue #121941.
236-
if stack.obligation.predicate.references_error() {
237-
return Ok(());
238-
}
239-
240225
let bounds = stack
241226
.obligation
242227
.param_env
@@ -563,19 +548,6 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
563548
obligation: &PolyTraitObligation<'tcx>,
564549
candidates: &mut SelectionCandidateSet<'tcx>,
565550
) {
566-
// Essentially any user-written impl will match with an error type,
567-
// so creating `ImplCandidates` isn't useful. However, we might
568-
// end up finding a candidate elsewhere (e.g. a `BuiltinCandidate` for `Sized`)
569-
// This helps us avoid overflow: see issue #72839
570-
// Since compilation is already guaranteed to fail, this is just
571-
// to try to show the 'nicest' possible errors to the user.
572-
// We don't check for errors in the `ParamEnv` - in practice,
573-
// it seems to cause us to be overly aggressive in deciding
574-
// to give up searching for candidates, leading to spurious errors.
575-
if obligation.predicate.references_error() {
576-
return;
577-
}
578-
579551
let drcx = DeepRejectCtxt::relate_rigid_infer(self.tcx());
580552
let obligation_args = obligation.predicate.skip_binder().trait_ref.args;
581553
self.tcx().for_each_relevant_impl(

‎compiler/rustc_trait_selection/src/traits/select/mod.rs

-4
Original file line numberDiff line numberDiff line change
@@ -2487,10 +2487,6 @@ impl<'tcx> SelectionContext<'_, 'tcx> {
24872487
let impl_args = self.infcx.fresh_args_for_item(obligation.cause.span, impl_def_id);
24882488

24892489
let trait_ref = impl_trait_header.trait_ref.instantiate(self.tcx(), impl_args);
2490-
if trait_ref.references_error() {
2491-
return Err(());
2492-
}
2493-
24942490
debug!(?impl_trait_header);
24952491

24962492
let Normalized { value: impl_trait_ref, obligations: mut nested_obligations } =

‎compiler/rustc_ty_utils/src/ty.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ use rustc_index::bit_set::BitSet;
66
use rustc_middle::bug;
77
use rustc_middle::query::Providers;
88
use rustc_middle::ty::{
9-
self, EarlyBinder, Ty, TyCtxt, TypeSuperVisitable, TypeVisitable, TypeVisitableExt,
10-
TypeVisitor, Upcast,
9+
self, EarlyBinder, Ty, TyCtxt, TypeSuperVisitable, TypeVisitable, TypeVisitor, Upcast,
1110
};
1211
use rustc_span::DUMMY_SP;
1312
use rustc_span::def_id::{CRATE_DEF_ID, DefId, LocalDefId};
@@ -95,9 +94,6 @@ fn adt_sized_constraint<'tcx>(
9594
let tail_ty = tcx.type_of(tail_def.did).instantiate_identity();
9695

9796
let constraint_ty = sized_constraint_for_ty(tcx, tail_ty)?;
98-
if let Err(guar) = constraint_ty.error_reported() {
99-
return Some(ty::EarlyBinder::bind(Ty::new_error(tcx, guar)));
100-
}
10197

10298
// perf hack: if there is a `constraint_ty: Sized` bound, then we know
10399
// that the type is sized and do not need to check it on the impl.

‎tests/crashes/124350.rs

-17
This file was deleted.

‎tests/crashes/125758.rs

-26
This file was deleted.

‎tests/crashes/127351.rs

-17
This file was deleted.

‎tests/crashes/127353.rs

-18
This file was deleted.

‎tests/crashes/127742.rs

-11
This file was deleted.

‎tests/crashes/130521.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ struct Vtable(dyn Cap);
66
trait Cap<'a> {}
77

88
union Transmute {
9-
t: u64,
9+
t: u128,
1010
u: &'static Vtable,
1111
}
1212

‎tests/ui/const-generics/generic_const_exprs/bad-multiply.rs

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
// regression test for #124350
2+
3+
struct Node<const D: usize> {}
4+
5+
impl<const D: usize> Node<D>
6+
where
7+
SmallVec<{ D * 2 }>:,
8+
//~^ ERROR generic parameters may not be used in const operations
9+
//~| ERROR constant provided when a type was expected
10+
{
11+
fn new() -> Self {
12+
Node::new()
13+
}
14+
}
15+
16+
struct SmallVec<T1>(T1);
17+
18+
fn main() {}

‎tests/ui/const-generics/generic_const_exprs/bad-multiply.stderr

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
error: generic parameters may not be used in const operations
2+
--> $DIR/bad-multiply.rs:7:16
3+
|
4+
LL | SmallVec<{ D * 2 }>:,
5+
| ^ cannot perform const operation using `D`
6+
|
7+
= help: const parameters may only be used as standalone arguments, i.e. `D`
8+
= help: add `#![feature(generic_const_exprs)]` to allow generic const expressions
9+
10+
error[E0747]: constant provided when a type was expected
11+
--> $DIR/bad-multiply.rs:7:14
12+
|
13+
LL | SmallVec<{ D * 2 }>:,
14+
| ^^^^^^^^^
15+
16+
error: aborting due to 2 previous errors
17+
18+
For more information about this error, try `rustc --explain E0747`.

‎tests/ui/const-generics/kind_mismatch.rs

-1
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,4 @@ pub fn remove_key<K, S: SubsetExcept<K>>() -> S {
2020

2121
fn main() {
2222
let map: KeyHolder<0> = remove_key::<_, _>();
23-
//~^ ERROR: the trait bound `KeyHolder<0>: SubsetExcept<_>` is not satisfied
2423
}

‎tests/ui/const-generics/kind_mismatch.stderr

+2-22
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,6 @@ LL | impl<K> ContainsKey<K> for KeyHolder<K> {}
1414
| |
1515
| help: consider changing this type parameter to a const parameter: `const K: u8`
1616

17-
error[E0277]: the trait bound `KeyHolder<0>: SubsetExcept<_>` is not satisfied
18-
--> $DIR/kind_mismatch.rs:22:45
19-
|
20-
LL | let map: KeyHolder<0> = remove_key::<_, _>();
21-
| ^ the trait `ContainsKey<0>` is not implemented for `KeyHolder<0>`
22-
|
23-
note: required for `KeyHolder<0>` to implement `SubsetExcept<_>`
24-
--> $DIR/kind_mismatch.rs:15:28
25-
|
26-
LL | impl<P, T: ContainsKey<0>> SubsetExcept<P> for T {}
27-
| -------------- ^^^^^^^^^^^^^^^ ^
28-
| |
29-
| unsatisfied trait bound introduced here
30-
note: required by a bound in `remove_key`
31-
--> $DIR/kind_mismatch.rs:17:25
32-
|
33-
LL | pub fn remove_key<K, S: SubsetExcept<K>>() -> S {
34-
| ^^^^^^^^^^^^^^^ required by this bound in `remove_key`
35-
36-
error: aborting due to 3 previous errors
17+
error: aborting due to 2 previous errors
3718

38-
Some errors have detailed explanations: E0277, E0747.
39-
For more information about an error, try `rustc --explain E0277`.
19+
For more information about this error, try `rustc --explain E0747`.

‎tests/ui/generic-associated-types/issue-71176.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ struct Holder<B> {
1616

1717
fn main() {
1818
Holder {
19-
inner: Box::new(()), //~ ERROR: the trait `Provider` cannot be made into an object
19+
inner: Box::new(()),
20+
//~^ ERROR: the trait `Provider` cannot be made into an object
21+
//~| ERROR: the trait `Provider` cannot be made into an object
2022
};
2123
}

‎tests/ui/generic-associated-types/issue-71176.stderr

+18-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,24 @@ LL | type A<'a>;
8080
= help: consider moving `A` to another trait
8181
= help: only type `()` implements the trait, consider using it directly instead
8282

83-
error: aborting due to 5 previous errors
83+
error[E0038]: the trait `Provider` cannot be made into an object
84+
--> $DIR/issue-71176.rs:19:16
85+
|
86+
LL | inner: Box::new(()),
87+
| ^^^^^^^^^^^^ `Provider` cannot be made into an object
88+
|
89+
note: for a trait to be "dyn-compatible" it needs to allow building a vtable to allow the call to be resolvable dynamically; for more information visit <https://doc.rust-lang.org/reference/items/traits.html#object-safety>
90+
--> $DIR/issue-71176.rs:2:10
91+
|
92+
LL | trait Provider {
93+
| -------- this trait cannot be made into an object...
94+
LL | type A<'a>;
95+
| ^ ...because it contains the generic associated type `A`
96+
= help: consider moving `A` to another trait
97+
= help: only type `()` implements the trait, consider using it directly instead
98+
= note: required for the cast from `Box<()>` to `Box<(dyn Provider<A<'_> = _> + 'static), {type error}>`
99+
100+
error: aborting due to 6 previous errors
84101

85102
Some errors have detailed explanations: E0038, E0107.
86103
For more information about an error, try `rustc --explain E0038`.

‎tests/ui/layout/ice-type-error-in-tail-124031.rs

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
//@ normalize-stderr-test: "\d+ bits" -> "$$BITS bits"
2+
13
// Regression test for issue #124031
24
// Checks that we don't ICE when the tail
35
// of an ADT has a type error
@@ -16,5 +18,6 @@ struct Other {
1618
fn main() {
1719
unsafe {
1820
std::mem::transmute::<Option<()>, Option<&Other>>(None);
21+
//~^ ERROR cannot transmute between types of different sizes
1922
}
2023
}

‎tests/ui/layout/ice-type-error-in-tail-124031.stderr

+13-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,22 @@
11
error[E0046]: not all trait items implemented, missing: `RefTarget`
2-
--> $DIR/ice-type-error-in-tail-124031.rs:9:1
2+
--> $DIR/ice-type-error-in-tail-124031.rs:11:1
33
|
44
LL | type RefTarget;
55
| -------------- `RefTarget` from trait
66
...
77
LL | impl Trait for () {}
88
| ^^^^^^^^^^^^^^^^^ missing `RefTarget` in implementation
99

10-
error: aborting due to 1 previous error
10+
error[E0512]: cannot transmute between types of different sizes, or dependently-sized types
11+
--> $DIR/ice-type-error-in-tail-124031.rs:20:9
12+
|
13+
LL | std::mem::transmute::<Option<()>, Option<&Other>>(None);
14+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
15+
|
16+
= note: source type: `Option<()>` ($BITS bits)
17+
= note: target type: `Option<&Other>` ($BITS bits)
18+
19+
error: aborting due to 2 previous errors
1120

12-
For more information about this error, try `rustc --explain E0046`.
21+
Some errors have detailed explanations: E0046, E0512.
22+
For more information about an error, try `rustc --explain E0046`.

‎tests/ui/lazy-type-alias/bad-lazy-type-alias.rs

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
// regression test for #127351
2+
3+
#![feature(lazy_type_alias)]
4+
//~^ WARN the feature `lazy_type_alias` is incomplete
5+
6+
type ExplicitTypeOutlives<T> = T;
7+
8+
pub struct Warns {
9+
_significant_drop: ExplicitTypeOutlives,
10+
//~^ ERROR missing generics for type alias `ExplicitTypeOutlives`
11+
field: String,
12+
}
13+
14+
pub fn test(w: Warns) {
15+
let _ = || drop(w.field);
16+
}
17+
18+
fn main() {}

‎tests/ui/lazy-type-alias/bad-lazy-type-alias.stderr

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
warning: the feature `lazy_type_alias` is incomplete and may not be safe to use and/or cause compiler crashes
2+
--> $DIR/bad-lazy-type-alias.rs:3:12
3+
|
4+
LL | #![feature(lazy_type_alias)]
5+
| ^^^^^^^^^^^^^^^
6+
|
7+
= note: see issue #112792 <https://github.com/rust-lang/rust/issues/112792> for more information
8+
= note: `#[warn(incomplete_features)]` on by default
9+
10+
error[E0107]: missing generics for type alias `ExplicitTypeOutlives`
11+
--> $DIR/bad-lazy-type-alias.rs:9:24
12+
|
13+
LL | _significant_drop: ExplicitTypeOutlives,
14+
| ^^^^^^^^^^^^^^^^^^^^ expected 1 generic argument
15+
|
16+
note: type alias defined here, with 1 generic parameter: `T`
17+
--> $DIR/bad-lazy-type-alias.rs:6:6
18+
|
19+
LL | type ExplicitTypeOutlives<T> = T;
20+
| ^^^^^^^^^^^^^^^^^^^^ -
21+
help: add missing generic argument
22+
|
23+
LL | _significant_drop: ExplicitTypeOutlives<T>,
24+
| +++
25+
26+
error: aborting due to 1 previous error; 1 warning emitted
27+
28+
For more information about this error, try `rustc --explain E0107`.

‎tests/ui/nll/user-annotations/region-error-ice-109072.rs

-1
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,4 @@ impl Lt<'missing> for () { //~ ERROR undeclared lifetime
1111

1212
fn main() {
1313
let _: <() as Lt<'_>>::T = &();
14-
//~^ ERROR the trait bound `(): Lt<'_>` is not satisfied
1514
}

0 commit comments

Comments
 (0)