mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rely on regular "expected"/"found" parser error for fn

Browse Source
This commit is contained in:
Esteban Küber 2020-10-25 12:13:27 -07:00
parent 07a63e6d1f
commit 040f568815
15 changed files with 36 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compiler/rustc_parse/src/parser/diagnostics.rs
View File

@ -1550,14 +1550,6 @@ pub(super) fn check_for_for_in_in_typo(&mut self, in_span: Span) {
}
}
pub(super) fn expected_semi_or_open_brace<T>(&mut self) -> PResult<'a, T> {
let token_str = super::token_descr(&self.token);
let msg = &format!("expected `;` or `{{`, found {}", token_str);
let mut err = self.struct_span_err(self.token.span, msg);
err.span_label(self.token.span, "expected `;` or `{`");
Err(err)
}
pub(super) fn eat_incorrect_doc_comment_for_param_type(&mut self) {
if let token::DocComment(..) = self.token.kind {
self.struct_span_err(

9
compiler/rustc_parse/src/parser/item.rs
View File

@ -1551,10 +1551,9 @@ fn parse_fn_body(
attrs: &mut Vec<Attribute>,
sig_hi: &mut Span,
) -> PResult<'a, Option<P<Block>>> {
let (inner_attrs, body) = if self.check(&token::Semi) {
let (inner_attrs, body) = if self.eat(&token::Semi) {
// Include the trailing semicolon in the span of the signature
*sig_hi = self.token.span;
self.bump(); // `;`
*sig_hi = self.prev_token.span;
(Vec::new(), None)
} else if self.check(&token::OpenDelim(token::Brace)) || self.token.is_whole_block() {
self.parse_inner_attrs_and_block().map(|(attrs, body)| (attrs, Some(body)))?
@ -1574,7 +1573,9 @@ fn parse_fn_body(
.emit();
(Vec::new(), Some(self.mk_block_err(span)))
} else {
return self.expected_semi_or_open_brace();
return self
.expected_one_of_not_found(&[], &[token::Semi, token::OpenDelim(token::Brace)])
.map(|_| None);
};
attrs.extend(inner_attrs);
Ok(body)

2
src/test/ui/issues/issue-39616.rs
View File

@ -1,4 +1,4 @@
fn foo(a: [0; 1]) {} //~ ERROR expected type, found `0`
//~| ERROR expected `;` or `{`, found `]`
//~| ERROR expected one of `)`, `,`, `->`, `;`, `where`, or `{`, found `]`
fn main() {}

4
src/test/ui/issues/issue-39616.stderr
View File

@ -4,11 +4,11 @@ error: expected type, found `0`
LL | fn foo(a: [0; 1]) {}
| ^ expected type
error: expected `;` or `{`, found `]`
error: expected one of `)`, `,`, `->`, `;`, `where`, or `{`, found `]`
--> $DIR/issue-39616.rs:1:16
|
LL | fn foo(a: [0; 1]) {}
| ^ expected `;` or `{`
| ^ expected one of `)`, `,`, `->`, `;`, `where`, or `{`
error: aborting due to 2 previous errors

2
src/test/ui/issues/issue-58856-1.rs
View File

@ -2,7 +2,7 @@ impl A {
//~^ ERROR cannot find type `A` in this scope
fn b(self>
//~^ ERROR expected one of `)`, `,`, or `:`, found `>`
//~| ERROR expected `;` or `{`, found `>`
//~| ERROR expected one of `->`, `;`, `where`, or `{`, found `>`
}
fn main() {}

4
src/test/ui/issues/issue-58856-1.stderr
View File

@ -6,14 +6,14 @@ LL | fn b(self>
| |
| unclosed delimiter
error: expected `;` or `{`, found `>`
error: expected one of `->`, `;`, `where`, or `{`, found `>`
--> $DIR/issue-58856-1.rs:3:14
|
LL | impl A {
| - while parsing this item list starting here
LL |
LL | fn b(self>
| ^ expected `;` or `{`
| ^ expected one of `->`, `;`, `where`, or `{`
...
LL | }
| - the item list ends here

5
src/test/ui/parser/fn-colon-return-type.rs Normal file
View File

@ -0,0 +1,5 @@
fn foo(x: i32): i32 { //~ ERROR expected one of `->`, `;`, `where`, or `{`, found `:`
x
}
fn main() {}

8
src/test/ui/parser/fn-colon-return-type.stderr Normal file
View File

@ -0,0 +1,8 @@
error: expected one of `->`, `;`, `where`, or `{`, found `:`
--> $DIR/fn-colon-return-type.rs:1:15
|
LL | fn foo(x: i32): i32 {
| ^ expected one of `->`, `;`, `where`, or `{`
error: aborting due to previous error

2
src/test/ui/parser/issue-24780.rs
View File

@ -3,6 +3,6 @@
// expected one of ..., `>`, ... found `>`
fn foo() -> Vec<usize>> {
//~^ ERROR expected `;` or `{`, found `>`
//~^ ERROR expected one of `!`, `+`, `::`, `;`, `where`, or `{`, found `>`
Vec::new()
}

4
src/test/ui/parser/issue-24780.stderr
View File

@ -1,8 +1,8 @@
error: expected `;` or `{`, found `>`
error: expected one of `!`, `+`, `::`, `;`, `where`, or `{`, found `>`
--> $DIR/issue-24780.rs:5:23
|
LL | fn foo() -> Vec<usize>> {
| ^ expected `;` or `{`
| ^ expected one of `!`, `+`, `::`, `;`, `where`, or `{`
error: aborting due to previous error

2
src/test/ui/parser/issue-6610.rs
View File

@ -1,3 +1,3 @@
trait Foo { fn a() } //~ ERROR expected `;` or `{`, found `}`
trait Foo { fn a() } //~ ERROR expected one of `->`, `;`, `where`, or `{`, found `}`
fn main() {}

4
src/test/ui/parser/issue-6610.stderr
View File

@ -1,10 +1,10 @@
error: expected `;` or `{`, found `}`
error: expected one of `->`, `;`, `where`, or `{`, found `}`
--> $DIR/issue-6610.rs:1:20
|
LL | trait Foo { fn a() }
| - ^
| | |
| | expected `;` or `{`
| | expected one of `->`, `;`, `where`, or `{`
| | the item list ends here
| while parsing this item list starting here

4
src/test/ui/parser/missing_right_paren.stderr
View File

@ -22,11 +22,11 @@ error: expected one of `:` or `|`, found `)`
LL | fn main((ؼ
| ^ expected one of `:` or `|`
error: expected `;` or `{`, found `<eof>`
error: expected one of `->`, `;`, `where`, or `{`, found `<eof>`
--> $DIR/missing_right_paren.rs:3:11
|
LL | fn main((ؼ
| ^ expected `;` or `{`
| ^ expected one of `->`, `;`, `where`, or `{`
error: aborting due to 4 previous errors

3
src/test/ui/parser/not-a-pred.rs
View File

@ -1,6 +1,5 @@
// error-pattern: lt
fn f(a: isize, b: isize) : lt(a, b) { }
//~^ ERROR expected one of `->`, `;`, `where`, or `{`, found `:`
fn lt(a: isize, b: isize) { }

6
src/test/ui/parser/not-a-pred.stderr
View File

@ -1,8 +1,8 @@
error: expected `;` or `{`, found `:`
--> $DIR/not-a-pred.rs:3:26
error: expected one of `->`, `;`, `where`, or `{`, found `:`
--> $DIR/not-a-pred.rs:1:26
|
LL | fn f(a: isize, b: isize) : lt(a, b) { }
| ^ expected `;` or `{`
| ^ expected one of `->`, `;`, `where`, or `{`
error: aborting due to previous error