Skip to content

Commit 439201b

Browse files
ltrattltratt
committed
Various fixes suggested by Clippy.
1 parent 2c82cf7 commit 439201b

File tree

8 files changed

+75
-77
lines changed

8 files changed

+75
-77
lines changed

‎cfgrammar/src/lib/yacc/firsts.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ mod test {
176176
}
177177
}
178178
}
179-
if should_be.iter().position(|x| x == &"").is_some() {
179+
if should_be.iter().any(|x| x == &"") {
180180
assert!(firsts.is_epsilon_set(ridx));
181181
}
182182
}

‎cfgrammar/src/lib/yacc/follows.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,10 +139,8 @@ mod test {
139139
if follows.is_set(ridx, tidx) {
140140
panic!("{} is incorrectly set in {}", n, rn);
141141
}
142-
} else {
143-
if !follows.is_set(ridx, tidx) {
144-
panic!("{} is not set in {}", n, rn);
145-
}
142+
} else if !follows.is_set(ridx, tidx) {
143+
panic!("{} is not set in {}", n, rn);
146144
}
147145
}
148146
}

‎cfgrammar/src/lib/yacc/grammar.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1305,7 +1305,7 @@ mod test {
13051305
"
13061306
).unwrap();
13071307

1308-
let scores = rule_min_costs(&grm, &vec![1, 1, 1]);
1308+
let scores = rule_min_costs(&grm, &[1, 1, 1]);
13091309
assert_eq!(scores[usize::from(grm.rule_idx(&"A").unwrap())], 0);
13101310
assert_eq!(scores[usize::from(grm.rule_idx(&"B").unwrap())], 1);
13111311
assert_eq!(scores[usize::from(grm.rule_idx(&"C").unwrap())], 1);
@@ -1376,7 +1376,7 @@ mod test {
13761376
"
13771377
).unwrap();
13781378

1379-
let scores = rule_max_costs(&grm, &vec![1, 1, 1]);
1379+
let scores = rule_max_costs(&grm, &[1, 1, 1]);
13801380
assert_eq!(scores[usize::from(grm.rule_idx("A").unwrap())], u16::max_value());
13811381
assert_eq!(scores[usize::from(grm.rule_idx("B").unwrap())], u16::max_value());
13821382
assert_eq!(scores[usize::from(grm.rule_idx("C").unwrap())], u16::max_value());
@@ -1399,7 +1399,7 @@ mod test {
13991399
"
14001400
).unwrap();
14011401

1402-
let scores = rule_max_costs(&grm, &vec![1, 1, 1]);
1402+
let scores = rule_max_costs(&grm, &[1, 1, 1]);
14031403
assert_eq!(scores[usize::from(grm.rule_idx("A").unwrap())], u16::max_value());
14041404
assert_eq!(scores[usize::from(grm.rule_idx("B").unwrap())], 3);
14051405
assert_eq!(scores[usize::from(grm.rule_idx("C").unwrap())], 2);

‎lrpar/cttests/src/lib.rs

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -22,31 +22,31 @@ lrpar_mod!(span_y);
2222
#[test]
2323
fn multitypes() {
2424
let lexerdef = multitypes_l::lexerdef();
25-
let mut lexer = lexerdef.lexer("aa");
26-
let (r, errs) = multitypes_y::parse(&mut lexer);
25+
let lexer = lexerdef.lexer("aa");
26+
let (r, errs) = multitypes_y::parse(&lexer);
2727
assert_eq!(r.unwrap().len(), 2);
2828
assert_eq!(errs.len(), 0);
2929
}
3030

