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

Apply some clippy suggestions

Browse source
This commit is contained in:
Clemens Wasser 2021-06-07 13:59:01 +02:00
parent 4402f2b280
commit 47747cd412
19 changed files with 66 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/mbe/src/lib.rs
View file

@ -135,7 +135,7 @@ impl Shift {
/// Shift given TokenTree token id
fn shift_all(self, tt: &mut tt::Subtree) {
for t in tt.token_trees.iter_mut() {
for t in &mut tt.token_trees {
match t {
tt::TokenTree::Leaf(leaf) => match leaf {
tt::Leaf::Ident(ident) => ident.id = self.shift(ident.id),
@ -188,7 +188,7 @@ impl MacroRules {
}
}
for rule in rules.iter() {
for rule in &rules {
validate(&rule.lhs)?;
}
@ -241,7 +241,7 @@ impl MacroDef {
}
rules.push(rule);
}
for rule in rules.iter() {
for rule in &rules {
validate(&rule.lhs)?;
}
@ -268,7 +268,7 @@ impl MacroDef {
}
impl Rule {
fn parse(src: &mut TtIter, expect_arrow: bool) -> Result<Rule, ParseError> {
fn parse(src: &mut TtIter, expect_arrow: bool) -> Result<Self, ParseError> {
let lhs = src
.expect_subtree()
.map_err(|()| ParseError::Expected("expected subtree".to_string()))?;
@ -356,7 +356,7 @@ impl<T> ExpandResult<T> {
}
pub fn result(self) -> Result<T, ExpandError> {
self.err.map(Err).unwrap_or(Ok(self.value))
self.err.map_or(Ok(self.value), Err)
}
}