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.
This commit is contained in:
parent
942db6782f
commit
3815ed63ed
31 changed files with 130 additions and 133 deletions
|
@ -2297,21 +2297,21 @@ fn utf8_chars() {
|
||||||
assert_eq!(schs.len(), 4);
|
assert_eq!(schs.len(), 4);
|
||||||
assert_eq!(schs.iter().cloned().collect::<String>(), s);
|
assert_eq!(schs.iter().cloned().collect::<String>(), s);
|
||||||
|
|
||||||
assert!((from_utf8(s.as_bytes()).is_ok()));
|
assert!(from_utf8(s.as_bytes()).is_ok());
|
||||||
// invalid prefix
|
// invalid prefix
|
||||||
assert!((!from_utf8(&[0x80]).is_ok()));
|
assert!(!from_utf8(&[0x80]).is_ok());
|
||||||
// invalid 2 byte prefix
|
// invalid 2 byte prefix
|
||||||
assert!((!from_utf8(&[0xc0]).is_ok()));
|
assert!(!from_utf8(&[0xc0]).is_ok());
|
||||||
assert!((!from_utf8(&[0xc0, 0x10]).is_ok()));
|
assert!(!from_utf8(&[0xc0, 0x10]).is_ok());
|
||||||
// invalid 3 byte prefix
|
// invalid 3 byte prefix
|
||||||
assert!((!from_utf8(&[0xe0]).is_ok()));
|
assert!(!from_utf8(&[0xe0]).is_ok());
|
||||||
assert!((!from_utf8(&[0xe0, 0x10]).is_ok()));
|
assert!(!from_utf8(&[0xe0, 0x10]).is_ok());
|
||||||
assert!((!from_utf8(&[0xe0, 0xff, 0x10]).is_ok()));
|
assert!(!from_utf8(&[0xe0, 0xff, 0x10]).is_ok());
|
||||||
// invalid 4 byte prefix
|
// invalid 4 byte prefix
|
||||||
assert!((!from_utf8(&[0xf0]).is_ok()));
|
assert!(!from_utf8(&[0xf0]).is_ok());
|
||||||
assert!((!from_utf8(&[0xf0, 0x10]).is_ok()));
|
assert!(!from_utf8(&[0xf0, 0x10]).is_ok());
|
||||||
assert!((!from_utf8(&[0xf0, 0xff, 0x10]).is_ok()));
|
assert!(!from_utf8(&[0xf0, 0xff, 0x10]).is_ok());
|
||||||
assert!((!from_utf8(&[0xf0, 0xff, 0xff, 0x10]).is_ok()));
|
assert!(!from_utf8(&[0xf0, 0xff, 0xff, 0x10]).is_ok());
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
|
|
|
@ -71,14 +71,14 @@ fn test_bool() {
|
||||||
#[test]
|
#[test]
|
||||||
pub fn test_bool_not() {
|
pub fn test_bool_not() {
|
||||||
if !false {
|
if !false {
|
||||||
assert!((true));
|
assert!(true);
|
||||||
} else {
|
} else {
|
||||||
assert!((false));
|
assert!(false);
|
||||||
}
|
}
|
||||||
if !true {
|
if !true {
|
||||||
assert!((false));
|
assert!(false);
|
||||||
} else {
|
} else {
|
||||||
assert!((true));
|
assert!(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -42,11 +42,11 @@ fn test() {
|
||||||
let mut v1 = vec![0u16, 0u16, 0u16];
|
let mut v1 = vec![0u16, 0u16, 0u16];
|
||||||
|
|
||||||
copy(v0.as_ptr().offset(1), v1.as_mut_ptr().offset(1), 1);
|
copy(v0.as_ptr().offset(1), v1.as_mut_ptr().offset(1), 1);
|
||||||
assert!((v1[0] == 0u16 && v1[1] == 32001u16 && v1[2] == 0u16));
|
assert!(v1[0] == 0u16 && v1[1] == 32001u16 && v1[2] == 0u16);
|
||||||
copy(v0.as_ptr().offset(2), v1.as_mut_ptr(), 1);
|
copy(v0.as_ptr().offset(2), v1.as_mut_ptr(), 1);
|
||||||
assert!((v1[0] == 32002u16 && v1[1] == 32001u16 && v1[2] == 0u16));
|
assert!(v1[0] == 32002u16 && v1[1] == 32001u16 && v1[2] == 0u16);
|
||||||
copy(v0.as_ptr(), v1.as_mut_ptr().offset(2), 1);
|
copy(v0.as_ptr(), v1.as_mut_ptr().offset(2), 1);
|
||||||
assert!((v1[0] == 32002u16 && v1[1] == 32001u16 && v1[2] == 32000u16));
|
assert!(v1[0] == 32002u16 && v1[1] == 32001u16 && v1[2] == 32000u16);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@ fn test_stack_assign() {
|
||||||
let t: String = "a".to_string();
|
let t: String = "a".to_string();
|
||||||
assert_eq!(s, t);
|
assert_eq!(s, t);
|
||||||
let u: String = "b".to_string();
|
let u: String = "b".to_string();
|
||||||
assert!((s != u));
|
assert!(s != u);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
|
@ -19,7 +19,7 @@ fn test_heap_assign() {
|
||||||
let t: String = "a big ol' string".to_string();
|
let t: String = "a big ol' string".to_string();
|
||||||
assert_eq!(s, t);
|
assert_eq!(s, t);
|
||||||
let u: String = "a bad ol' string".to_string();
|
let u: String = "a bad ol' string".to_string();
|
||||||
assert!((s != u));
|
assert!(s != u);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
|
|
|
@ -1,15 +1,15 @@
|
||||||
#[test]
|
#[test]
|
||||||
fn seq_compare() {
|
fn seq_compare() {
|
||||||
assert!(("hello".to_string() < "hellr".to_string()));
|
assert!("hello".to_string() < "hellr".to_string());
|
||||||
assert!(("hello ".to_string() > "hello".to_string()));
|
assert!("hello ".to_string() > "hello".to_string());
|
||||||
assert!(("hello".to_string() != "there".to_string()));
|
assert!("hello".to_string() != "there".to_string());
|
||||||
assert!((vec![1, 2, 3, 4] > vec![1, 2, 3]));
|
assert!(vec![1, 2, 3, 4] > vec![1, 2, 3]);
|
||||||
assert!((vec![1, 2, 3] < vec![1, 2, 3, 4]));
|
assert!(vec![1, 2, 3] < vec![1, 2, 3, 4]);
|
||||||
assert!((vec![1, 2, 4, 4] > vec![1, 2, 3, 4]));
|
assert!(vec![1, 2, 4, 4] > vec![1, 2, 3, 4]);
|
||||||
assert!((vec![1, 2, 3, 4] < vec![1, 2, 4, 4]));
|
assert!(vec![1, 2, 3, 4] < vec![1, 2, 4, 4]);
|
||||||
assert!((vec![1, 2, 3] <= vec![1, 2, 3]));
|
assert!(vec![1, 2, 3] <= vec![1, 2, 3]);
|
||||||
assert!((vec![1, 2, 3] <= vec![1, 2, 3, 3]));
|
assert!(vec![1, 2, 3] <= vec![1, 2, 3, 3]);
|
||||||
assert!((vec![1, 2, 3, 4] > vec![1, 2, 3]));
|
assert!(vec![1, 2, 3, 4] > vec![1, 2, 3]);
|
||||||
assert_eq!(vec![1, 2, 3], vec![1, 2, 3]);
|
assert_eq!(vec![1, 2, 3], vec![1, 2, 3]);
|
||||||
assert!((vec![1, 2, 3] != vec![1, 1, 3]));
|
assert!(vec![1, 2, 3] != vec![1, 1, 3]);
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,23 +2,23 @@
|
||||||
|
|
||||||
fn test_nil() {
|
fn test_nil() {
|
||||||
assert_eq!((), ());
|
assert_eq!((), ());
|
||||||
assert!((!(() != ())));
|
assert!(!(() != ()));
|
||||||
assert!((!(() < ())));
|
assert!(!(() < ()));
|
||||||
assert!((() <= ()));
|
assert!(() <= ());
|
||||||
assert!((!(() > ())));
|
assert!(!(() > ()));
|
||||||
assert!((() >= ()));
|
assert!(() >= ());
|
||||||
}
|
}
|
||||||
|
|
||||||
fn test_bool() {
|
fn test_bool() {
|
||||||
assert!((!(true < false)));
|
assert!(!(true < false));
|
||||||
assert!((!(true <= false)));
|
assert!(!(true <= false));
|
||||||
assert!((true > false));
|
assert!(true > false);
|
||||||
assert!((true >= false));
|
assert!(true >= false);
|
||||||
|
|
||||||
assert!((false < true));
|
assert!(false < true);
|
||||||
assert!((false <= true));
|
assert!(false <= true);
|
||||||
assert!((!(false > true)));
|
assert!(!(false > true));
|
||||||
assert!((!(false >= true)));
|
assert!(!(false >= true));
|
||||||
|
|
||||||
// Bools support bitwise binops
|
// Bools support bitwise binops
|
||||||
assert_eq!(false & false, false);
|
assert_eq!(false & false, false);
|
||||||
|
@ -65,9 +65,9 @@ fn test_class() {
|
||||||
|
|
||||||
assert_eq!(q, r);
|
assert_eq!(q, r);
|
||||||
r.y = 17;
|
r.y = 17;
|
||||||
assert!((r.y != q.y));
|
assert!(r.y != q.y);
|
||||||
assert_eq!(r.y, 17);
|
assert_eq!(r.y, 17);
|
||||||
assert!((q != r));
|
assert!(q != r);
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn main() {
|
pub fn main() {
|
||||||
|
|
|
@ -5,7 +5,7 @@ type compare<T> = extern "Rust" fn(T, T) -> bool;
|
||||||
|
|
||||||
fn test_generic<T:Clone>(expected: T, eq: compare<T>) {
|
fn test_generic<T:Clone>(expected: T, eq: compare<T>) {
|
||||||
let actual: T = match true { true => { expected.clone() }, _ => panic!("wat") };
|
let actual: T = match true { true => { expected.clone() }, _ => panic!("wat") };
|
||||||
assert!((eq(expected, actual)));
|
assert!(eq(expected, actual));
|
||||||
}
|
}
|
||||||
|
|
||||||
fn test_bool() {
|
fn test_bool() {
|
||||||
|
|
|
@ -1,20 +1,17 @@
|
||||||
//@ run-pass
|
//@ run-pass
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Tests for using match as an expression
|
// Tests for using match as an expression
|
||||||
|
|
||||||
fn test_basic() {
|
fn test_basic() {
|
||||||
let mut rs: bool = match true { true => { true } false => { false } };
|
let mut rs: bool = match true { true => { true } false => { false } };
|
||||||
assert!((rs));
|
assert!(rs);
|
||||||
rs = match false { true => { false } false => { true } };
|
rs = match false { true => { false } false => { true } };
|
||||||
assert!((rs));
|
assert!(rs);
|
||||||
}
|
}
|
||||||
|
|
||||||
fn test_inferrence() {
|
fn test_inferrence() {
|
||||||
let rs = match true { true => { true } false => { false } };
|
let rs = match true { true => { true } false => { false } };
|
||||||
assert!((rs));
|
assert!(rs);
|
||||||
}
|
}
|
||||||
|
|
||||||
fn test_alt_as_alt_head() {
|
fn test_alt_as_alt_head() {
|
||||||
|
@ -25,7 +22,7 @@ fn test_alt_as_alt_head() {
|
||||||
true => { false }
|
true => { false }
|
||||||
false => { true }
|
false => { true }
|
||||||
};
|
};
|
||||||
assert!((rs));
|
assert!(rs);
|
||||||
}
|
}
|
||||||
|
|
||||||
fn test_alt_as_block_result() {
|
fn test_alt_as_block_result() {
|
||||||
|
@ -34,7 +31,7 @@ fn test_alt_as_block_result() {
|
||||||
true => { false }
|
true => { false }
|
||||||
false => { match true { true => { true } false => { false } } }
|
false => { match true { true => { true } false => { false } } }
|
||||||
};
|
};
|
||||||
assert!((rs));
|
assert!(rs);
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn main() {
|
pub fn main() {
|
||||||
|
|
|
@ -5,23 +5,23 @@
|
||||||
|
|
||||||
fn test_nil() {
|
fn test_nil() {
|
||||||
assert_eq!((), ());
|
assert_eq!((), ());
|
||||||
assert!((!(() != ())));
|
assert!(!(() != ()));
|
||||||
assert!((!(() < ())));
|
assert!(!(() < ()));
|
||||||
assert!((() <= ()));
|
assert!(() <= ());
|
||||||
assert!((!(() > ())));
|
assert!(!(() > ()));
|
||||||
assert!((() >= ()));
|
assert!(() >= ());
|
||||||
}
|
}
|
||||||
|
|
||||||
fn test_bool() {
|
fn test_bool() {
|
||||||
assert!((!(true < false)));
|
assert!(!(true < false));
|
||||||
assert!((!(true <= false)));
|
assert!(!(true <= false));
|
||||||
assert!((true > false));
|
assert!(true > false);
|
||||||
assert!((true >= false));
|
assert!(true >= false);
|
||||||
|
|
||||||
assert!((false < true));
|
assert!(false < true);
|
||||||
assert!((false <= true));
|
assert!(false <= true);
|
||||||
assert!((!(false > true)));
|
assert!(!(false > true));
|
||||||
assert!((!(false >= true)));
|
assert!(!(false >= true));
|
||||||
|
|
||||||
// Bools support bitwise binops
|
// Bools support bitwise binops
|
||||||
assert_eq!(false & false, false);
|
assert_eq!(false & false, false);
|
||||||
|
@ -76,9 +76,9 @@ fn test_class() {
|
||||||
}
|
}
|
||||||
assert_eq!(q, r);
|
assert_eq!(q, r);
|
||||||
r.y = 17;
|
r.y = 17;
|
||||||
assert!((r.y != q.y));
|
assert!(r.y != q.y);
|
||||||
assert_eq!(r.y, 17);
|
assert_eq!(r.y, 17);
|
||||||
assert!((q != r));
|
assert!(q != r);
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn main() {
|
pub fn main() {
|
||||||
|
|
|
@ -17,14 +17,14 @@ pub fn main() {
|
||||||
let a = (1, 2, 3);
|
let a = (1, 2, 3);
|
||||||
let b = (1, 2, 3);
|
let b = (1, 2, 3);
|
||||||
assert_eq!(a, b);
|
assert_eq!(a, b);
|
||||||
assert!((a != (1, 2, 4)));
|
assert!(a != (1, 2, 4));
|
||||||
assert!((a < (1, 2, 4)));
|
assert!(a < (1, 2, 4));
|
||||||
assert!((a <= (1, 2, 4)));
|
assert!(a <= (1, 2, 4));
|
||||||
assert!(((1, 2, 4) > a));
|
assert!((1, 2, 4) > a);
|
||||||
assert!(((1, 2, 4) >= a));
|
assert!((1, 2, 4) >= a);
|
||||||
let x = foo::large;
|
let x = foo::large;
|
||||||
let y = foo::small;
|
let y = foo::small;
|
||||||
assert!((x != y));
|
assert!(x != y);
|
||||||
assert_eq!(x, foo::large);
|
assert_eq!(x, foo::large);
|
||||||
assert!((x != foo::small));
|
assert!(x != foo::small);
|
||||||
}
|
}
|
||||||
|
|
|
@ -85,7 +85,7 @@ pub fn main() {
|
||||||
pub fn main() {
|
pub fn main() {
|
||||||
// Exercise some of the configured items in ways that wouldn't be possible
|
// Exercise some of the configured items in ways that wouldn't be possible
|
||||||
// if they had the FALSE definition
|
// if they had the FALSE definition
|
||||||
assert!((b));
|
assert!(b);
|
||||||
let _x: t = true;
|
let _x: t = true;
|
||||||
let _y: tg = tg::bar;
|
let _y: tg = tg::bar;
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
// Tests for standalone blocks as expressions
|
// Tests for standalone blocks as expressions
|
||||||
|
|
||||||
fn test_basic() { let rs: bool = { true }; assert!((rs)); }
|
fn test_basic() { let rs: bool = { true }; assert!(rs); }
|
||||||
|
|
||||||
struct RS { v1: isize, v2: isize }
|
struct RS { v1: isize, v2: isize }
|
||||||
|
|
||||||
|
|
|
@ -1,43 +1,43 @@
|
||||||
//@ run-pass
|
//@ run-pass
|
||||||
// Tests for if as expressions
|
// Tests for if as expressions
|
||||||
|
|
||||||
fn test_if() { let rs: bool = if true { true } else { false }; assert!((rs)); }
|
fn test_if() { let rs: bool = if true { true } else { false }; assert!(rs); }
|
||||||
|
|
||||||
fn test_else() {
|
fn test_else() {
|
||||||
let rs: bool = if false { false } else { true };
|
let rs: bool = if false { false } else { true };
|
||||||
assert!((rs));
|
assert!(rs);
|
||||||
}
|
}
|
||||||
|
|
||||||
fn test_elseif1() {
|
fn test_elseif1() {
|
||||||
let rs: bool = if true { true } else if true { false } else { false };
|
let rs: bool = if true { true } else if true { false } else { false };
|
||||||
assert!((rs));
|
assert!(rs);
|
||||||
}
|
}
|
||||||
|
|
||||||
fn test_elseif2() {
|
fn test_elseif2() {
|
||||||
let rs: bool = if false { false } else if true { true } else { false };
|
let rs: bool = if false { false } else if true { true } else { false };
|
||||||
assert!((rs));
|
assert!(rs);
|
||||||
}
|
}
|
||||||
|
|
||||||
fn test_elseif3() {
|
fn test_elseif3() {
|
||||||
let rs: bool = if false { false } else if false { false } else { true };
|
let rs: bool = if false { false } else if false { false } else { true };
|
||||||
assert!((rs));
|
assert!(rs);
|
||||||
}
|
}
|
||||||
|
|
||||||
fn test_inferrence() {
|
fn test_inferrence() {
|
||||||
let rs = if true { true } else { false };
|
let rs = if true { true } else { false };
|
||||||
assert!((rs));
|
assert!(rs);
|
||||||
}
|
}
|
||||||
|
|
||||||
fn test_if_as_if_condition() {
|
fn test_if_as_if_condition() {
|
||||||
let rs1 = if if false { false } else { true } { true } else { false };
|
let rs1 = if if false { false } else { true } { true } else { false };
|
||||||
assert!((rs1));
|
assert!(rs1);
|
||||||
let rs2 = if if true { false } else { true } { false } else { true };
|
let rs2 = if if true { false } else { true } { false } else { true };
|
||||||
assert!((rs2));
|
assert!(rs2);
|
||||||
}
|
}
|
||||||
|
|
||||||
fn test_if_as_block_result() {
|
fn test_if_as_block_result() {
|
||||||
let rs = if true { if false { false } else { true } } else { false };
|
let rs = if true { if false { false } else { true } } else { false };
|
||||||
assert!((rs));
|
assert!(rs);
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn main() {
|
pub fn main() {
|
||||||
|
|
|
@ -8,18 +8,18 @@ pub fn main() {
|
||||||
assert_eq!(i, 20);
|
assert_eq!(i, 20);
|
||||||
let xs = [1, 2, 3, 4, 5, 6];
|
let xs = [1, 2, 3, 4, 5, 6];
|
||||||
for x in &xs {
|
for x in &xs {
|
||||||
if *x == 3 { break; } assert!((*x <= 3));
|
if *x == 3 { break; } assert!(*x <= 3);
|
||||||
}
|
}
|
||||||
i = 0;
|
i = 0;
|
||||||
while i < 10 { i += 1; if i % 2 == 0 { continue; } assert!((i % 2 != 0)); }
|
while i < 10 { i += 1; if i % 2 == 0 { continue; } assert!(i % 2 != 0); }
|
||||||
i = 0;
|
i = 0;
|
||||||
loop {
|
loop {
|
||||||
i += 1; if i % 2 == 0 { continue; } assert!((i % 2 != 0));
|
i += 1; if i % 2 == 0 { continue; } assert!(i % 2 != 0);
|
||||||
if i >= 10 { break; }
|
if i >= 10 { break; }
|
||||||
}
|
}
|
||||||
let ys = vec![1, 2, 3, 4, 5, 6];
|
let ys = vec![1, 2, 3, 4, 5, 6];
|
||||||
for x in &ys {
|
for x in &ys {
|
||||||
if *x % 2 == 0 { continue; }
|
if *x % 2 == 0 { continue; }
|
||||||
assert!((*x % 2 != 0));
|
assert!(*x % 2 != 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
pub fn main() {
|
pub fn main() {
|
||||||
let mut i = 1;
|
let mut i = 1;
|
||||||
while i > 0 {
|
while i > 0 {
|
||||||
assert!((i > 0));
|
assert!(i > 0);
|
||||||
println!("{}", i);
|
println!("{}", i);
|
||||||
i -= 1;
|
i -= 1;
|
||||||
continue;
|
continue;
|
||||||
|
|
|
@ -11,5 +11,5 @@ pub fn main() {
|
||||||
while false { x = y; y = z; }
|
while false { x = y; y = z; }
|
||||||
println!("{}", y);
|
println!("{}", y);
|
||||||
}
|
}
|
||||||
assert!((y == 42 && z == 50));
|
assert!(y == 42 && z == 50);
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,7 +7,7 @@ enum foo<T> { arm(T), }
|
||||||
fn altfoo<T>(f: foo<T>) {
|
fn altfoo<T>(f: foo<T>) {
|
||||||
let mut hit = false;
|
let mut hit = false;
|
||||||
match f { foo::arm::<T>(_x) => { println!("in arm"); hit = true; } }
|
match f { foo::arm::<T>(_x) => { println!("in arm"); hit = true; } }
|
||||||
assert!((hit));
|
assert!(hit);
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn main() { altfoo::<isize>(foo::arm::<isize>(10)); }
|
pub fn main() { altfoo::<isize>(foo::arm::<isize>(10)); }
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
|
|
||||||
fn range_<F>(a: isize, b: isize, mut it: F) where F: FnMut(isize) {
|
fn range_<F>(a: isize, b: isize, mut it: F) where F: FnMut(isize) {
|
||||||
assert!((a < b));
|
assert!(a < b);
|
||||||
let mut i: isize = a;
|
let mut i: isize = a;
|
||||||
while i < b { it(i); i += 1; }
|
while i < b { it(i); i += 1; }
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,7 +16,7 @@ pub fn main() {
|
||||||
assert_eq!(line!(), 16);
|
assert_eq!(line!(), 16);
|
||||||
assert_eq!(column!(), 16);
|
assert_eq!(column!(), 16);
|
||||||
assert_eq!(indirect_line!(), 18);
|
assert_eq!(indirect_line!(), 18);
|
||||||
assert!((file!().ends_with("syntax-extension-source-utils.rs")));
|
assert!(file!().ends_with("syntax-extension-source-utils.rs"));
|
||||||
assert_eq!(stringify!((2*3) + 5).to_string(), "(2*3) + 5".to_string());
|
assert_eq!(stringify!((2*3) + 5).to_string(), "(2*3) + 5".to_string());
|
||||||
assert!(include!("syntax-extension-source-utils-files/includeme.\
|
assert!(include!("syntax-extension-source-utils-files/includeme.\
|
||||||
fragment").to_string()
|
fragment").to_string()
|
||||||
|
@ -30,7 +30,7 @@ pub fn main() {
|
||||||
include_bytes!("syntax-extension-source-utils-files/includeme.fragment")
|
include_bytes!("syntax-extension-source-utils-files/includeme.fragment")
|
||||||
[1] == (42 as u8)); // '*'
|
[1] == (42 as u8)); // '*'
|
||||||
// The Windows tests are wrapped in an extra module for some reason
|
// The Windows tests are wrapped in an extra module for some reason
|
||||||
assert!((m1::m2::where_am_i().ends_with("m1::m2")));
|
assert!(m1::m2::where_am_i().ends_with("m1::m2"));
|
||||||
|
|
||||||
assert_eq!((35, "(2*3) + 5"), (line!(), stringify!((2*3) + 5)));
|
assert_eq!((35, "(2*3) + 5"), (line!(), stringify!((2*3) + 5)));
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,22 +3,22 @@
|
||||||
|
|
||||||
// Unsigned integer operations
|
// Unsigned integer operations
|
||||||
pub fn main() {
|
pub fn main() {
|
||||||
assert!((0u8 < 255u8));
|
assert!(0u8 < 255u8);
|
||||||
assert!((0u8 <= 255u8));
|
assert!(0u8 <= 255u8);
|
||||||
assert!((255u8 > 0u8));
|
assert!(255u8 > 0u8);
|
||||||
assert!((255u8 >= 0u8));
|
assert!(255u8 >= 0u8);
|
||||||
assert_eq!(250u8 / 10u8, 25u8);
|
assert_eq!(250u8 / 10u8, 25u8);
|
||||||
assert_eq!(255u8 % 10u8, 5u8);
|
assert_eq!(255u8 % 10u8, 5u8);
|
||||||
assert!((0u16 < 60000u16));
|
assert!(0u16 < 60000u16);
|
||||||
assert!((0u16 <= 60000u16));
|
assert!(0u16 <= 60000u16);
|
||||||
assert!((60000u16 > 0u16));
|
assert!(60000u16 > 0u16);
|
||||||
assert!((60000u16 >= 0u16));
|
assert!(60000u16 >= 0u16);
|
||||||
assert_eq!(60000u16 / 10u16, 6000u16);
|
assert_eq!(60000u16 / 10u16, 6000u16);
|
||||||
assert_eq!(60005u16 % 10u16, 5u16);
|
assert_eq!(60005u16 % 10u16, 5u16);
|
||||||
assert!((0u32 < 4000000000u32));
|
assert!(0u32 < 4000000000u32);
|
||||||
assert!((0u32 <= 4000000000u32));
|
assert!(0u32 <= 4000000000u32);
|
||||||
assert!((4000000000u32 > 0u32));
|
assert!(4000000000u32 > 0u32);
|
||||||
assert!((4000000000u32 >= 0u32));
|
assert!(4000000000u32 >= 0u32);
|
||||||
assert_eq!(4000000000u32 / 10u32, 400000000u32);
|
assert_eq!(4000000000u32 / 10u32, 400000000u32);
|
||||||
assert_eq!(4000000005u32 % 10u32, 5u32);
|
assert_eq!(4000000005u32 % 10u32, 5u32);
|
||||||
// 64-bit numbers have some flakiness yet. Not tested
|
// 64-bit numbers have some flakiness yet. Not tested
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
pub fn main() {
|
pub fn main() {
|
||||||
let nan: f64 = f64::NAN;
|
let nan: f64 = f64::NAN;
|
||||||
assert!((nan).is_nan());
|
assert!(nan.is_nan());
|
||||||
|
|
||||||
let inf: f64 = f64::INFINITY;
|
let inf: f64 = f64::INFINITY;
|
||||||
let neg_inf: f64 = -f64::INFINITY;
|
let neg_inf: f64 = -f64::INFINITY;
|
||||||
|
|
|
@ -15,12 +15,12 @@ pub fn main() {
|
||||||
let j = 3.1e+9f64;
|
let j = 3.1e+9f64;
|
||||||
let k = 3.2e-10f64;
|
let k = 3.2e-10f64;
|
||||||
assert_eq!(a, b);
|
assert_eq!(a, b);
|
||||||
assert!((c < b));
|
assert!(c < b);
|
||||||
assert_eq!(c, d);
|
assert_eq!(c, d);
|
||||||
assert!((e < g));
|
assert!(e < g);
|
||||||
assert!((f < h));
|
assert!(f < h);
|
||||||
assert_eq!(g, 1000000.0f32);
|
assert_eq!(g, 1000000.0f32);
|
||||||
assert_eq!(h, i);
|
assert_eq!(h, i);
|
||||||
assert!((j > k));
|
assert!(j > k);
|
||||||
assert!((k < a));
|
assert!(k < a);
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,9 +4,9 @@
|
||||||
|
|
||||||
pub fn main() {
|
pub fn main() {
|
||||||
let f = 4.999999999999f64;
|
let f = 4.999999999999f64;
|
||||||
assert!((f > 4.90f64));
|
assert!(f > 4.90f64);
|
||||||
assert!((f < 5.0f64));
|
assert!(f < 5.0f64);
|
||||||
let g = 4.90000000001e-10f64;
|
let g = 4.90000000001e-10f64;
|
||||||
assert!((g > 5e-11f64));
|
assert!(g > 5e-11f64);
|
||||||
assert!((g < 5e-9f64));
|
assert!(g < 5e-9f64);
|
||||||
}
|
}
|
||||||
|
|
|
@ -102,6 +102,6 @@ pub fn main() {
|
||||||
let mut spotty: cat<cat_type> = cat::new(2, 57, cat_type::tuxedo);
|
let mut spotty: cat<cat_type> = cat::new(2, 57, cat_type::tuxedo);
|
||||||
for _ in 0_usize..6 { spotty.speak(); }
|
for _ in 0_usize..6 { spotty.speak(); }
|
||||||
assert_eq!(spotty.len(), 8);
|
assert_eq!(spotty.len(), 8);
|
||||||
assert!((spotty.contains_key(&2)));
|
assert!(spotty.contains_key(&2));
|
||||||
assert_eq!(spotty.get(&3), &cat_type::tuxedo);
|
assert_eq!(spotty.get(&3), &cat_type::tuxedo);
|
||||||
}
|
}
|
||||||
|
|
|
@ -53,7 +53,7 @@ fn cat(in_x : usize, in_y : isize, in_name: String) -> cat {
|
||||||
pub fn main() {
|
pub fn main() {
|
||||||
let mut nyan = cat(0_usize, 2, "nyan".to_string());
|
let mut nyan = cat(0_usize, 2, "nyan".to_string());
|
||||||
nyan.eat();
|
nyan.eat();
|
||||||
assert!((!nyan.eat()));
|
assert!(!nyan.eat());
|
||||||
for _ in 1_usize..10_usize { nyan.speak(); };
|
for _ in 1_usize..10_usize { nyan.speak(); };
|
||||||
assert!((nyan.eat()));
|
assert!(nyan.eat());
|
||||||
}
|
}
|
||||||
|
|
|
@ -57,7 +57,7 @@ fn make_speak<C:noisy>(mut c: C) {
|
||||||
pub fn main() {
|
pub fn main() {
|
||||||
let mut nyan = cat(0_usize, 2, "nyan".to_string());
|
let mut nyan = cat(0_usize, 2, "nyan".to_string());
|
||||||
nyan.eat();
|
nyan.eat();
|
||||||
assert!((!nyan.eat()));
|
assert!(!nyan.eat());
|
||||||
for _ in 1_usize..10_usize {
|
for _ in 1_usize..10_usize {
|
||||||
make_speak(nyan.clone());
|
make_speak(nyan.clone());
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,7 +7,7 @@ use cci_class_4::kitties::cat;
|
||||||
pub fn main() {
|
pub fn main() {
|
||||||
let mut nyan = cat(0_usize, 2, "nyan".to_string());
|
let mut nyan = cat(0_usize, 2, "nyan".to_string());
|
||||||
nyan.eat();
|
nyan.eat();
|
||||||
assert!((!nyan.eat()));
|
assert!(!nyan.eat());
|
||||||
for _ in 1_usize..10_usize { nyan.speak(); };
|
for _ in 1_usize..10_usize { nyan.speak(); };
|
||||||
assert!((nyan.eat()));
|
assert!(nyan.eat());
|
||||||
}
|
}
|
||||||
|
|
|
@ -45,7 +45,7 @@ fn cat(in_x : usize, in_y : isize, in_name: String) -> cat {
|
||||||
pub fn main() {
|
pub fn main() {
|
||||||
let mut nyan = cat(0_usize, 2, "nyan".to_string());
|
let mut nyan = cat(0_usize, 2, "nyan".to_string());
|
||||||
nyan.eat();
|
nyan.eat();
|
||||||
assert!((!nyan.eat()));
|
assert!(!nyan.eat());
|
||||||
for _ in 1_usize..10_usize { nyan.speak(); };
|
for _ in 1_usize..10_usize { nyan.speak(); };
|
||||||
assert!((nyan.eat()));
|
assert!(nyan.eat());
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,6 +25,6 @@ impl PartialEq for colour {
|
||||||
fn ne(&self, other: &colour) -> bool { !(*self).eq(other) }
|
fn ne(&self, other: &colour) -> bool { !(*self).eq(other) }
|
||||||
}
|
}
|
||||||
|
|
||||||
fn f() { let x = colour::red(1, 2); let y = colour::green; assert!((x != y)); }
|
fn f() { let x = colour::red(1, 2); let y = colour::green; assert!(x != y); }
|
||||||
|
|
||||||
pub fn main() { f(); }
|
pub fn main() { f(); }
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
//@ run-pass
|
//@ run-pass
|
||||||
|
|
||||||
fn checktrue(rs: bool) -> bool { assert!((rs)); return true; }
|
fn checktrue(rs: bool) -> bool { assert!(rs); return true; }
|
||||||
|
|
||||||
pub fn main() { let k = checktrue; evenk(42, k); oddk(45, k); }
|
pub fn main() { let k = checktrue; evenk(42, k); oddk(45, k); }
|
||||||
|
|
||||||
|
|
|
@ -34,7 +34,7 @@ fn what() {
|
||||||
let i = &Cell::new(false);
|
let i = &Cell::new(false);
|
||||||
let dont = {||the(i)};
|
let dont = {||the(i)};
|
||||||
dont();
|
dont();
|
||||||
assert!((i.get()));
|
assert!(i.get());
|
||||||
}
|
}
|
||||||
|
|
||||||
fn zombiejesus() {
|
fn zombiejesus() {
|
||||||
|
@ -69,8 +69,8 @@ fn notsure() {
|
||||||
|
|
||||||
fn canttouchthis() -> usize {
|
fn canttouchthis() -> usize {
|
||||||
fn p() -> bool { true }
|
fn p() -> bool { true }
|
||||||
let _a = (assert!((true)) == (assert!(p())));
|
let _a = (assert!(true) == (assert!(p())));
|
||||||
let _c = (assert!((p())) == ());
|
let _c = (assert!(p()) == ());
|
||||||
let _b: bool = (println!("{}", 0) == (return 0));
|
let _b: bool = (println!("{}", 0) == (return 0));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue