Auto merge of #94865 - notriddle:notriddle/single-colon-path-not-const-generics, r=cjgillot

diagnostics: single colon within `<>` probably, not type ascription

Fixes #94812
This commit is contained in:
bors 2022-03-12 19:10:33 +00:00
commit f103b2969b
3 changed files with 37 additions and 0 deletions

View file

@ -2073,6 +2073,19 @@ impl<'a> Parser<'a> {
let value = self.mk_expr_err(start.to(expr.span));
err.emit();
return Ok(GenericArg::Const(AnonConst { id: ast::DUMMY_NODE_ID, value }));
} else if token::Colon == snapshot.token.kind
&& expr.span.lo() == snapshot.token.span.hi()
&& matches!(expr.kind, ExprKind::Path(..))
{
// Find a mistake like "foo::var:A".
err.span_suggestion(
snapshot.token.span,
"write a path separator here",
"::".to_string(),
Applicability::MaybeIncorrect,
);
err.emit();
return Ok(GenericArg::Type(self.mk_ty(start.to(expr.span), TyKind::Err)));
} else if token::Comma == self.token.kind || self.token.kind.should_end_const_arg()
{
// Avoid the following output by checking that we consumed a full const arg:

View file

@ -0,0 +1,13 @@
pub mod foo {
pub mod bar {
pub struct A;
}
}
pub struct Foo {
a: Vec<foo::bar:A>,
//~^ ERROR expected
//~| HELP path separator
}
fn main() {}

View file

@ -0,0 +1,11 @@
error: expected one of `,` or `>`, found `:`
--> $DIR/single-colon-path-not-const-generics.rs:8:18
|
LL | a: Vec<foo::bar:A>,
| ^
| |
| expected one of `,` or `>`
| help: write a path separator here: `::`
error: aborting due to previous error