Skip to content

Commit 8a458c8

Browse files
compiler-errorscompiler-errors
committed
Consolidate E0284 into E0283
There is no functional difference between these two predicates. We used to only use E0284 for projection preds, and E0283 for trait preds. But we also use E0284 for ConstParamHasTy and other const predicates... Users don't really know the type system enough to be able to distinguish this and E0283, so let's merge them.
1 parent 704c2e3 commit 8a458c8

File tree

41 files changed

+100
-151
lines changed

Some content is hidden

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

41 files changed

+100
-151
lines changed

‎compiler/rustc_error_codes/src/error_codes/E0284.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1+
#### Note: this error code is no longer emitted by the compiler.
2+
13
This error occurs when the compiler is unable to unambiguously infer the
24
return type of a function or method which is generic on return type, such
35
as the `collect` method for `Iterator`s.
46

57
For example:
68

7-
```compile_fail,E0284
9+
```compile_fail
810
fn main() {
911
let n: u32 = 1;
1012
let mut d: u64 = 2;

‎compiler/rustc_trait_selection/src/error_reporting/infer/need_type_info.rs‎

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ use tracing::{debug, instrument, warn};
2424
use super::nice_region_error::placeholder_error::Highlighted;
2525
use crate::error_reporting::TypeErrCtxt;
2626
use crate::errors::{
27-
AmbiguousImpl, AmbiguousReturn, AnnotationRequired, InferenceBadError,
28-
SourceKindMultiSuggestion, SourceKindSubdiag,
27+
AmbiguousImpl, AnnotationRequired, InferenceBadError, SourceKindMultiSuggestion,
28+
SourceKindSubdiag,
2929
};
3030
use crate::infer::InferCtxt;
3131

@@ -39,19 +39,13 @@ pub enum TypeAnnotationNeeded {
3939
/// let _ = Default::default();
4040
/// ```
4141
E0283,
42-
/// ```compile_fail,E0284
43-
/// let mut d: u64 = 2;
44-
/// d = d % 1u32.into();
45-
/// ```
46-
E0284,
4742
}
4843

4944
impl From<TypeAnnotationNeeded> for ErrCode {
5045
fn from(val: TypeAnnotationNeeded) -> Self {
5146
match val {
5247
TypeAnnotationNeeded::E0282 => E0282,
5348
TypeAnnotationNeeded::E0283 => E0283,
54-
TypeAnnotationNeeded::E0284 => E0284,
5549
}
5650
}
5751
}
@@ -453,17 +447,6 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
453447
was_written: false,
454448
path: Default::default(),
455449
}),
456-
TypeAnnotationNeeded::E0284 => self.dcx().create_err(AmbiguousReturn {
457-
span,
458-
source_kind,
459-
source_name,
460-
failure_span,
461-
infer_subdiags,
462-
multi_suggestions,
463-
bad_label,
464-
was_written: false,
465-
path: Default::default(),
466-
}),
467450
}
468451
}
469452

@@ -660,17 +643,6 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
660643
was_written: path.is_some(),
661644
path: path.unwrap_or_default(),
662645
}),
663-
TypeAnnotationNeeded::E0284 => self.dcx().create_err(AmbiguousReturn {
664-
span,
665-
source_kind,
666-
source_name: &name,
667-
failure_span,
668-
infer_subdiags,
669-
multi_suggestions,
670-
bad_label: None,
671-
was_written: path.is_some(),
672-
path: path.unwrap_or_default(),
673-
}),
674646
}
675647
}
676648

‎compiler/rustc_trait_selection/src/error_reporting/traits/ambiguity.rs‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
use std::ops::ControlFlow;
22

