bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Remove fields that are dead since the removal of type ascription syntax

Browse source 
Since `{ ident: ident }` is a parse error, these fields are dead.
This commit is contained in:
León Orell Valerian Liehr 2025-03-23 22:00:39 +01:00
parent 90f5eab952
commit 848b0da34f
No known key found for this signature in database
GPG key ID: D17A07215F68E713
13 changed files with 13 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

25
compiler/rustc_parse/src/parser/diagnostics.rs
View file

@ -971,18 +971,8 @@ impl<'a> Parser<'a> {
// fn foo() -> Foo {
// field: value,
// }
// Suggest:
// fn foo() -> Foo { Path {
// field: value,
// } }
let guar = err.delay_as_bug();
self.restore_snapshot(snapshot);
let mut tail = self.mk_block(
thin_vec![self.mk_stmt_err(expr.span, guar)],
s,
lo.to(self.prev_token.span),
);
tail.could_be_bare_literal = true;
if maybe_struct_name.is_ident() && can_be_struct_literal {
// Account for `if Example { a: one(), }.is_pos() {}`.
// expand `before` so that we take care of module path such as:
@ -1004,6 +994,10 @@ impl<'a> Parser<'a> {
return None;
}
} else {
// Suggest:
// fn foo() -> Foo { Path {
// field: value,
// } }
self.dcx().emit_err(StructLiteralBodyWithoutPath {
span: expr.span,
sugg: StructLiteralBodyWithoutPathSugg {
@ -1011,7 +1005,11 @@ impl<'a> Parser<'a> {
after: expr.span.shrink_to_hi(),
},
});
Ok(tail)
Ok(self.mk_block(
thin_vec![self.mk_stmt_err(expr.span, guar)],
s,
lo.to(self.prev_token.span),
))
}
}
(Err(err), Ok(tail)) => {
@ -1025,10 +1023,7 @@ impl<'a> Parser<'a> {
self.consume_block(exp!(OpenBrace), exp!(CloseBrace), ConsumeClosingDelim::Yes);
Err(err)
}
(Ok(_), Ok(mut tail)) => {
tail.could_be_bare_literal = true;
Ok(tail)
}
(Ok(_), Ok(tail)) => Ok(tail),
});
}
None

9
compiler/rustc_parse/src/parser/stmt.rs
View file

@ -1043,14 +1043,7 @@ impl<'a> Parser<'a> {
rules: BlockCheckMode,
span: Span,
) -> P<Block> {
P(Block {
stmts,
id: DUMMY_NODE_ID,
rules,
span,
tokens: None,
could_be_bare_literal: false,
})
P(Block { stmts, id: DUMMY_NODE_ID, rules, span, tokens: None })
}
pub(super) fn mk_stmt(&self, span: Span, kind: StmtKind) -> Stmt {