Skip to content

Commit 629e8d1

Browse files
clemenswasserclemenswasser
committed
Apply more clippy suggestions and update generated
1 parent 3c6dc0f commit 629e8d1

File tree

11 files changed

+51
-142
lines changed

11 files changed

+51
-142
lines changed

‎crates/mbe/src/benchmark.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ fn invocation_fixtures(rules: &FxHashMap<String, MacroRules>) -> Vec<(String, tt
187187
let a = 1664525;
188188
let c = 1013904223;
189189
*seed = usize::wrapping_add(usize::wrapping_mul(*seed, a), c);
190-
return *seed;
190+
*seed
191191
}
192192
fn make_ident(ident: &str) -> tt::TokenTree {
193193
tt::Leaf::Ident(tt::Ident { id: tt::TokenId::unspecified(), text: SmolStr::new(ident) })

‎crates/mbe/src/expander/matcher.rs

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ impl BindingsBuilder {
219219
bindings
220220
}
221221

222-
fn build_inner(&self, bindings: &mut Bindings, link_nodes: &Vec<LinkNode<Rc<BindingKind>>>) {
222+
fn build_inner(&self, bindings: &mut Bindings, link_nodes: &[LinkNode<Rc<BindingKind>>]) {
223223
let mut nodes = Vec::new();
224224
self.collect_nodes(&link_nodes, &mut nodes);
225225

@@ -301,7 +301,7 @@ impl BindingsBuilder {
301301

302302
fn collect_nodes<'a>(
303303
&'a self,
304-
link_nodes: &'a Vec<LinkNode<Rc<BindingKind>>>,
304+
link_nodes: &'a [LinkNode<Rc<BindingKind>>],
305305
nodes: &mut Vec<&'a Rc<BindingKind>>,
306306
) {
307307
link_nodes.iter().for_each(|it| match it {
@@ -494,15 +494,8 @@ fn match_loop_inner<'t>(
494494
}
495495
Some(err) => {
496496
res.add_err(err);
497-
match match_res.value {
498-
Some(fragment) => {
499-
bindings_builder.push_fragment(
500-
&mut item.bindings,
501-
&name,
502-
fragment,
503-
);
504-
}
505-
_ => {}
497+
if let Some(fragment) = match_res.value {
498+
bindings_builder.push_fragment(&mut item.bindings, &name, fragment);
506499
}
507500
item.is_error = true;
508501
error_items.push(item);
@@ -578,9 +571,9 @@ fn match_loop(pattern: &MetaTemplate, src: &tt::Subtree) -> Match {
578571
);
579572
stdx::always!(cur_items.is_empty());
580573

581-
if error_items.len() > 0 {
574+
if !error_items.is_empty() {
582575
error_recover_item = error_items.pop().map(|it| it.bindings);
583-
} else if eof_items.len() > 0 {
576+
} else if !eof_items.is_empty() {
584577
error_recover_item = Some(eof_items[0].bindings.clone());
585578
}
586579

@@ -793,7 +786,7 @@ impl<'a> TtIter<'a> {
793786
_ => (),
794787
}
795788

796-
let tt = self.next().ok_or_else(|| ())?.clone();
789+
let tt = self.next().ok_or(())?.clone();
797790
let punct = match tt {
798791
tt::TokenTree::Leaf(tt::Leaf::Punct(punct)) if punct.spacing == tt::Spacing::Joint => {
799792
punct

‎crates/mbe/src/lib.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -295,8 +295,8 @@ fn validate(pattern: &MetaTemplate) -> Result<(), ParseError> {
295295
// Checks that no repetition which could match an empty token
296296
// https://github.com/rust-lang/rust/blob/a58b1ed44f5e06976de2bdc4d7dc81c36a96934f/src/librustc_expand/mbe/macro_rules.rs#L558
297297

298-
if separator.is_none() {
299-
if subtree.iter().all(|child_op| {
298+
if separator.is_none()
299+
&& subtree.iter().all(|child_op| {
300300
match child_op {
301301
Op::Var { kind, .. } => {
302302
// vis is optional
@@ -314,9 +314,9 @@ fn validate(pattern: &MetaTemplate) -> Result<(), ParseError> {
314314
Op::Subtree { .. } => {}
315315
}
316316
false
317-
}) {
318-
return Err(ParseError::RepetitionEmptyTokenTree);
319-
}
317+
})
318+
{
319+
return Err(ParseError::RepetitionEmptyTokenTree);
320320
}
321321
validate(subtree)?
322322
}

‎crates/mbe/src/parser.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ fn next_op<'a>(first: &tt::TokenTree, src: &mut TtIter<'a>, mode: Mode) -> Resul
213213
Ok(res)
214214
}
215215

216-
fn eat_fragment_kind<'a>(src: &mut TtIter<'a>, mode: Mode) -> Result<Option<SmolStr>, ParseError> {
216+
fn eat_fragment_kind(src: &mut TtIter<'_>, mode: Mode) -> Result<Option<SmolStr>, ParseError> {
217217
if let Mode::Pattern = mode {
218218
src.expect_char(':').map_err(|()| err!("bad fragment specifier 1"))?;
219219
let ident = src.expect_ident().map_err(|()| err!("bad fragment specifier 1"))?;

‎crates/mbe/src/syntax_bridge.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -243,8 +243,7 @@ trait TokenConvertor {
243243
type Token: SrcToken;
244244

245245
fn go(&mut self) -> tt::Subtree {
246-
let mut subtree = tt::Subtree::default();
247-
subtree.delimiter = None;
246+
let mut subtree = tt::Subtree { delimiter: None, ..Default::default() };
248247
while self.peek().is_some() {
249248
self.collect_leaf(&mut subtree.token_trees);
250249
}
@@ -506,7 +505,7 @@ impl TokenConvertor for Convertor {
506505

507506
fn peek(&self) -> Option<Self::Token> {
508507
if let Some((punct, mut offset)) = self.punct_offset.clone() {
509-
offset = offset + TextSize::of('.');
508+
offset += TextSize::of('.');
510509
if usize::from(offset) < punct.text().len() {
511510
return Some(SynToken::Punch(punct, offset));
512511
}

‎crates/mbe/src/tt_iter.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ impl<'a> TtIter<'a> {
138138
}
139139
}
140140
self.inner = self.inner.as_slice()[res.len()..].iter();
141-
if res.len() == 0 && err.is_none() {
141+
if res.is_empty() && err.is_none() {
142142
err = Some(err!("no tokens consumed"));
143143
}
144144
let res = match res.len() {

‎crates/parser/src/syntax_kind/generated.rs

Lines changed: 23 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -260,116 +260,33 @@ pub enum SyntaxKind {
260260
use self::SyntaxKind::*;
261261
impl SyntaxKind {
262262
pub fn is_keyword(self) -> bool {
263-
matches!(
264-
self,
265-
AS_KW
266-
| ASYNC_KW
267-
| AWAIT_KW
268-
| BOX_KW
269-
| BREAK_KW
270-
| CONST_KW
271-
| CONTINUE_KW
272-
| CRATE_KW
273-
| DYN_KW
274-
| ELSE_KW
275-
| ENUM_KW
276-
| EXTERN_KW
277-
| FALSE_KW
278-
| FN_KW
279-
| FOR_KW
280-
| IF_KW
281-
| IMPL_KW
282-
| IN_KW
283-
| LET_KW
284-
| LOOP_KW
285-
| MACRO_KW
286-
| MATCH_KW
287-
| MOD_KW
288-
| MOVE_KW
289-
| MUT_KW
290-
| PUB_KW
291-
| REF_KW
292-
| RETURN_KW
293-
| SELF_KW
294-
| STATIC_KW
295-
| STRUCT_KW
296-
| SUPER_KW
297-
| TRAIT_KW
298-
| TRUE_KW
299-
| TRY_KW
300-
| TYPE_KW
301-
| UNSAFE_KW
302-
| USE_KW
303-
| WHERE_KW
304-
| WHILE_KW
305-
| YIELD_KW
306-
| AUTO_KW
307-
| DEFAULT_KW
308-
| EXISTENTIAL_KW
309-
| UNION_KW
310-
| RAW_KW
311-
| MACRO_RULES_KW
312-
)
263+
match self {
264+
AS_KW | ASYNC_KW | AWAIT_KW | BOX_KW | BREAK_KW | CONST_KW | CONTINUE_KW | CRATE_KW
265+
| DYN_KW | ELSE_KW | ENUM_KW | EXTERN_KW | FALSE_KW | FN_KW | FOR_KW | IF_KW
266+
| IMPL_KW | IN_KW | LET_KW | LOOP_KW | MACRO_KW | MATCH_KW | MOD_KW | MOVE_KW
267+
| MUT_KW | PUB_KW | REF_KW | RETURN_KW | SELF_KW | STATIC_KW | STRUCT_KW | SUPER_KW
268+
| TRAIT_KW | TRUE_KW | TRY_KW | TYPE_KW | UNSAFE_KW | USE_KW | WHERE_KW | WHILE_KW
269+
| YIELD_KW | AUTO_KW | DEFAULT_KW | EXISTENTIAL_KW | UNION_KW | RAW_KW
270+
| MACRO_RULES_KW => true,
271+
_ => false,
272+
}
313273
}
314274
pub fn is_punct(self) -> bool {
315-
matches!(
316-
self,
317-
SEMICOLON
318-
| COMMA
319-
| L_PAREN
320-
| R_PAREN
321-
| L_CURLY
322-
| R_CURLY
323-
| L_BRACK
324-
| R_BRACK
325-
| L_ANGLE
326-
| R_ANGLE
327-
| AT
328-
| POUND
329-
| TILDE
330-
| QUESTION
331-
| DOLLAR
332-
| AMP
333-
| PIPE
334-
| PLUS
335-
| STAR
336-
| SLASH
337-
| CARET
338-
| PERCENT
339-
| UNDERSCORE
340-
| DOT
341-
| DOT2
342-
| DOT3
343-
| DOT2EQ
344-
| COLON
345-
| COLON2
346-
| EQ
347-
| EQ2
348-
| FAT_ARROW
349-
| BANG
350-
| NEQ
351-
| MINUS
352-
| THIN_ARROW
353-
| LTEQ
354-
| GTEQ
355-
| PLUSEQ
356-
| MINUSEQ
357-
| PIPEEQ
358-
| AMPEQ
359-
| CARETEQ
360-
| SLASHEQ
361-
| STAREQ
362-
| PERCENTEQ
363-
| AMP2
364-
| PIPE2
365-
| SHL
366-
| SHR
367-
| SHLEQ
368-
| SHREQ
369-
)
275+
match self {
276+
SEMICOLON | COMMA | L_PAREN | R_PAREN | L_CURLY | R_CURLY | L_BRACK | R_BRACK
277+
| L_ANGLE | R_ANGLE | AT | POUND | TILDE | QUESTION | DOLLAR | AMP | PIPE | PLUS
278+
| STAR | SLASH | CARET | PERCENT | UNDERSCORE | DOT | DOT2 | DOT3 | DOT2EQ | COLON
279+
| COLON2 | EQ | EQ2 | FAT_ARROW | BANG | NEQ | MINUS | THIN_ARROW | LTEQ | GTEQ
280+
| PLUSEQ | MINUSEQ | PIPEEQ | AMPEQ | CARETEQ | SLASHEQ | STAREQ | PERCENTEQ | AMP2
281+
| PIPE2 | SHL | SHR | SHLEQ | SHREQ => true,
282+
_ => false,
283+
}
370284
}
371285
pub fn is_literal(self) -> bool {
372-
matches!(self, INT_NUMBER | FLOAT_NUMBER | CHAR | BYTE | STRING | BYTE_STRING)
286+
match self {
287+
INT_NUMBER | FLOAT_NUMBER | CHAR | BYTE | STRING | BYTE_STRING => true,
288+
_ => false,
289+
}
373290
}
374291
pub fn from_keyword(ident: &str) -> Option<SyntaxKind> {
375292
let kw = match ident {

‎crates/syntax/src/parsing/reparsing.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ pub(crate) fn incremental_reparse(
3636
None
3737
}
3838

39-
fn reparse_token<'node>(
40-
root: &'node SyntaxNode,
39+
fn reparse_token(
40+
root: &SyntaxNode,
4141
edit: &Indel,
4242
) -> Option<(GreenNode, Vec<SyntaxError>, TextRange)> {
4343
let prev_token = root.covering_element(edit.delete).as_token()?.clone();
@@ -84,8 +84,8 @@ fn reparse_token<'node>(
8484
}
8585
}
8686

87-
fn reparse_block<'node>(
88-
root: &'node SyntaxNode,
87+
fn reparse_block(
88+
root: &SyntaxNode,
8989
edit: &Indel,
9090
) -> Option<(GreenNode, Vec<SyntaxError>, TextRange)> {
9191
let (node, reparser) = find_reparsable_node(root, edit.delete)?;

‎crates/syntax/src/tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ where
236236
}
237237
});
238238
dir_tests(&test_data_dir(), err_paths, "rast", |text, path| {
239-
if let Ok(_) = f(text) {
239+
if f(text).is_ok() {
240240
panic!("'{:?}' successfully parsed when it should have errored", path);
241241
} else {
242242
"ERROR\n".to_owned()

‎xtask/src/release/changelog.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ fn parse_changelog_line(s: &str) -> Option<PrInfo> {
132132
return Some(PrInfo { kind, message: Some(message) });
133133
}
134134
};
135-
let res = PrInfo { kind, message };
135+
let res = PrInfo { message, kind };
136136
Some(res)
137137
}
138138

@@ -152,7 +152,7 @@ fn parse_title_line(s: &str) -> PrInfo {
152152
PrKind::Skip => None,
153153
_ => Some(s[prefix.len()..].to_string()),
154154
};
155-
return PrInfo { kind, message };
155+
return PrInfo { message, kind };
156156
}
157157
}
158158
PrInfo { kind: PrKind::Other, message: Some(s.to_string()) }

0 commit comments

Comments
 (0)