Skip to content

Commit 1363cd4

Browse files
committed
Remove some unnecessary parens in assert! conditions
While working on #122661, some of these started triggering our "unnecessary parens" lints due to a change in the `assert!` desugaring. A cursory search identified a few more. Some of these have been carried from before 1.0, were a bulk rename from the previous name of `assert!` left them in that state. I went and removed as many of these unnecessary parens as possible in order to have fewer annoyances in the future if we make the lint smarter.
1 parent 2f348cb commit 1363cd4

32 files changed

+131
-134
lines changed

library/alloc/tests/str.rs

+11-11
Original file line numberDiff line numberDiff line change
@@ -2297,21 +2297,21 @@ fn utf8_chars() {
22972297
assert_eq!(schs.len(), 4);
22982298
assert_eq!(schs.iter().cloned().collect::<String>(), s);
22992299

2300-
assert!((from_utf8(s.as_bytes()).is_ok()));
2300+
assert!(from_utf8(s.as_bytes()).is_ok());
23012301
// invalid prefix
2302-
assert!((!from_utf8(&[0x80]).is_ok()));
2302+
assert!(!from_utf8(&[0x80]).is_ok());
23032303
// invalid 2 byte prefix
2304-
assert!((!from_utf8(&[0xc0]).is_ok()));
2305-
assert!((!from_utf8(&[0xc0, 0x10]).is_ok()));
2304+
assert!(!from_utf8(&[0xc0]).is_ok());
2305+
assert!(!from_utf8(&[0xc0, 0x10]).is_ok());
23062306
// invalid 3 byte prefix
2307-
assert!((!from_utf8(&[0xe0]).is_ok()));
2308-
assert!((!from_utf8(&[0xe0, 0x10]).is_ok()));
2309-
assert!((!from_utf8(&[0xe0, 0xff, 0x10]).is_ok()));
2307+
assert!(!from_utf8(&[0xe0]).is_ok());
2308+
assert!(!from_utf8(&[0xe0, 0x10]).is_ok());
2309+
assert!(!from_utf8(&[0xe0, 0xff, 0x10]).is_ok());
23102310
// invalid 4 byte prefix
2311-
assert!((!from_utf8(&[0xf0]).is_ok()));
2312-
assert!((!from_utf8(&[0xf0, 0x10]).is_ok()));
2313-
assert!((!from_utf8(&[0xf0, 0xff, 0x10]).is_ok()));
2314-
assert!((!from_utf8(&[0xf0, 0xff, 0xff, 0x10]).is_ok()));
2311+
assert!(!from_utf8(&[0xf0]).is_ok());
2312+
assert!(!from_utf8(&[0xf0, 0x10]).is_ok());
2313+
assert!(!from_utf8(&[0xf0, 0xff, 0x10]).is_ok());
2314+
assert!(!from_utf8(&[0xf0, 0xff, 0xff, 0x10]).is_ok());
23152315
}
23162316

23172317
#[test]

library/coretests/tests/bool.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,14 @@ fn test_bool() {
7171
#[test]
7272
pub fn test_bool_not() {
7373
if !false {
74-
assert!((true));
74+
assert!(true);
7575
} else {
76-
assert!((false));
76+
assert!(false);
7777
}
7878
if !true {
79-
assert!((false));
79+
assert!(false);
8080
} else {
81-
assert!((true));
81+
assert!(true);
8282
}
8383
}
8484

library/coretests/tests/ptr.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ fn test() {
4242
let mut v1 = vec![0u16, 0u16, 0u16];
4343

4444
copy(v0.as_ptr().offset(1), v1.as_mut_ptr().offset(1), 1);
45-
assert!((v1[0] == 0u16 && v1[1] == 32001u16 && v1[2] == 0u16));
45+
assert!(v1[0] == 0u16 && v1[1] == 32001u16 && v1[2] == 0u16);
4646
copy(v0.as_ptr().offset(2), v1.as_mut_ptr(), 1);
47-
assert!((v1[0] == 32002u16 && v1[1] == 32001u16 && v1[2] == 0u16));
47+
assert!(v1[0] == 32002u16 && v1[1] == 32001u16 && v1[2] == 0u16);
4848
copy(v0.as_ptr(), v1.as_mut_ptr().offset(2), 1);
49-
assert!((v1[0] == 32002u16 && v1[1] == 32001u16 && v1[2] == 32000u16));
49+
assert!(v1[0] == 32002u16 && v1[1] == 32001u16 && v1[2] == 32000u16);
5050
}
5151
}
5252

