bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

diagnostics: do not suggest fn foo({ <body> }

Browse source 
Instead of suggesting that the body always replace the last character on the
line, presuming it must be a semicolon, the parser should instead check what
the last character is, and append the body if it is anything else.

Fixes #83104
This commit is contained in:
Michael Howell 2022-03-22 15:29:07 -07:00
parent 64137f0b15
commit 3729b17b7e
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/rustc_ast_passes/src/ast_validation.rs
View file

@ -471,10 +471,17 @@ impl<'a> AstValidator<'a> {
}
fn error_item_without_body(&self, sp: Span, ctx: &str, msg: &str, sugg: &str) {
let source_map = self.session.source_map();
let end = source_map.end_point(sp);
let replace_span = if source_map.span_to_snippet(end).map(|s| s == ";").unwrap_or(false) {
end
} else {
sp.shrink_to_hi()
};
self.err_handler()
.struct_span_err(sp, msg)
.span_suggestion(
self.session.source_map().end_point(sp),
replace_span,
&format!("provide a definition for the {}", ctx),
sugg.to_string(),
Applicability::HasPlaceholders,

4
src/test/ui/parser/issues/issue-87635.stderr
View file

@ -13,9 +13,7 @@ error: associated function in `impl` without body
--> $DIR/issue-87635.rs:4:5
|
LL | pub fn bar()
| ^^^^^^^^^^^-
| |
| help: provide a definition for the function: `{ <body> }`
| ^^^^^^^^^^^^- help: provide a definition for the function: `{ <body> }`
error: aborting due to 2 previous errors