3-
use rustc_errors::{
4-
Applicability, Diag, E0283, E0284, E0790, MultiSpan, StashKey, struct_span_code_err,
5-
};
3+
use rustc_errors::{Applicability, Diag, E0283, E0790, MultiSpan, StashKey, struct_span_code_err};
64
use rustc_hir as hir;
75
use rustc_hir::LangItem;
86
use rustc_hir::def::{DefKind, Res};
@@ -534,7 +532,7 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
534532
obligation.cause.body_id,
535533
span,
536534
arg,
537-
TypeAnnotationNeeded::E0284,
535+
TypeAnnotationNeeded::E0283,
538536
true,
539537
)
540538
.with_note(format!("cannot satisfy `{predicate}`"))
@@ -543,7 +541,7 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
543541
struct_span_code_err!(
544542
self.dcx(),
545543
span,
546-
E0284,
544+
E0283,
547545
"type annotations needed: cannot satisfy `{predicate}`",
548546
)
549547
.with_span_label(span, format!("cannot satisfy `{predicate}`"))
@@ -563,7 +561,7 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
563561
obligation.cause.body_id,
564562
span,
565563
arg,
566-
TypeAnnotationNeeded::E0284,
564+
TypeAnnotationNeeded::E0283,
567565
true,
568566
);
569567
err
@@ -573,7 +571,7 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
573571
struct_span_code_err!(
574572
self.dcx(),
575573
span,
576-
E0284,
574+
E0283,
577575
"type annotations needed: cannot satisfy `{predicate}`",
578576
)
579577
.with_span_label(span, format!("cannot satisfy `{predicate}`"))
@@ -585,7 +583,7 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
585583
obligation.cause.body_id,
586584
span,
587585
ct.into(),
588-
TypeAnnotationNeeded::E0284,
586+
TypeAnnotationNeeded::E0283,
589587
true,
590588
),
591589
ty::PredicateKind::NormalizesTo(ty::NormalizesTo { alias, term })
@@ -598,7 +596,7 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
598596
struct_span_code_err!(
599597
self.dcx(),
600598
span,
601-
E0284,
599+
E0283,
602600
"type annotations needed: cannot normalize `{alias}`",
603601
)
604602
.with_span_label(span, format!("cannot normalize `{alias}`"))
@@ -612,7 +610,7 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
612610
struct_span_code_err!(
613611
self.dcx(),
614612
span,
615-
E0284,
613+
E0283,
616614
"type annotations needed: cannot satisfy `{predicate}`",
617615
)
618616
.with_span_label(span, format!("cannot satisfy `{predicate}`"))

‎compiler/rustc_trait_selection/src/errors.rs‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -220,27 +220,6 @@ pub struct AmbiguousImpl<'a> {
220220
pub path: PathBuf,
221221
}
222222

223-
// Copy of `AnnotationRequired` for E0284
224-
#[derive(Diagnostic)]
225-
#[diag(trait_selection_type_annotations_needed, code = E0284)]
226-
pub struct AmbiguousReturn<'a> {
227-
#[primary_span]
228-
pub span: Span,
229-
pub source_kind: &'static str,
230-
pub source_name: &'a str,
231-
#[label]
232-
pub failure_span: Option<Span>,
233-
#[subdiagnostic]
234-
pub bad_label: Option<InferenceBadError<'a>>,
235-
#[subdiagnostic]
236-
pub infer_subdiags: Vec<SourceKindSubdiag<'a>>,
237-
#[subdiagnostic]
238-
pub multi_suggestions: Vec<SourceKindMultiSuggestion<'a>>,
239-
#[note(trait_selection_full_type_written)]
240-
pub was_written: bool,
241-
pub path: PathBuf,
242-
}
243-
244223
// Used when a better one isn't available
245224
#[derive(Subdiagnostic)]
246225
#[label(trait_selection_label_bad)]

‎tests/ui/associated-types/associated-types-overridden-binding.stderr‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error[E0284]: type annotations needed: cannot satisfy `<Self as Iterator>::Item == i32`
1+
error[E0283]: type annotations needed: cannot satisfy `<Self as Iterator>::Item == i32`
22
--> $DIR/associated-types-overridden-binding.rs:4:12
33
|
44
LL | trait Bar: Foo<Item = u32> {}
@@ -10,7 +10,7 @@ note: required by a bound in `Foo`
1010
LL | trait Foo: Iterator<Item = i32> {}
1111
| ^^^^^^^^^^ required by this bound in `Foo`
1212

13-
error[E0284]: type annotations needed: cannot satisfy `<Self as Iterator>::Item == i32`
13+
error[E0283]: type annotations needed: cannot satisfy `<Self as Iterator>::Item == i32`
1414
--> $DIR/associated-types-overridden-binding.rs:7:21
1515
|
1616
LL | trait U32Iterator = I32Iterator<Item = u32>;
@@ -35,4 +35,4 @@ LL | let _: &dyn I32Iterator<Item = u32>;
3535

3636
error: aborting due to 3 previous errors
3737

38-
For more information about this error, try `rustc --explain E0284`.
38+
For more information about this error, try `rustc --explain E0283`.

‎tests/ui/coherence/indirect-impl-for-trait-obj-coherence.next.stderr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
error[E0284]: type annotations needed: cannot normalize `<dyn Object<U, Output = T> as Object<U>>::Output`
1+
error[E0283]: type annotations needed: cannot normalize `<dyn Object<U, Output = T> as Object<U>>::Output`
22
--> $DIR/indirect-impl-for-trait-obj-coherence.rs:25:41
33
|
44
LL | foo::<dyn Object<U, Output = T>, U>(x)
55
| ^ cannot normalize `<dyn Object<U, Output = T> as Object<U>>::Output`
66

