mirror of
https://github.com/rust-lang/rust.git
synced 2024-12-13 00:56:14 +00:00
fix: add err recovery for use_tree_list parsing
This commit is contained in:
parent
34df29620a
commit
e6dd522761
@ -11,7 +11,7 @@ pub(super) fn use_(p: &mut Parser<'_>, m: Marker) {
|
||||
|
||||
// test use_tree
|
||||
// use outer::tree::{inner::tree};
|
||||
fn use_tree(p: &mut Parser<'_>, top_level: bool) {
|
||||
fn use_tree(p: &mut Parser<'_>, top_level: bool) -> bool {
|
||||
let m = p.start();
|
||||
match p.current() {
|
||||
// test use_tree_star
|
||||
@ -70,24 +70,25 @@ fn use_tree(p: &mut Parser<'_>, top_level: bool) {
|
||||
// main balanced `{}`
|
||||
p.err_and_bump(msg);
|
||||
}
|
||||
return;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
m.complete(p, USE_TREE);
|
||||
true
|
||||
}
|
||||
|
||||
pub(super) const USE_TREE_LIST_RECOVERY_SET: TokenSet =
|
||||
TokenSet::new(&[T![;], T![,], T![.], T![ident]]);
|
||||
|
||||
// test use_tree_list
|
||||
// use {a, b, c};
|
||||
pub(crate) fn use_tree_list(p: &mut Parser<'_>) {
|
||||
assert!(p.at(T!['{']));
|
||||
let m = p.start();
|
||||
p.bump(T!['{']);
|
||||
while !p.at(EOF) && !p.at(T!['}']) {
|
||||
use_tree(p, false);
|
||||
if !p.at(T!['}']) {
|
||||
p.expect(T![,]);
|
||||
}
|
||||
}
|
||||
p.expect(T!['}']);
|
||||
|
||||
delimited(p, T!['{'], T!['}'], T![,], USE_TREE_LIST_RECOVERY_SET, |p: &mut Parser<'_>| {
|
||||
use_tree(p, false) || p.at_ts(USE_TREE_LIST_RECOVERY_SET)
|
||||
});
|
||||
|
||||
m.complete(p, USE_TREE_LIST);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user