Skip to content

Commit 208401f

Browse files
ceejbotceejbot
committed
Run clippy on the tests.
1 parent eaea95d commit 208401f

4 files changed

Lines changed: 27 additions & 27 deletions

File tree

‎src/bash.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,27 +66,27 @@ mod tests {
6666
let toml = include_str!("../fixtures/sample.toml");
6767
let mut doc = toml.parse::<DocumentMut>().expect("test doc should be valid toml");
6868

69-
let key = Keyspec::from_str("testcases.hashes.mats").unwrap();
69+
let key = Keyspec::from_str("testcases.hashes.mats").expect("test keyspec expected to be valid");
7070
let item = get_key(&mut doc, &key).expect("expected to find key testcases.hashes.mats");
7171
let formatted = format_bash(&item);
7272
assert_eq!(formatted, r#"( "potatoes" "salt" "oil" "frying" )"#);
7373

74-
let key = Keyspec::from_str("testcases.numbers").unwrap();
74+
let key = Keyspec::from_str("testcases.numbers").expect("test keyspec expected to be valid");
7575
let item = get_key(&mut doc, &key).expect("expected to find key testcases.numbers");
7676
let formatted = format_bash(&item);
7777
assert_eq!(formatted, r#"( 1 3 5 7 11 13 17 23 )"#);
7878

79-
let key = Keyspec::from_str("testcases.hashes.color").unwrap();
79+
let key = Keyspec::from_str("testcases.hashes.color").expect("test keyspec expected to be valid");
8080
let item = get_key(&mut doc, &key).expect("expected to find key testcases.numbers");
8181
let formatted = format_bash(&item);
8282
assert_eq!(formatted, r#""brown""#);
8383

84-
let key = Keyspec::from_str("testcases.are_passing").unwrap();
84+
let key = Keyspec::from_str("testcases.are_passing").expect("test keyspec expected to be valid");
8585
let item = get_key(&mut doc, &key).expect("expected to find key testcases.are_passing");
8686
let formatted = format_bash(&item);
8787
assert_eq!(formatted, r#"1"#);
8888

89-
let key = Keyspec::from_str("testcases.are_complete").unwrap();
89+
let key = Keyspec::from_str("testcases.are_complete").expect("test keyspec expected to be valid");
9090
let item = get_key(&mut doc, &key).expect("expected to find key testcases.are_complete");
9191
let formatted = format_bash(&item);
9292
assert_eq!(formatted, r#"0"#);
@@ -105,7 +105,7 @@ bashval[class]="Archaeologist""#;
105105

106106
let mut doc = toml.parse::<DocumentMut>().expect("test string should be valid toml");
107107

108-
let key = Keyspec::from_str("inline_table").unwrap();
108+
let key = Keyspec::from_str("inline_table").expect("test keyspec expected to be valid");
109109
let item = get_key(&mut doc, &key).expect("expected to get key 'inline_table'");
110110
let bashified = format_bash(&item);
111111
assert_eq!(bashified, expected);

‎src/json.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,32 +70,32 @@ mod tests {
7070
let toml = include_str!("../fixtures/sample.toml");
7171
let mut doc = toml.parse::<DocumentMut>().expect("test doc should be valid toml");
7272

73-
let key = Keyspec::from_str("testcases.hashes.mats").unwrap();
73+
let key = Keyspec::from_str("testcases.hashes.mats").expect("json_output() test keyspec should be good");
7474
let item = get_key(&mut doc, &key).expect("expected to find key testcases.hashes.mats");
7575
let formatted = format_json(&item);
7676
assert_eq!(formatted, r#"["potatoes","salt","oil","frying"]"#);
7777

78-
let key = Keyspec::from_str("testcases.numbers").unwrap();
78+
let key = Keyspec::from_str("testcases.numbers").expect("json_output() test keyspec should be good");
7979
let item = get_key(&mut doc, &key).expect("expected to find key testcases.numbers");
8080
let formatted = format_json(&item);
8181
assert_eq!(formatted, r#"[1,3,5,7,11,13,17,23]"#);
8282

83-
let key = Keyspec::from_str("testcases.hashes.color").unwrap();
83+
let key = Keyspec::from_str("testcases.hashes.color").expect("json_output() test keyspec should be good");
8484
let item = get_key(&mut doc, &key).expect("expected to find key testcases.numbers");
8585
let formatted = format_json(&item);
8686
assert_eq!(formatted, r#""brown""#);
8787

88-
let key = Keyspec::from_str("testcases.are_passing").unwrap();
88+
let key = Keyspec::from_str("testcases.are_passing").expect("json_output() test keyspec should be good");
8989
let item = get_key(&mut doc, &key).expect("expected to find key testcases.are_passing");
9090
let formatted = format_json(&item);
9191
assert_eq!(formatted, r#"true"#);
9292

93-
let key = Keyspec::from_str("testcases.are_complete").unwrap();
93+
let key = Keyspec::from_str("testcases.are_complete").expect("json_output() test keyspec should be good");
9494
let item = get_key(&mut doc, &key).expect("expected to find key testcases.are_complete");
9595
let formatted = format_json(&item);
9696
assert_eq!(formatted, r#"false"#);
9797

98-
let key = Keyspec::from_str("nested").unwrap();
98+
let key = Keyspec::from_str("nested").expect("json_output() test keyspec should be good");
9999
let item = get_key(&mut doc, &key).expect("expected to find key nested");
100100
let formatted = format_json(&item);
101101
assert_eq!(formatted, r#"[{"entry":"one"},{"entry":"two"}]"#);

‎src/keys.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,34 +90,34 @@ mod tests {
9090

9191
#[test]
9292
fn key_parsing_easy() {
93-
let mut key = Keyspec::from_str("a").unwrap();
93+
let mut key = Keyspec::from_str("a").expect("test keyspect expected to be valid");
9494
assert!(key.subkeys.len() == 1);
9595
assert_eq!(key.subkeys[0], KeySegment::Name("a".to_string()));
9696

97-
key = Keyspec::from_str("a.b.c").unwrap();
97+
key = Keyspec::from_str("a.b.c").expect("test keyspect expected to be valid");
9898
assert!(key.subkeys.len() == 3);
9999
assert_eq!(key.subkeys[2], KeySegment::Name("c".to_string()));
100100
}
101101

102102
#[test]
103103
fn key_parsing_arrays() {
104-
let mut key = Keyspec::from_str("a[1]").unwrap();
104+
let mut key = Keyspec::from_str("a[1]").expect("test keyspect expected to be valid");
105105
assert!(key.subkeys.len() == 2);
106106
assert_eq!(key.subkeys[0], KeySegment::Name("a".to_string()));
107107
assert_eq!(key.subkeys[1], KeySegment::Index(1));
108108

109-
key = Keyspec::from_str("a[1].b[2]").unwrap();
109+
key = Keyspec::from_str("a[1].b[2]").expect("test keyspect expected to be valid");
110110
assert!(key.subkeys.len() == 4);
111111
assert_eq!(key.subkeys[2], KeySegment::Name("b".to_string()));
112112
assert_eq!(key.subkeys[3], KeySegment::Index(2));
113113

114-
key = Keyspec::from_str("a[1].b.c[3]").unwrap();
114+
key = Keyspec::from_str("a[1].b.c[3]").expect("test keyspect expected to be valid");
115115
assert!(key.subkeys.len() == 5);
116116
assert_eq!(key.subkeys[2], KeySegment::Name("b".to_string()));
117117
assert_eq!(key.subkeys[3], KeySegment::Name("c".to_string()));
118118
assert_eq!(key.subkeys[4], KeySegment::Index(3));
119119

120-
let identical = Keyspec::from_str("a.1.b.c.3").unwrap();
120+
let identical = Keyspec::from_str("a.1.b.c.3").expect("test keyspect expected to be valid");
121121
assert!(identical.subkeys.len() == 5);
122122
assert_eq!(identical.subkeys[2], KeySegment::Name("b".to_string()));
123123
assert_eq!(identical.subkeys[3], KeySegment::Name("c".to_string()));

‎src/main.rs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ mod tests {
503503

504504
let key = Keyspec::from_str("testcases.these.are.maybe.fruits").expect("test key should be valid");
505505
let item = append_value(&mut doc, &key, "banana").expect("expected to be able to insert value 'banana'");
506-
eprintln!("{}", doc.to_string());
506+
eprintln!("{doc}");
507507
assert!(item.is_none());
508508
assert!(doc.to_string().contains(
509509
r#"these = { are = { not = { fruits = ["leek", "artichoke"] }, maybe = { fruits = ["banana"] } } }"#
@@ -567,7 +567,7 @@ mod tests {
567567
}
568568
_ => {
569569
eprintln!("{:?}", tval.inner);
570-
assert!(false, "should have been a string");
570+
unreachable!("should have been a string");
571571
}
572572
}
573573

@@ -579,19 +579,19 @@ mod tests {
579579
}
580580
_ => {
581581
eprintln!("{:?}", tval.inner);
582-
assert!(false, "should have been a string");
582+
unreachable!("should have been a string");
583583
}
584584
}
585585

586586
let unquoted = "false";
587587
let tval2 = TomlVal::from_str(unquoted).expect("conversion should work");
588588
match tval2.inner {
589589
Value::Boolean(b) => {
590-
assert_eq!(*b.value(), false);
590+
assert!(!*b.value());
591591
}
592592
_ => {
593593
eprintln!("{:?}", tval2.inner);
594-
assert!(false, "should have been a boolean");
594+
unreachable!("should have been a boolean");
595595
}
596596
}
597597
}
@@ -606,7 +606,7 @@ mod tests {
606606
}
607607
_ => {
608608
eprintln!("{:?}", tval.inner);
609-
assert!(false, "should have been a string");
609+
unreachable!("should have been a string");
610610
}
611611
}
612612

@@ -618,7 +618,7 @@ mod tests {
618618
}
619619
_ => {
620620
eprintln!("{:?}", tval2.inner);
621-
assert!(false, "should have been an integer");
621+
unreachable!("should have been an integer");
622622
}
623623
}
624624

@@ -630,7 +630,7 @@ mod tests {
630630
}
631631
_ => {
632632
eprintln!("{:?}", floatyval.inner);
633-
assert!(false, "should have been an integer");
633+
unreachable!("should have been an integer");
634634
}
635635
}
636636
}
@@ -657,7 +657,7 @@ mod tests {
657657
let curval = current.as_value().expect("the new value should be a valid toml value");
658658
match curval {
659659
Value::Boolean(b) => {
660-
assert_eq!(*b.value(), false);
660+
assert!(!*b.value());
661661
}
662662
_ => panic!("fetched value was supposed to be a boolean!"),
663663
}

0 commit comments

Comments
 (0)