77
error: aborting due to 1 previous error
88

9-
For more information about this error, try `rustc --explain E0284`.
9+
For more information about this error, try `rustc --explain E0283`.

‎tests/ui/coherence/occurs-check/associated-type.next.stderr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ LL | | for<'a> *const T: ToUnit<'a>,
1414
|
1515
= note: this behavior recently changed as a result of a bug fix; see rust-lang/rust#56105 for details
1616

17-
error[E0284]: type annotations needed: cannot normalize `<for<'a> fn(&'a (), ()) as Overlap<for<'a> fn(&'a (), ())>>::Assoc`
17+
error[E0283]: type annotations needed: cannot normalize `<for<'a> fn(&'a (), ()) as Overlap<for<'a> fn(&'a (), ())>>::Assoc`
1818
--> $DIR/associated-type.rs:45:59
1919
|
2020
LL | foo::<for<'a> fn(&'a (), ()), for<'a> fn(&'a (), ())>(3usize);
2121
| ^^^^^^ cannot normalize `<for<'a> fn(&'a (), ()) as Overlap<for<'a> fn(&'a (), ())>>::Assoc`
2222

2323
error: aborting due to 2 previous errors
2424

25-
Some errors have detailed explanations: E0119, E0284.
25+
Some errors have detailed explanations: E0119, E0283.
2626
For more information about an error, try `rustc --explain E0119`.

‎tests/ui/const-generics/defaults/doesnt_infer.stderr‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error[E0284]: type annotations needed for `Foo<_>`
1+
error[E0283]: type annotations needed for `Foo<_>`
22
--> $DIR/doesnt_infer.rs:13:9
33
|
44
LL | let foo = Foo::foo();
@@ -14,7 +14,7 @@ help: consider giving `foo` an explicit type, where the value of const parameter
1414
LL | let foo: Foo<N> = Foo::foo();
1515
| ++++++++
1616

17-
error[E0284]: type annotations needed for `Foo<_>`
17+
error[E0283]: type annotations needed for `Foo<_>`
1818
--> $DIR/doesnt_infer.rs:13:9
1919
|
2020
LL | let foo = Foo::foo();
@@ -34,4 +34,4 @@ LL | let foo: Foo<N> = Foo::foo();
3434

3535
error: aborting due to 2 previous errors
3636

37-
For more information about this error, try `rustc --explain E0284`.
37+
For more information about this error, try `rustc --explain E0283`.

‎tests/ui/const-generics/defaults/rp_impl_trait_fail.stderr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ LL | 1_u64
3333
= help: the trait `Traitor<1, 1>` is not implemented for `u64`
3434
but trait `Traitor<1, 2>` is implemented for it
3535

36-
error[E0284]: type annotations needed
36+
error[E0283]: type annotations needed
3737
--> $DIR/rp_impl_trait_fail.rs:28:5
3838
|
3939
LL | uwu();
@@ -51,5 +51,5 @@ LL | uwu::<N>();
5151

5252
error: aborting due to 4 previous errors
5353

54-
Some errors have detailed explanations: E0277, E0284.
54+
Some errors have detailed explanations: E0277, E0283.
5555
For more information about an error, try `rustc --explain E0277`.

‎tests/ui/const-generics/generic_arg_infer/issue-91614.stderr‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error[E0284]: type annotations needed for `Mask<_, _>`
1+
error[E0283]: type annotations needed for `Mask<_, _>`
22
--> $DIR/issue-91614.rs:6:9
33
|
44
LL | let y = Mask::<_, _>::splat(false);
@@ -11,7 +11,7 @@ help: consider giving `y` an explicit type, where the value of const parameter `
1111
LL | let y: Mask<_, N> = Mask::<_, _>::splat(false);
1212
| ++++++++++++
1313

14-
error[E0284]: type annotations needed for `Mask<_, _>`
14+
error[E0283]: type annotations needed for `Mask<_, _>`
1515
--> $DIR/issue-91614.rs:6:9
1616
|
1717
LL | let y = Mask::<_, _>::splat(false);
@@ -26,4 +26,4 @@ LL | let y: Mask<_, N> = Mask::<_, _>::splat(false);
2626

2727
error: aborting due to 2 previous errors
2828

29-
For more information about this error, try `rustc --explain E0284`.
29+
For more information about this error, try `rustc --explain E0283`.

0 commit comments

Comments
 (0)