language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 04:44:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

simplify

Browse source
This commit is contained in:
Aleksey Kladov 2022-01-03 16:22:41 +03:00
parent 8e9ccbf97a
commit 966983c707
2 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
crates/mbe/src/expander/matcher.rs
View file

@ -697,6 +697,7 @@ fn match_meta_var(kind: &str, input: &mut TtIter) -> ExpandResult<Option<Fragmen
"block" => parser::PrefixEntryPoint::Block, "block" => parser::PrefixEntryPoint::Block,
"meta" => parser::PrefixEntryPoint::MetaItem, "meta" => parser::PrefixEntryPoint::MetaItem,
"item" => parser::PrefixEntryPoint::Item, "item" => parser::PrefixEntryPoint::Item,
"vis" => parser::PrefixEntryPoint::Vis,
"expr" => { "expr" => {
return input return input
.expect_fragment(parser::PrefixEntryPoint::Expr) .expect_fragment(parser::PrefixEntryPoint::Expr)
@ -728,8 +729,6 @@ fn match_meta_var(kind: &str, input: &mut TtIter) -> ExpandResult<Option<Fragmen
}) })
.map_err(|()| err!()) .map_err(|()| err!())
} }
// `vis` is optional
"vis" => Ok(input.expect_fragment(parser::PrefixEntryPoint::Vis).value),
_ => Err(ExpandError::UnexpectedToken), _ => Err(ExpandError::UnexpectedToken),
}; };
return tt_result.map(|it| it.map(Fragment::Tokens)).into(); return tt_result.map(|it| it.map(Fragment::Tokens)).into();

5
crates/mbe/src/tt_iter.rs
View file

@ -114,7 +114,7 @@ impl<'a> TtIter<'a> {
} }
} }
let mut err = if !cursor.is_root() || error { let err = if error || !cursor.is_root() {
Some(err!("expected {:?}", entry_point)) Some(err!("expected {:?}", entry_point))
} else { } else {
None None
@ -132,9 +132,6 @@ impl<'a> TtIter<'a> {
} }
} }
self.inner = self.inner.as_slice()[res.len()..].iter(); self.inner = self.inner.as_slice()[res.len()..].iter();
if res.is_empty() && err.is_none() {
err = Some(err!("no tokens consumed"));
}
let res = match res.len() { let res = match res.len() {
1 => Some(res[0].cloned()), 1 => Some(res[0].cloned()),
0 => None, 0 => None,