Skip to content

Commit 837c8a2

Browse files
authored
Rollup merge of rust-lang#64910 - Centril:params-cleanup, r=petrochenkov
syntax: cleanup param, method, and misc parsing Do some misc cleanup of the parser: - Method and parameter parsing is refactored. - A parser for `const | mut` is introduced that rust-lang#64588 can reuse. - Some other misc parsing. Next up in a different PR: - ~Implementing rust-lang#64252 -- maybe some other time... - Heavily restructuring up `item.rs` which is a mess (hopefully, no promises ^^). r? @petrochenkov
2 parents 8f7c4c0 + 5c5dd80 commit 837c8a2

File tree

5 files changed

+501
-569
lines changed

5 files changed

+501
-569
lines changed

src/libsyntax/parse/diagnostics.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1180,7 +1180,7 @@ impl<'a> Parser<'a> {
11801180
}
11811181
}
11821182

1183-
crate fn expected_semi_or_open_brace(&mut self) -> PResult<'a, ast::TraitItem> {
1183+
crate fn expected_semi_or_open_brace<T>(&mut self) -> PResult<'a, T> {
11841184
let token_str = self.this_token_descr();
11851185
let mut err = self.fatal(&format!("expected `;` or `{{`, found {}", token_str));
11861186
err.span_label(self.token.span, "expected `;` or `{`");

0 commit comments

Comments
 (0)