3131
#[test]
3232
fn test_no_actions() {
3333
let lexerdef = calc_noactions_l::lexerdef();
34-
let mut lexer = lexerdef.lexer("2+3");
35-
if !calc_noactions_y::parse(&mut lexer).is_empty() {
34+
let lexer = lexerdef.lexer("2+3");
35+
if !calc_noactions_y::parse(&lexer).is_empty() {
3636
panic!();
3737
}
38-
let mut lexer = lexerdef.lexer("2++3");
39-
if calc_noactions_y::parse(&mut lexer).len() != 1 {
38+
let lexer = lexerdef.lexer("2++3");
39+
if calc_noactions_y::parse(&lexer).len() != 1 {
4040
panic!();
4141
}
4242
}
4343

4444
#[test]
4545
fn test_basic_actions() {
4646
let lexerdef = calc_actiontype_l::lexerdef();
47-
let mut lexer = lexerdef.lexer("2+3");
48-
match calc_actiontype_y::parse(&mut lexer) {
49-
(Some(Ok(5)), ref errs) if errs.len() == 0 => (),
47+
let lexer = lexerdef.lexer("2+3");
48+
match calc_actiontype_y::parse(&lexer) {
49+
(Some(Ok(5)), ref errs) if errs.is_empty() => (),
5050
_ => unreachable!()
5151
}
5252
}
@@ -57,8 +57,8 @@ fn test_error_recovery_and_actions() {
5757

5858
let lexerdef = calc_actiontype_l::lexerdef();
5959

60-
let mut lexer = lexerdef.lexer("2++3");
61-
let (r, errs) = calc_actiontype_y::parse(&mut lexer);
60+
let lexer = lexerdef.lexer("2++3");
61+
let (r, errs) = calc_actiontype_y::parse(&lexer);
6262
match r {
6363
Some(Ok(5)) => (),
6464
_ => unreachable!()
@@ -68,46 +68,46 @@ fn test_error_recovery_and_actions() {
6868
_ => unreachable!()
6969
}
7070

71-
let mut lexer = lexerdef.lexer("2+3)");
72-
let (r, errs) = calc_actiontype_y::parse(&mut lexer);
71+
let lexer = lexerdef.lexer("2+3)");
72+
let (r, errs) = calc_actiontype_y::parse(&lexer);
7373
assert_eq!(r, Some(Ok(5)));
7474
assert_eq!(errs.len(), 1);
7575
match errs[0] {
7676
LexParseError::ParseError(..) => (),
7777
_ => unreachable!()
7878
}
7979

80-
let mut lexer = lexerdef.lexer("2+3+18446744073709551616");
81-
let (r, errs) = calc_actiontype_y::parse(&mut lexer);
80+
let lexer = lexerdef.lexer("2+3+18446744073709551616");
81+
let (r, errs) = calc_actiontype_y::parse(&lexer);
8282
assert_eq!(r, Some(Err(())));
8383
assert!(errs.is_empty());
8484
}
8585

8686
#[test]
8787
fn test_calc_multitypes() {
8888
let lexerdef = calc_multitypes_l::lexerdef();
89-
let mut lexer = lexerdef.lexer("1+2*3");
90-
let (res, _errs) = calc_multitypes_y::parse(&mut lexer);
89+
let lexer = lexerdef.lexer("1+2*3");
90+
let (res, _errs) = calc_multitypes_y::parse(&lexer);
9191
assert_eq!(res, Some(Ok(7)));
9292

93-
lexer = lexerdef.lexer("1++2");
94-
let (res, _errs) = calc_multitypes_y::parse(&mut lexer);
93+
let lexer = lexerdef.lexer("1++2");
94+
let (res, _errs) = calc_multitypes_y::parse(&lexer);
9595
assert_eq!(res, Some(Ok(3)));
9696
}
9797

9898
#[test]
9999
fn test_span() {
100100
let lexerdef = span_l::lexerdef();
101-
let mut lexer = lexerdef.lexer("2+3");
102-
match span_y::parse(&mut lexer) {
101+
let lexer = lexerdef.lexer("2+3");
102+
match span_y::parse(&lexer) {
103103
(Some(ref spans), _) if spans == &vec![(0, 1), (0, 1), (2, 3), (2, 3), (2, 3), (0, 3)] => {
104104
()
105105
}
106106
_ => unreachable!()
107107
}
108108

109-
let mut lexer = lexerdef.lexer("2+3*4");
110-
match span_y::parse(&mut lexer) {
109+
let lexer = lexerdef.lexer("2+3*4");
110+
match span_y::parse(&lexer) {
111111
(Some(ref spans), _)
112112
if spans
113113
== &vec![
@@ -126,16 +126,16 @@ fn test_span() {
126126
_ => unreachable!()
127127
}
128128

129-
let mut lexer = lexerdef.lexer("2++3");
130-
match span_y::parse(&mut lexer) {
129+
let lexer = lexerdef.lexer("2++3");
130+
match span_y::parse(&lexer) {
131131
(Some(ref spans), _) if spans == &vec![(0, 1), (0, 1), (3, 4), (3, 4), (3, 4), (0, 4)] => {
132132
()
133133
}
134134
_ => unreachable!()
135135
}
136136

137-
let mut lexer = lexerdef.lexer("(2)))");
138-
match span_y::parse(&mut lexer) {
137+
let lexer = lexerdef.lexer("(2)))");
138+
match span_y::parse(&lexer) {
139139
(Some(ref spans), _) if spans == &vec![(1, 2), (1, 2), (1, 2), (0, 3), (0, 3), (0, 3)] => {
140140
()
141141
}
@@ -146,8 +146,8 @@ fn test_span() {
146146
#[test]
147147
fn test_passthrough() {
148148
let lexerdef = passthrough_l::lexerdef();
149-
let mut lexer = lexerdef.lexer("101");
150-
match passthrough_y::parse(&mut lexer) {
149+
let lexer = lexerdef.lexer("101");
150+
match passthrough_y::parse(&lexer) {
151151
(Some(Ok(ref s)), _) if s == "$101" => (),
152152
_ => unreachable!()
153153
}

‎lrpar/src/lib/cpctplus.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ mod test {
450450

451451
fn pp_repairs<StorageT: 'static + Hash + PrimInt + Unsigned>(
452452
grm: &YaccGrammar<StorageT>,
453-
repairs: &Vec<ParseRepair<StorageT>>
453+
repairs: &[ParseRepair<StorageT>]
454454
) -> String
455455
where
456456
usize: AsPrimitive<StorageT>
@@ -461,8 +461,8 @@ mod test {
461461
ParseRepair::Insert(token_idx) => {
462462
out.push(format!("Insert \"{}\"", grm.token_epp(token_idx).unwrap()))
463463
}
464-
ParseRepair::Delete(_) => out.push(format!("Delete")),
465-
ParseRepair::Shift(_) => out.push(format!("Shift"))
464+
ParseRepair::Delete(_) => out.push("Delete".to_owned()),
465+
ParseRepair::Shift(_) => out.push("Shift".to_owned())
466466
}
467467
}
468468
out.join(", ")
@@ -565,24 +565,24 @@ E : 'N'
565565
check_all_repairs(
566566
&grm,
567567
&errs[0],
568-
&vec![
568+
&[
569569
"Insert \")\", Insert \"+\"",
570570
"Insert \")\", Delete",
571-
"Insert \"+\", Shift, Insert \")\"",
571+
"Insert \"+\", Shift, Insert \")\""
572572
]
573573
);
574574

575575
let (grm, pr) = do_parse(RecoveryKind::CPCTPlus, &lexs, &grms, "n)+n+n+n)");
576576
let (_, errs) = pr.unwrap_err();
577577
assert_eq!(errs.len(), 2);
578-
check_all_repairs(&grm, &errs[0], &vec!["Delete"]);
579-
check_all_repairs(&grm, &errs[1], &vec!["Delete"]);
578+
check_all_repairs(&grm, &errs[0], &["Delete"]);
579+
check_all_repairs(&grm, &errs[1], &["Delete"]);
580580

581581
let (grm, pr) = do_parse(RecoveryKind::CPCTPlus, &lexs, &grms, "(((+n)+n+n+n)");
582582
let (_, errs) = pr.unwrap_err();
583583
assert_eq!(errs.len(), 2);
584-
check_all_repairs(&grm, &errs[0], &vec!["Insert \"N\"", "Delete"]);
585-
check_all_repairs(&grm, &errs[1], &vec!["Insert \")\""]);
584+
check_all_repairs(&grm, &errs[0], &["Insert \"N\"", "Delete"]);
585+
check_all_repairs(&grm, &errs[1], &["Insert \")\""]);
586586
}
587587

588588
#[test]
@@ -607,10 +607,10 @@ U: 'd';
607607
check_all_repairs(
608608
&grm,
609609
&errs[0],
610-
&vec![
610+
&[
611611
"Insert \"a\", Insert \"d\"",
612612
"Insert \"b\", Insert \"d\"",
613-
"Insert \"c\", Insert \"d\"",
613+
"Insert \"c\", Insert \"d\""
614614
]
615615
);
616616
}

0 commit comments

Comments
 (0)