Skip to content

Commit a43f564

Browse files
compiler-errorscompiler-errors
committed
Add missing diagnostics and flesh out tests
1 parent 1158e52 commit a43f564

25 files changed

+508
-19
lines changed

‎compiler/rustc_ast_lowering/src/lib.rs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -494,9 +494,14 @@ enum AllowReturnTypeNotation {
494494
}
495495

496496
enum GenericArgsMode {
497+
/// Allow paren sugar, don't allow RTN.
497498
ParenSugar,
499+
/// Allow RTN, don't allow paren sugar.
498500
ReturnTypeNotation,
501+
// Error if parenthesized generics or RTN are encountered.
499502
Err,
503+
/// Silence errors when lowering generics. Only used with `Res::Err`.
504+
Silence,
500505
}
501506

502507
impl<'a, 'hir> LoweringContext<'a, 'hir> {

‎compiler/rustc_ast_lowering/src/path.rs‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
111111
}
112112
}
113113
// Avoid duplicated errors.
114-
Res::Err => GenericArgsMode::ParenSugar,
114+
Res::Err => GenericArgsMode::Silence,
115115
// An error
116116
_ => GenericArgsMode::Err,
117117
};
@@ -288,11 +288,12 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
288288
false,
289289
)
290290
}
291-
GenericArgsMode::ParenSugar => self.lower_parenthesized_parameter_data(
292-
data,
293-
itctx,
294-
bound_modifier_allowed_features,
295-
),
291+
GenericArgsMode::ParenSugar | GenericArgsMode::Silence => self
292+
.lower_parenthesized_parameter_data(
293+
data,
294+
itctx,
295+
bound_modifier_allowed_features,
296+
),
296297
GenericArgsMode::Err => {
297298
// Suggest replacing parentheses with angle brackets `Trait(params...)` to `Trait<params...>`
298299
let sub = if !data.inputs.is_empty() {
@@ -330,7 +331,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
330331
},
331332
GenericArgs::ParenthesizedElided(span) => {
332333
match generic_args_mode {
333-
GenericArgsMode::ReturnTypeNotation => {
334+
GenericArgsMode::ReturnTypeNotation | GenericArgsMode::Silence => {
334335
// Ok
335336
}
336337
GenericArgsMode::ParenSugar | GenericArgsMode::Err => {

‎compiler/rustc_hir_analysis/src/collect.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ impl<'tcx> HirTyLowerer<'tcx> for ItemCtxt<'tcx> {
460460
[] => (generics.span, format!("<{lt_name}>")),
461461
[bound, ..] => (bound.span.shrink_to_lo(), format!("{lt_name}, ")),
462462
};
463-
mpart_sugg = Some(errors::AssociatedTypeTraitUninferredGenericParamsMultipartSuggestion {
463+
mpart_sugg = Some(errors::AssociatedItemTraitUninferredGenericParamsMultipartSuggestion {
464464
fspan: lt_sp,
465465
first: sugg,
466466
sspan: span.with_hi(item_segment.ident.span.lo()),
@@ -502,7 +502,7 @@ impl<'tcx> HirTyLowerer<'tcx> for ItemCtxt<'tcx> {
502502
}
503503
Ty::new_error(
504504
self.tcx(),
505-
self.tcx().dcx().emit_err(errors::AssociatedTypeTraitUninferredGenericParams {
505+
self.tcx().dcx().emit_err(errors::AssociatedItemTraitUninferredGenericParams {
506506
span,
507507
inferred_sugg,
508508
bound,

‎compiler/rustc_hir_analysis/src/collect/resolve_bound_vars.rs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1903,10 +1903,11 @@ impl<'a, 'tcx> BoundVarContext<'a, 'tcx> {
19031903
)
19041904
}) =>
19051905
{
1906-
let Res::Def(DefKind::AssocFn, item_def_id) = path.res else {
1907-
bug!();
1908-
};
1909-
(vec![], item_def_id, item_segment)
1906+
match path.res {
1907+
Res::Err => return,
1908+
Res::Def(DefKind::AssocFn, item_def_id) => (vec![], item_def_id, item_segment),
1909+
_ => bug!("only expected method resolution for fully qualified RTN"),
1910+
}
19101911
}
19111912

19121913
// If we have a type-dependent path, then we do need to do some lookup.

‎compiler/rustc_hir_analysis/src/errors.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -780,7 +780,7 @@ pub(crate) struct PlaceholderNotAllowedItemSignatures {
780780

781781
#[derive(Diagnostic)]
782782
#[diag(hir_analysis_associated_type_trait_uninferred_generic_params, code = E0212)]
783-
pub(crate) struct AssociatedTypeTraitUninferredGenericParams {
783+
pub(crate) struct AssociatedItemTraitUninferredGenericParams {
784784
#[primary_span]
785785
pub span: Span,
786786
#[suggestion(style = "verbose", applicability = "maybe-incorrect", code = "{bound}")]
@@ -796,7 +796,7 @@ pub(crate) struct AssociatedTypeTraitUninferredGenericParams {
796796
hir_analysis_associated_type_trait_uninferred_generic_params_multipart_suggestion,
797797
applicability = "maybe-incorrect"
798798
)]
799-
pub(crate) struct AssociatedTypeTraitUninferredGenericParamsMultipartSuggestion {
799+
pub(crate) struct AssociatedItemTraitUninferredGenericParamsMultipartSuggestion {
800800
#[suggestion_part(code = "{first}")]
801801
pub fspan: Span,
802802
pub first: String,

‎compiler/rustc_hir_analysis/src/hir_ty_lowering/bounds.rs‎

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -486,8 +486,16 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
486486
let _ =
487487
self.prohibit_generic_args(mod_segments.iter(), GenericsArgsErrExtend::None);
488488

489-
let Res::Def(DefKind::AssocFn, item_def_id) = path.res else {
490-
bug!("expected RTN to resolve to associated fn");
489+
let item_def_id = match path.res {
490+
Res::Def(DefKind::AssocFn, item_def_id) => item_def_id,
491+
Res::Err => {
492+
return Ty::new_error_with_message(
493+
tcx,
494+
hir_ty.span,
495+
"failed to resolve RTN",
496+
);
497+
}
498+
_ => bug!("only expected method resolution for fully qualified RTN"),
491499
};
492500
let trait_def_id = tcx.parent(item_def_id);
493501

@@ -604,7 +612,20 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
604612
assoc_ident,
605613
span,
606614
)?,
607-
_ => todo!(),
615+
_ => {
616+
if let Err(reported) = qself_ty.error_reported() {
617+
return Err(reported);
618+
} else {
619+
// FIXME(return_type_notation): Provide some structured suggestion here.
620+
let err = struct_span_code_err!(
621+
self.dcx(),
622+
span,
623+
E0223,
624+
"ambiguous associated function"
625+
);
626+
return Err(err.emit());
627+
}
628+
}
608629
};
609630

610631
// Don't let `T::method` resolve to some `for<'a> <T as Tr<'a>>::method`,

‎compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -814,7 +814,8 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
814814
}
815815
}
816816

817-
/// Search for a trait bound on a type parameter whose trait defines the associated type given by `assoc_name`.
817+
/// Search for a trait bound on a type parameter whose trait defines the associated item
818+
/// given by `assoc_name` and `kind`.
818819
///
819820
/// This fails if there is no such bound in the list of candidates or if there are multiple
820821
/// candidates in which case it reports ambiguity.

‎tests/ui/associated-type-bounds/return-type-notation/path-ambiguous.rs‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
#![feature(return_type_notation)]
2+
//~^ WARN the feature `return_type_notation` is incomplete
3+
4+
trait A {
5+
fn method() -> impl Sized;
6+
}
7+
trait B {
8+
fn method() -> impl Sized;
9+
}
10+
11+
fn ambiguous<T: A + B>()
12+
where
13+
T::method(..): Send,
14+
//~^ ERROR ambiguous associated function `method` in bounds of `T`
15+
{
16+
}
17+
18+
trait Sub: A + B {}
19+
20+
fn ambiguous_via_supertrait<T: Sub>()
21+
where
22+
T::method(..): Send,
23+
//~^ ERROR ambiguous associated function `method` in bounds of `T`
24+
{
25+
}
26+
27+
fn main() {}

‎tests/ui/associated-type-bounds/return-type-notation/path-ambiguous.stderr‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
warning: the feature `return_type_notation` is incomplete and may not be safe to use and/or cause compiler crashes
2+
--> $DIR/path-ambiguous.rs:1:12
3+
|
4+
LL | #![feature(return_type_notation)]
5+
| ^^^^^^^^^^^^^^^^^^^^
6+
|
7+
= note: see issue #109417 <https://github.com/rust-lang/rust/issues/109417> for more information
8+
= note: `#[warn(incomplete_features)]` on by default
9+
10+
error[E0221]: ambiguous associated function `method` in bounds of `T`
11+
--> $DIR/path-ambiguous.rs:13:5
12+
|
13+
LL | fn method() -> impl Sized;
14+
| -------------------------- ambiguous `method` from `A`
15+
...
16+
LL | fn method() -> impl Sized;
17+
| -------------------------- ambiguous `method` from `B`
18+
...
19+
LL | T::method(..): Send,
20+
| ^^^^^^^^^^^^^ ambiguous associated function `method`
21+
|
22+
help: use fully-qualified syntax to disambiguate
23+
|
24+
LL | <T as B>::method(..): Send,
25+
| ~~~~~~~~~~
26+
help: use fully-qualified syntax to disambiguate
27+
|
28+
LL | <T as A>::method(..): Send,
29+
| ~~~~~~~~~~
30+
31+
error[E0221]: ambiguous associated function `method` in bounds of `T`
32+
--> $DIR/path-ambiguous.rs:22:5
33+
|
34+
LL | fn method() -> impl Sized;
35+
| -------------------------- ambiguous `method` from `A`
36+
...
37+
LL | fn method() -> impl Sized;
38+
| -------------------------- ambiguous `method` from `B`
39+
...
40+
LL | T::method(..): Send,
41+
| ^^^^^^^^^^^^^ ambiguous associated function `method`
42+
|
43+
help: use fully-qualified syntax to disambiguate
44+
|
45+
LL | <T as B>::method(..): Send,
46+
| ~~~~~~~~~~
47+
help: use fully-qualified syntax to disambiguate
48+
|
49+
LL | <T as A>::method(..): Send,
50+
| ~~~~~~~~~~
51+
52+
error: aborting due to 2 previous errors; 1 warning emitted
53+
54+
For more information about this error, try `rustc --explain E0221`.

‎tests/ui/associated-type-bounds/return-type-notation/path-higher-ranked.rs‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
#![feature(return_type_notation)]
2+
//~^ WARN the feature `return_type_notation` is incomplete
3+
4+
trait A<'a> {
5+
fn method() -> impl Sized;
6+
}
7+
trait B: for<'a> A<'a> {}
8+
9+
fn higher_ranked<T>()
10+
where
11+
T: for<'a> A<'a>,
12+
T::method(..): Send,
13+
//~^ ERROR cannot use the associated function of a trait with uninferred generic parameters
14+
{
15+
}
16+
17+
fn higher_ranked_via_supertrait<T>()
18+
where
19+
T: B,
20+
T::method(..): Send,
21+
//~^ ERROR cannot use the associated function of a trait with uninferred generic parameters
22+
{
23+
}
24+
25+
fn main() {}

0 commit comments

Comments
 (0)