user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #147360 - chenyukang:yukang-fix-assoc-eq-missing-term, r=nnethercote

Browse source 
Remove extra space for missing associated type term suggestion

r? `@nnethercote`
This commit is contained in:
bors 2025-10-06 01:24:16 +00:00
commit 828c2a9afc
2 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

19
compiler/rustc_parse/src/parser/path.rs
View file

@ -753,18 +753,13 @@ impl<'a> Parser<'a> {
}
let kind = if self.eat(exp!(Colon)) {
AssocItemConstraintKind::Bound { bounds: self.parse_generic_bounds()? }
} else if self.eat(exp!(Eq)) {
self.parse_assoc_equality_term(
ident,
gen_args.as_ref(),
self.prev_token.span,
)?
} else if self.check(exp!(Eq)) {
self.parse_assoc_equality_term(ident, gen_args.as_ref())?
} else {
unreachable!();
};
let span = lo.to(self.prev_token.span);
let constraint =
AssocItemConstraint { id: ast::DUMMY_NODE_ID, ident, gen_args, kind, span };
Ok(Some(AngleBracketedArg::Constraint(constraint)))
@ -792,8 +787,10 @@ impl<'a> Parser<'a> {
&mut self,
ident: Ident,
gen_args: Option<&GenericArgs>,
eq: Span,
) -> PResult<'a, AssocItemConstraintKind> {
let prev_token_span = self.prev_token.span;
let eq_span = self.token.span;
self.expect(exp!(Eq))?;
let arg = self.parse_generic_arg(None)?;
let span = ident.span.to(self.prev_token.span);
let term = match arg {
@ -814,20 +811,20 @@ impl<'a> Parser<'a> {
self.mk_ty(lt.ident.span, ast::TyKind::Err(guar)).into()
}
None => {
let after_eq = eq.shrink_to_hi();
let after_eq = eq_span.shrink_to_hi();
let before_next = self.token.span.shrink_to_lo();
let mut err = self
.dcx()
.struct_span_err(after_eq.to(before_next), "missing type to the right of `=`");
if matches!(self.token.kind, token::Comma | token::Gt) {
err.span_suggestion(
self.psess.source_map().next_point(eq).to(before_next),
self.psess.source_map().next_point(eq_span).to(before_next),
"to constrain the associated type, add a type after `=`",
" TheType",
Applicability::HasPlaceholders,
);
err.span_suggestion(
eq.to(before_next),
prev_token_span.shrink_to_hi().to(before_next),
format!("remove the `=` if `{ident}` is a type"),
"",
Applicability::MaybeIncorrect,

2
tests/ui/parser/recover/recover-assoc-eq-missing-term.stderr
View file

@ -11,7 +11,7 @@ LL | bar::<Item = TheType>();
help: remove the `=` if `Item` is a type
|
LL - bar::<Item = >();
LL + bar::<Item >();
LL + bar::<Item>();
|
error: aborting due to 1 previous error