diff --git a/crates/mbe/src/benchmark.rs b/crates/mbe/src/benchmark.rs
index 38707ffa5bf..18eb97f0d58 100644
--- a/crates/mbe/src/benchmark.rs
+++ b/crates/mbe/src/benchmark.rs
@@ -187,7 +187,7 @@ fn invocation_fixtures(rules: &FxHashMap<String, MacroRules>) -> Vec<(String, tt
let a = 1664525;
let c = 1013904223;
*seed = usize::wrapping_add(usize::wrapping_mul(*seed, a), c);
- return *seed;
+ *seed
}
fn make_ident(ident: &str) -> tt::TokenTree {
tt::Leaf::Ident(tt::Ident { id: tt::TokenId::unspecified(), text: SmolStr::new(ident) })
diff --git a/crates/mbe/src/expander/matcher.rs b/crates/mbe/src/expander/matcher.rs
index 84ca3ff876e..c982eb58f1f 100644
--- a/crates/mbe/src/expander/matcher.rs
+++ b/crates/mbe/src/expander/matcher.rs
@@ -219,7 +219,7 @@ impl BindingsBuilder {
bindings
}
- fn build_inner(&self, bindings: &mut Bindings, link_nodes: &Vec<LinkNode<Rc<BindingKind>>>) {
+ fn build_inner(&self, bindings: &mut Bindings, link_nodes: &[LinkNode<Rc<BindingKind>>]) {
let mut nodes = Vec::new();
self.collect_nodes(&link_nodes, &mut nodes);
@@ -301,7 +301,7 @@ impl BindingsBuilder {
fn collect_nodes<'a>(
&'a self,
- link_nodes: &'a Vec<LinkNode<Rc<BindingKind>>>,
+ link_nodes: &'a [LinkNode<Rc<BindingKind>>],
nodes: &mut Vec<&'a Rc<BindingKind>>,
) {
link_nodes.iter().for_each(|it| match it {
@@ -494,15 +494,8 @@ fn match_loop_inner<'t>(
}
Some(err) => {
res.add_err(err);
- match match_res.value {
- Some(fragment) => {
- bindings_builder.push_fragment(
- &mut item.bindings,
- &name,
- fragment,
- );
- }
- _ => {}
+ if let Some(fragment) = match_res.value {
+ bindings_builder.push_fragment(&mut item.bindings, &name, fragment);
}
item.is_error = true;
error_items.push(item);
@@ -578,9 +571,9 @@ fn match_loop(pattern: &MetaTemplate, src: &tt::Subtree) -> Match {
);
stdx::always!(cur_items.is_empty());
- if error_items.len() > 0 {
+ if !error_items.is_empty() {
error_recover_item = error_items.pop().map(|it| it.bindings);
- } else if eof_items.len() > 0 {
+ } else if !eof_items.is_empty() {
error_recover_item = Some(eof_items[0].bindings.clone());
}
@@ -793,7 +786,7 @@ impl<'a> TtIter<'a> {
_ => (),
}
- let tt = self.next().ok_or_else(|| ())?.clone();
+ let tt = self.next().ok_or(())?.clone();
let punct = match tt {
tt::TokenTree::Leaf(tt::Leaf::Punct(punct)) if punct.spacing == tt::Spacing::Joint => {
punct
diff --git a/crates/mbe/src/lib.rs b/crates/mbe/src/lib.rs
index b95374b76db..380a5074431 100644
--- a/crates/mbe/src/lib.rs
+++ b/crates/mbe/src/lib.rs
@@ -295,8 +295,8 @@ fn validate(pattern: &MetaTemplate) -> Result<(), ParseError> {
// Checks that no repetition which could match an empty token
// https://github.com/rust-lang/rust/blob/a58b1ed44f5e06976de2bdc4d7dc81c36a96934f/src/librustc_expand/mbe/macro_rules.rs#L558
- if separator.is_none() {
- if subtree.iter().all(|child_op| {
+ if separator.is_none()
+ && subtree.iter().all(|child_op| {
match child_op {
Op::Var { kind, .. } => {
// vis is optional
@@ -314,9 +314,9 @@ fn validate(pattern: &MetaTemplate) -> Result<(), ParseError> {
Op::Subtree { .. } => {}
}
false
- }) {
- return Err(ParseError::RepetitionEmptyTokenTree);
- }
+ })
+ {
+ return Err(ParseError::RepetitionEmptyTokenTree);
}
validate(subtree)?
}
diff --git a/crates/mbe/src/parser.rs b/crates/mbe/src/parser.rs
index 61b2a49551f..04c0d3e7543 100644
--- a/crates/mbe/src/parser.rs
+++ b/crates/mbe/src/parser.rs
@@ -213,7 +213,7 @@ fn next_op<'a>(first: &tt::TokenTree, src: &mut TtIter<'a>, mode: Mode) -> Resul
Ok(res)
}
-fn eat_fragment_kind<'a>(src: &mut TtIter<'a>, mode: Mode) -> Result<Option<SmolStr>, ParseError> {
+fn eat_fragment_kind(src: &mut TtIter<'_>, mode: Mode) -> Result<Option<SmolStr>, ParseError> {
if let Mode::Pattern = mode {
src.expect_char(':').map_err(|()| err!("bad fragment specifier 1"))?;
let ident = src.expect_ident().map_err(|()| err!("bad fragment specifier 1"))?;
diff --git a/crates/mbe/src/syntax_bridge.rs b/crates/mbe/src/syntax_bridge.rs
index b11172caf02..978c75747a2 100644
--- a/crates/mbe/src/syntax_bridge.rs
+++ b/crates/mbe/src/syntax_bridge.rs
@@ -243,8 +243,7 @@ trait TokenConvertor {
type Token: SrcToken;
fn go(&mut self) -> tt::Subtree {
- let mut subtree = tt::Subtree::default();
- subtree.delimiter = None;
+ let mut subtree = tt::Subtree { delimiter: None, ..Default::default() };
while self.peek().is_some() {
self.collect_leaf(&mut subtree.token_trees);
}
@@ -506,7 +505,7 @@ impl TokenConvertor for Convertor {
fn peek(&self) -> Option<Self::Token> {
if let Some((punct, mut offset)) = self.punct_offset.clone() {
- offset = offset + TextSize::of('.');
+ offset += TextSize::of('.');
if usize::from(offset) < punct.text().len() {
return Some(SynToken::Punch(punct, offset));
}
diff --git a/crates/mbe/src/tt_iter.rs b/crates/mbe/src/tt_iter.rs
index 99a8d250b7a..bd54f2442bf 100644
--- a/crates/mbe/src/tt_iter.rs
+++ b/crates/mbe/src/tt_iter.rs
@@ -138,7 +138,7 @@ impl<'a> TtIter<'a> {
}
}
self.inner = self.inner.as_slice()[res.len()..].iter();
- if res.len() == 0 && err.is_none() {
+ if res.is_empty() && err.is_none() {
err = Some(err!("no tokens consumed"));
}
let res = match res.len() {
diff --git a/crates/parser/src/syntax_kind/generated.rs b/crates/parser/src/syntax_kind/generated.rs
index be2dfbbea1c..bcefd183a1a 100644
--- a/crates/parser/src/syntax_kind/generated.rs
+++ b/crates/parser/src/syntax_kind/generated.rs
@@ -260,116 +260,33 @@ pub enum SyntaxKind {
use self::SyntaxKind::*;
impl SyntaxKind {
pub fn is_keyword(self) -> bool {
- matches!(
- self,
- AS_KW
- | ASYNC_KW
- | AWAIT_KW
- | BOX_KW
- | BREAK_KW
- | CONST_KW
- | CONTINUE_KW
- | CRATE_KW
- | DYN_KW
- | ELSE_KW
- | ENUM_KW
- | EXTERN_KW
- | FALSE_KW
- | FN_KW
- | FOR_KW
- | IF_KW
- | IMPL_KW
- | IN_KW
- | LET_KW
- | LOOP_KW
- | MACRO_KW
- | MATCH_KW
- | MOD_KW
- | MOVE_KW
- | MUT_KW
- | PUB_KW
- | REF_KW
- | RETURN_KW
- | SELF_KW
- | STATIC_KW
- | STRUCT_KW
- | SUPER_KW
- | TRAIT_KW
- | TRUE_KW
- | TRY_KW
- | TYPE_KW
- | UNSAFE_KW
- | USE_KW
- | WHERE_KW
- | WHILE_KW
- | YIELD_KW
- | AUTO_KW
- | DEFAULT_KW
- | EXISTENTIAL_KW
- | UNION_KW
- | RAW_KW
- | MACRO_RULES_KW
- )
+ match self {
+ AS_KW | ASYNC_KW | AWAIT_KW | BOX_KW | BREAK_KW | CONST_KW | CONTINUE_KW | CRATE_KW
+ | DYN_KW | ELSE_KW | ENUM_KW | EXTERN_KW | FALSE_KW | FN_KW | FOR_KW | IF_KW
+ | IMPL_KW | IN_KW | LET_KW | LOOP_KW | MACRO_KW | MATCH_KW | MOD_KW | MOVE_KW
+ | MUT_KW | PUB_KW | REF_KW | RETURN_KW | SELF_KW | STATIC_KW | STRUCT_KW | SUPER_KW
+ | TRAIT_KW | TRUE_KW | TRY_KW | TYPE_KW | UNSAFE_KW | USE_KW | WHERE_KW | WHILE_KW
+ | YIELD_KW | AUTO_KW | DEFAULT_KW | EXISTENTIAL_KW | UNION_KW | RAW_KW
+ | MACRO_RULES_KW => true,
+ _ => false,
+ }
}
pub fn is_punct(self) -> bool {
- matches!(
- self,
- SEMICOLON
- | COMMA
- | L_PAREN
- | R_PAREN
- | L_CURLY
- | R_CURLY
- | L_BRACK
- | R_BRACK
- | L_ANGLE
- | R_ANGLE
- | AT
- | POUND
- | TILDE
- | QUESTION
- | DOLLAR
- | AMP
- | PIPE
- | PLUS
- | STAR
- | SLASH
- | CARET
- | PERCENT
- | UNDERSCORE
- | DOT
- | DOT2
- | DOT3
- | DOT2EQ
- | COLON
- | COLON2
- | EQ
- | EQ2
- | FAT_ARROW
- | BANG
- | NEQ
- | MINUS
- | THIN_ARROW
- | LTEQ
- | GTEQ
- | PLUSEQ
- | MINUSEQ
- | PIPEEQ
- | AMPEQ
- | CARETEQ
- | SLASHEQ
- | STAREQ
- | PERCENTEQ
- | AMP2
- | PIPE2
- | SHL
- | SHR
- | SHLEQ
- | SHREQ
- )
+ match self {
+ SEMICOLON | COMMA | L_PAREN | R_PAREN | L_CURLY | R_CURLY | L_BRACK | R_BRACK
+ | L_ANGLE | R_ANGLE | AT | POUND | TILDE | QUESTION | DOLLAR | AMP | PIPE | PLUS
+ | STAR | SLASH | CARET | PERCENT | UNDERSCORE | DOT | DOT2 | DOT3 | DOT2EQ | COLON
+ | COLON2 | EQ | EQ2 | FAT_ARROW | BANG | NEQ | MINUS | THIN_ARROW | LTEQ | GTEQ
+ | PLUSEQ | MINUSEQ | PIPEEQ | AMPEQ | CARETEQ | SLASHEQ | STAREQ | PERCENTEQ | AMP2
+ | PIPE2 | SHL | SHR | SHLEQ | SHREQ => true,
+ _ => false,
+ }
}
pub fn is_literal(self) -> bool {
- matches!(self, INT_NUMBER | FLOAT_NUMBER | CHAR | BYTE | STRING | BYTE_STRING)
+ match self {
+ INT_NUMBER | FLOAT_NUMBER | CHAR | BYTE | STRING | BYTE_STRING => true,
+ _ => false,
+ }
}
pub fn from_keyword(ident: &str) -> Option<SyntaxKind> {
let kw = match ident {
diff --git a/crates/syntax/src/parsing/reparsing.rs b/crates/syntax/src/parsing/reparsing.rs
index 4ad50ab729b..304f47b3dc9 100644
--- a/crates/syntax/src/parsing/reparsing.rs
+++ b/crates/syntax/src/parsing/reparsing.rs
@@ -36,8 +36,8 @@ pub(crate) fn incremental_reparse(
None
}
-fn reparse_token<'node>(
- root: &'node SyntaxNode,
+fn reparse_token(
+ root: &SyntaxNode,
edit: &Indel,
) -> Option<(GreenNode, Vec<SyntaxError>, TextRange)> {
let prev_token = root.covering_element(edit.delete).as_token()?.clone();
@@ -84,8 +84,8 @@ fn reparse_token<'node>(
}
}
-fn reparse_block<'node>(
- root: &'node SyntaxNode,
+fn reparse_block(
+ root: &SyntaxNode,
edit: &Indel,
) -> Option<(GreenNode, Vec<SyntaxError>, TextRange)> {
let (node, reparser) = find_reparsable_node(root, edit.delete)?;
diff --git a/crates/syntax/src/tests.rs b/crates/syntax/src/tests.rs
index 45f3c800fc0..9f24261717f 100644
--- a/crates/syntax/src/tests.rs
+++ b/crates/syntax/src/tests.rs
@@ -236,7 +236,7 @@ where
}
});
dir_tests(&test_data_dir(), err_paths, "rast", |text, path| {
- if let Ok(_) = f(text) {
+ if f(text).is_ok() {
panic!("'{:?}' successfully parsed when it should have errored", path);
} else {
"ERROR\n".to_owned()
diff --git a/xtask/src/release/changelog.rs b/xtask/src/release/changelog.rs
index ffcae2cf726..2384a746f30 100644
--- a/xtask/src/release/changelog.rs
+++ b/xtask/src/release/changelog.rs
@@ -132,7 +132,7 @@ fn parse_changelog_line(s: &str) -> Option<PrInfo> {
return Some(PrInfo { kind, message: Some(message) });
}
};
- let res = PrInfo { kind, message };
+ let res = PrInfo { message, kind };
Some(res)
}
@@ -152,7 +152,7 @@ fn parse_title_line(s: &str) -> PrInfo {
PrKind::Skip => None,
_ => Some(s[prefix.len()..].to_string()),
};
- return PrInfo { kind, message };
+ return PrInfo { message, kind };
}
}
PrInfo { kind: PrKind::Other, message: Some(s.to_string()) }
diff --git a/xtask/src/tidy.rs b/xtask/src/tidy.rs
index 6f687a7883e..e1a62da2776 100644
--- a/xtask/src/tidy.rs
+++ b/xtask/src/tidy.rs
@@ -33,7 +33,7 @@ fn check_code_formatting() {
let _e = pushenv("RUSTUP_TOOLCHAIN", "stable");
crate::ensure_rustfmt().unwrap();
let res = cmd!("cargo fmt -- --check").run();
- if !res.is_ok() {
+ if res.is_err() {
let _ = cmd!("cargo fmt").run();
}
res.unwrap()
@@ -244,19 +244,19 @@ Zlib OR Apache-2.0 OR MIT
.map(|it| it.trim())
.map(|it| it[r#""license":"#.len()..].trim_matches('"'))
.collect::<Vec<_>>();
- licenses.sort();
+ licenses.sort_unstable();
licenses.dedup();
if licenses != expected {
let mut diff = String::new();
- diff += &format!("New Licenses:\n");
+ diff += &"New Licenses:\n".to_string();
for &l in licenses.iter() {
if !expected.contains(&l) {
diff += &format!(" {}\n", l)
}
}
- diff += &format!("\nMissing Licenses:\n");
+ diff += &"\nMissing Licenses:\n".to_string();
for &l in expected.iter() {
if !licenses.contains(&l) {
diff += &format!(" {}\n", l)