Skip to content

Commit

Permalink
Rollup merge of #85818 - LeSeulArtichaut:85794-diag-drop-ice, r=petro…
Browse files Browse the repository at this point in the history
…chenkov

Don't drop `PResult` without handling the error

Fixes #85794.
  • Loading branch information
GuillaumeGomez authored May 30, 2021
2 parents 980a4a7 + b237f90 commit 71a7f8f
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 1 deletion.
5 changes: 4 additions & 1 deletion compiler/rustc_parse/src/parser/item.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1474,7 +1474,10 @@ impl<'a> Parser<'a> {
self.sess.gated_spans.gate(sym::unnamed_fields, lo);
} else {
let err = if self.check_fn_front_matter(false) {
let _ = self.parse_fn(&mut Vec::new(), |_| true, lo);
// We use `parse_fn` to get a span for the function
if let Err(mut db) = self.parse_fn(&mut Vec::new(), |_| true, lo) {
db.delay_as_bug();
}
let mut err = self.struct_span_err(
lo.to(self.prev_token.span),
&format!("functions are not allowed in {} definitions", adt_ty),
Expand Down
10 changes: 10 additions & 0 deletions src/test/ui/parser/fn-field-parse-error-ice.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// Regression test for #85794

struct Baz {
inner : dyn fn ()
//~^ ERROR expected `,`, or `}`, found keyword `fn`
//~| ERROR functions are not allowed in struct definitions
//~| ERROR cannot find type `dyn` in this scope
}

fn main() {}
24 changes: 24 additions & 0 deletions src/test/ui/parser/fn-field-parse-error-ice.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
error: expected `,`, or `}`, found keyword `fn`
--> $DIR/fn-field-parse-error-ice.rs:4:16
|
LL | inner : dyn fn ()
| ^ help: try adding a comma: `,`

error: functions are not allowed in struct definitions
--> $DIR/fn-field-parse-error-ice.rs:4:17
|
LL | inner : dyn fn ()
| ^^
|
= help: unlike in C++, Java, and C#, functions are declared in `impl` blocks
= help: see https://doc.rust-lang.org/book/ch05-03-method-syntax.html for more information

error[E0412]: cannot find type `dyn` in this scope
--> $DIR/fn-field-parse-error-ice.rs:4:13
|
LL | inner : dyn fn ()
| ^^^ not found in this scope

error: aborting due to 3 previous errors

For more information about this error, try `rustc --explain E0412`.

0 comments on commit 71a7f8f

Please sign in to comment.