library/std/src/env/tests.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ fn test_self_exe_path() {
1313

1414
#[test]
1515
fn test() {
16-
assert!((!Path::new("test-path").is_absolute()));
16+
assert!(!Path::new("test-path").is_absolute());
1717

1818
#[cfg(not(target_env = "sgx"))]
1919
current_dir().unwrap();

library/std/tests/istr.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ fn test_stack_assign() {
55
let t: String = "a".to_string();
66
assert_eq!(s, t);
77
let u: String = "b".to_string();
8-
assert!((s != u));
8+
assert!(s != u);
99
}
1010

1111
#[test]
@@ -19,7 +19,7 @@ fn test_heap_assign() {
1919
let t: String = "a big ol' string".to_string();
2020
assert_eq!(s, t);
2121
let u: String = "a bad ol' string".to_string();
22-
assert!((s != u));
22+
assert!(s != u);
2323
}
2424

2525
#[test]

library/std/tests/seq-compare.rs

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
#[test]
22
fn seq_compare() {
3-
assert!(("hello".to_string() < "hellr".to_string()));
4-
assert!(("hello ".to_string() > "hello".to_string()));
5-
assert!(("hello".to_string() != "there".to_string()));
6-
assert!((vec![1, 2, 3, 4] > vec![1, 2, 3]));
7-
assert!((vec![1, 2, 3] < vec![1, 2, 3, 4]));
8-
assert!((vec![1, 2, 4, 4] > vec![1, 2, 3, 4]));
9-
assert!((vec![1, 2, 3, 4] < vec![1, 2, 4, 4]));
10-
assert!((vec![1, 2, 3] <= vec![1, 2, 3]));
11-
assert!((vec![1, 2, 3] <= vec![1, 2, 3, 3]));
12-
assert!((vec![1, 2, 3, 4] > vec![1, 2, 3]));
3+
assert!("hello".to_string() < "hellr".to_string());
4+
assert!("hello ".to_string() > "hello".to_string());
5+
assert!("hello".to_string() != "there".to_string());
6+
assert!(vec![1, 2, 3, 4] > vec![1, 2, 3]);
7+
assert!(vec![1, 2, 3] < vec![1, 2, 3, 4]);
8+
assert!(vec![1, 2, 4, 4] > vec![1, 2, 3, 4]);
9+
assert!(vec![1, 2, 3, 4] < vec![1, 2, 4, 4]);
10+
assert!(vec![1, 2, 3] <= vec![1, 2, 3]);
11+
assert!(vec![1, 2, 3] <= vec![1, 2, 3, 3]);
12+
assert!(vec![1, 2, 3, 4] > vec![1, 2, 3]);
1313
assert_eq!(vec![1, 2, 3], vec![1, 2, 3]);
14-
assert!((vec![1, 2, 3] != vec![1, 1, 3]));
14+
assert!(vec![1, 2, 3] != vec![1, 1, 3]);
1515
}

src/tools/miri/tests/pass/binops.rs

+15-15
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@
22

33
fn test_nil() {
44
assert_eq!((), ());
5-
assert!((!(() != ())));
6-
assert!((!(() < ())));
7-
assert!((() <= ()));
8-
assert!((!(() > ())));
9-
assert!((() >= ()));
5+
assert!(!(() != ()));
6+
assert!(!(() < ()));
7+
assert!(() <= ());
8+
assert!(!(() > ()));
9+
assert!(() >= ());
1010
}
1111

1212
fn test_bool() {
13-
assert!((!(true < false)));
14-
assert!((!(true <= false)));
15-
assert!((true > false));
16-
assert!((true >= false));
13+
assert!(!(true < false));
14+
assert!(!(true <= false));
15+
assert!(true > false);
16+
assert!(true >= false);
1717

18-
assert!((false < true));
19-
assert!((false <= true));
20-
assert!((!(false > true)));
21-
assert!((!(false >= true)));
18+
assert!(false < true);
19+
assert!(false <= true);
20+
assert!(!(false > true));
21+
assert!(!(false >= true));
2222

2323
// Bools support bitwise binops
2424
assert_eq!(false & false, false);
@@ -65,9 +65,9 @@ fn test_class() {
6565

6666
assert_eq!(q, r);
6767
r.y = 17;
68-
assert!((r.y != q.y));
68+
assert!(r.y != q.y);
6969
assert_eq!(r.y, 17);
70-
assert!((q != r));
70+
assert!(q != r);
7171
}
7272

7373
pub fn main() {

tests/ui/binding/expr-match-generic.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ type compare<T> = extern "Rust" fn(T, T) -> bool;
55

66
fn test_generic<T:Clone>(expected: T, eq: compare<T>) {
77
let actual: T = match true { true => { expected.clone() }, _ => panic!("wat") };
8-
assert!((eq(expected, actual)));
8+
assert!(eq(expected, actual));
99
}
1010

1111
fn test_bool() {

tests/ui/binding/expr-match.rs

+5-8
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
11
//@ run-pass
22

3-
4-
5-
63
// Tests for using match as an expression
74

85
fn test_basic() {
96
let mut rs: bool = match true { true => { true } false => { false } };
10-
assert!((rs));
7+
assert!(rs);
118
rs = match false { true => { false } false => { true } };
12-
assert!((rs));
9+
assert!(rs);
1310
}
1411

1512
fn test_inferrence() {
1613
let rs = match true { true => { true } false => { false } };
17-
assert!((rs));
14+
assert!(rs);
1815
}
1916

2017
fn test_alt_as_alt_head() {
@@ -25,7 +22,7 @@ fn test_alt_as_alt_head() {
2522
true => { false }
2623
false => { true }
2724
};
28-
assert!((rs));
25+
assert!(rs);
2926
}
3027

3128
fn test_alt_as_block_result() {
@@ -34,7 +31,7 @@ fn test_alt_as_block_result() {
3431
true => { false }
3532
false => { match true { true => { true } false => { false } } }
3633
};
37-
assert!((rs));
34+
assert!(rs);
3835
}
3936

4037
pub fn main() {

tests/ui/binop/binops.rs

+15-15
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,23 @@
55

66
fn test_nil() {
77
assert_eq!((), ());
8-
assert!((!(() != ())));
9-
assert!((!(() < ())));
10-
assert!((() <= ()));
11-
assert!((!(() > ())));
12-
assert!((() >= ()));
8+
assert!(!(() != ()));
9+
assert!(!(() < ()));
10+
assert!(() <= ());
11+
assert!(!(() > ()));
12+
assert!(() >= ());
1313
}
1414

1515
fn test_bool() {
16-
assert!((!(true < false)));
17-
assert!((!(true <= false)));
18-
assert!((true > false));
19-
assert!((true >= false));
16+
assert!(!(true < false));
17+
assert!(!(true <= false));
18+
assert!(true > false);
19+
assert!(true >= false);
2020

21-
assert!((false < true));
22-
assert!((false <= true));
23-
assert!((!(false > true)));
24-
assert!((!(false >= true)));
21+
assert!(false < true);
22+
assert!(false <= true);
23+
assert!(!(false > true));
24+
assert!(!(false >= true));
2525

2626
// Bools support bitwise binops
2727
assert_eq!(false & false, false);
@@ -76,9 +76,9 @@ fn test_class() {
7676
}
7777
assert_eq!(q, r);
7878
r.y = 17;
79-
assert!((r.y != q.y));
79+
assert!(r.y != q.y);
8080
assert_eq!(r.y, 17);
81-
assert!((q != r));
81+
assert!(q != r);
8282
}
8383

8484
pub fn main() {

tests/ui/binop/structured-compare.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ pub fn main() {
1717
let a = (1, 2, 3);
1818
let b = (1, 2, 3);
1919
assert_eq!(a, b);
20-
assert!((a != (1, 2, 4)));
21-
assert!((a < (1, 2, 4)));
22-
assert!((a <= (1, 2, 4)));
23-
assert!(((1, 2, 4) > a));
24-
assert!(((1, 2, 4) >= a));
20+
assert!(a != (1, 2, 4));
21+
assert!(a < (1, 2, 4));
22+
assert!(a <= (1, 2, 4));
23+
assert!((1, 2, 4) > a);
24+
assert!((1, 2, 4) >= a);
2525
let x = foo::large;
2626
let y = foo::small;
27-
assert!((x != y));
27+
assert!(x != y);
2828
assert_eq!(x, foo::large);
29-
assert!((x != foo::small));
29+
assert!(x != foo::small);
3030
}

tests/ui/cfg/conditional-compile.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ pub fn main() {
8585
pub fn main() {
8686
// Exercise some of the configured items in ways that wouldn't be possible
8787
// if they had the FALSE definition
88-
assert!((b));
88+
assert!(b);
8989
let _x: t = true;
9090
let _y: tg = tg::bar;
9191

tests/ui/expr/block.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
// Tests for standalone blocks as expressions
66

7-
fn test_basic() { let rs: bool = { true }; assert!((rs)); }
7+
fn test_basic() { let rs: bool = { true }; assert!(rs); }
88

99
struct RS { v1: isize, v2: isize }
1010

tests/ui/expr/if/expr-if.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
11
//@ run-pass
22
// Tests for if as expressions
33

4-
fn test_if() { let rs: bool = if true { true } else { false }; assert!((rs)); }
4+
fn test_if() { let rs: bool = if true { true } else { false }; assert!(rs); }
55

66
fn test_else() {
77
let rs: bool = if false { false } else { true };
8-
assert!((rs));
8+
assert!(rs);
99
}
1010

1111
fn test_elseif1() {
1212
let rs: bool = if true { true } else if true { false } else { false };
13-
assert!((rs));
13+
assert!(rs);
1414
}
1515

1616
fn test_elseif2() {
1717
let rs: bool = if false { false } else if true { true } else { false };
18-
assert!((rs));
18+
assert!(rs);
1919
}
2020

2121
fn test_elseif3() {
2222
let rs: bool = if false { false } else if false { false } else { true };
23-
assert!((rs));
23+
assert!(rs);
2424
}
2525

2626
fn test_inferrence() {
2727
let rs = if true { true } else { false };
28-
assert!((rs));
28+
assert!(rs);
2929
}
3030

3131
fn test_if_as_if_condition() {
3232
let rs1 = if if false { false } else { true } { true } else { false };
33-
assert!((rs1));
33+
assert!(rs1);
3434
let rs2 = if if true { false } else { true } { false } else { true };
35-
assert!((rs2));
35+
assert!(rs2);
3636
}
3737

3838
fn test_if_as_block_result() {
3939
let rs = if true { if false { false } else { true } } else { false };
40-
assert!((rs));
40+
assert!(rs);
4141
}
4242

4343
pub fn main() {

tests/ui/for-loop-while/break.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@ pub fn main() {
88
assert_eq!(i, 20);
99
let xs = [1, 2, 3, 4, 5, 6];
1010
for x in &xs {
11-
if *x == 3 { break; } assert!((*x <= 3));
11+
if *x == 3 { break; } assert!(*x <= 3);
1212
}
1313
i = 0;
14-
while i < 10 { i += 1; if i % 2 == 0 { continue; } assert!((i % 2 != 0)); }
14+
while i < 10 { i += 1; if i % 2 == 0 { continue; } assert!(i % 2 != 0); }
1515
i = 0;
1616
loop {
17-
i += 1; if i % 2 == 0 { continue; } assert!((i % 2 != 0));
17+
i += 1; if i % 2 == 0 { continue; } assert!(i % 2 != 0);
1818
if i >= 10 { break; }
1919
}
2020
let ys = vec![1, 2, 3, 4, 5, 6];
2121
for x in &ys {
2222
if *x % 2 == 0 { continue; }
23-
assert!((*x % 2 != 0));
23+
assert!(*x % 2 != 0);
2424
}
2525
}

tests/ui/for-loop-while/while-cont.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
pub fn main() {
44
let mut i = 1;
55
while i > 0 {
6-
assert!((i > 0));
6+
assert!(i > 0);
77
println!("{}", i);
88
i -= 1;
99
continue;

0 commit comments

Comments
 (0)