Skip to content

Commit f3dc046

Browse files
CentrilCentril
authored
Rollup merge of rust-lang#59124 - sntdevco:master, r=Centril
Replace assert with assert_eq Use `assert_eq!` instead of `assert!` for the tests
2 parents 106159d + 365d918 commit f3dc046

File tree

1 file changed

+118
-118
lines changed

1 file changed

+118
-118
lines changed

‎src/libcore/tests/fmt/num.rs‎

Lines changed: 118 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -3,146 +3,146 @@ fn test_format_int() {
33
// Formatting integers should select the right implementation based off
44
// the type of the argument. Also, hex/octal/binary should be defined
55
// for integers, but they shouldn't emit the negative sign.
6-
assert!(format!("{}", 1isize) == "1");
7-
assert!(format!("{}", 1i8) == "1");
8-
assert!(format!("{}", 1i16) == "1");
9-
assert!(format!("{}", 1i32) == "1");
10-
assert!(format!("{}", 1i64) == "1");
11-
assert!(format!("{}", -1isize) == "-1");
12-
assert!(format!("{}", -1i8) == "-1");
13-
assert!(format!("{}", -1i16) == "-1");
14-
assert!(format!("{}", -1i32) == "-1");
15-
assert!(format!("{}", -1i64) == "-1");
16-
assert!(format!("{:?}", 1isize) == "1");
17-
assert!(format!("{:?}", 1i8) == "1");
18-
assert!(format!("{:?}", 1i16) == "1");
19-
assert!(format!("{:?}", 1i32) == "1");
20-
assert!(format!("{:?}", 1i64) == "1");
21-
assert!(format!("{:b}", 1isize) == "1");
22-
assert!(format!("{:b}", 1i8) == "1");
23-
assert!(format!("{:b}", 1i16) == "1");
24-
assert!(format!("{:b}", 1i32) == "1");
25-
assert!(format!("{:b}", 1i64) == "1");
26-
assert!(format!("{:x}", 1isize) == "1");
27-
assert!(format!("{:x}", 1i8) == "1");
28-
assert!(format!("{:x}", 1i16) == "1");
29-
assert!(format!("{:x}", 1i32) == "1");
30-
assert!(format!("{:x}", 1i64) == "1");
31-
assert!(format!("{:X}", 1isize) == "1");
32-
assert!(format!("{:X}", 1i8) == "1");
33-
assert!(format!("{:X}", 1i16) == "1");
34-
assert!(format!("{:X}", 1i32) == "1");
35-
assert!(format!("{:X}", 1i64) == "1");
36-
assert!(format!("{:o}", 1isize) == "1");
37-
assert!(format!("{:o}", 1i8) == "1");
38-
assert!(format!("{:o}", 1i16) == "1");
39-
assert!(format!("{:o}", 1i32) == "1");
40-
assert!(format!("{:o}", 1i64) == "1");
6+
assert_eq!(format!("{}", 1isize), "1");
7+
assert_eq!(format!("{}", 1i8), "1");
8+
assert_eq!(format!("{}", 1i16), "1");
9+
assert_eq!(format!("{}", 1i32), "1");
10+
assert_eq!(format!("{}", 1i64), "1");
11+
assert_eq!(format!("{}", -1isize), "-1");
12+
assert_eq!(format!("{}", -1i8), "-1");
13+
assert_eq!(format!("{}", -1i16), "-1");
14+
assert_eq!(format!("{}", -1i32), "-1");
15+
assert_eq!(format!("{}", -1i64), "-1");
16+
assert_eq!(format!("{:?}", 1isize), "1");
17+
assert_eq!(format!("{:?}", 1i8), "1");
18+
assert_eq!(format!("{:?}", 1i16), "1");
19+
assert_eq!(format!("{:?}", 1i32), "1");
20+
assert_eq!(format!("{:?}", 1i64), "1");
21+
assert_eq!(format!("{:b}", 1isize), "1");
22+
assert_eq!(format!("{:b}", 1i8), "1");
23+
assert_eq!(format!("{:b}", 1i16), "1");
24+
assert_eq!(format!("{:b}", 1i32), "1");
25+
assert_eq!(format!("{:b}", 1i64), "1");
26+
assert_eq!(format!("{:x}", 1isize), "1");
27+
assert_eq!(format!("{:x}", 1i8), "1");
28+
assert_eq!(format!("{:x}", 1i16), "1");
29+
assert_eq!(format!("{:x}", 1i32), "1");
30+
assert_eq!(format!("{:x}", 1i64), "1");
31+
assert_eq!(format!("{:X}", 1isize), "1");
32+
assert_eq!(format!("{:X}", 1i8), "1");
33+
assert_eq!(format!("{:X}", 1i16), "1");
34+
assert_eq!(format!("{:X}", 1i32), "1");
35+
assert_eq!(format!("{:X}", 1i64), "1");
36+
assert_eq!(format!("{:o}", 1isize), "1");
37+
assert_eq!(format!("{:o}", 1i8), "1");
38+
assert_eq!(format!("{:o}", 1i16), "1");
39+
assert_eq!(format!("{:o}", 1i32), "1");
40+
assert_eq!(format!("{:o}", 1i64), "1");
4141

42-
assert!(format!("{}", 1usize) == "1");
43-
assert!(format!("{}", 1u8) == "1");
44-
assert!(format!("{}", 1u16) == "1");
45-
assert!(format!("{}", 1u32) == "1");
46-
assert!(format!("{}", 1u64) == "1");
47-
assert!(format!("{:?}", 1usize) == "1");
48-
assert!(format!("{:?}", 1u8) == "1");
49-
assert!(format!("{:?}", 1u16) == "1");
50-
assert!(format!("{:?}", 1u32) == "1");
51-
assert!(format!("{:?}", 1u64) == "1");
52-
assert!(format!("{:b}", 1usize) == "1");
53-
assert!(format!("{:b}", 1u8) == "1");
54-
assert!(format!("{:b}", 1u16) == "1");
55-
assert!(format!("{:b}", 1u32) == "1");
56-
assert!(format!("{:b}", 1u64) == "1");
57-
assert!(format!("{:x}", 1usize) == "1");
58-
assert!(format!("{:x}", 1u8) == "1");
59-
assert!(format!("{:x}", 1u16) == "1");
60-
assert!(format!("{:x}", 1u32) == "1");
61-
assert!(format!("{:x}", 1u64) == "1");
62-
assert!(format!("{:X}", 1usize) == "1");
63-
assert!(format!("{:X}", 1u8) == "1");
64-
assert!(format!("{:X}", 1u16) == "1");
65-
assert!(format!("{:X}", 1u32) == "1");
66-
assert!(format!("{:X}", 1u64) == "1");
67-
assert!(format!("{:o}", 1usize) == "1");
68-
assert!(format!("{:o}", 1u8) == "1");
69-
assert!(format!("{:o}", 1u16) == "1");
70-
assert!(format!("{:o}", 1u32) == "1");
71-
assert!(format!("{:o}", 1u64) == "1");
42+
assert_eq!(format!("{}", 1usize), "1");
43+
assert_eq!(format!("{}", 1u8), "1");
44+
assert_eq!(format!("{}", 1u16), "1");
45+
assert_eq!(format!("{}", 1u32), "1");
46+
assert_eq!(format!("{}", 1u64), "1");
47+
assert_eq!(format!("{:?}", 1usize), "1");
48+
assert_eq!(format!("{:?}", 1u8), "1");
49+
assert_eq!(format!("{:?}", 1u16), "1");
50+
assert_eq!(format!("{:?}", 1u32), "1");
51+
assert_eq!(format!("{:?}", 1u64), "1");
52+
assert_eq!(format!("{:b}", 1usize), "1");
53+
assert_eq!(format!("{:b}", 1u8), "1");
54+
assert_eq!(format!("{:b}", 1u16), "1");
55+
assert_eq!(format!("{:b}", 1u32), "1");
56+
assert_eq!(format!("{:b}", 1u64), "1");
57+
assert_eq!(format!("{:x}", 1usize), "1");
58+
assert_eq!(format!("{:x}", 1u8), "1");
59+
assert_eq!(format!("{:x}", 1u16), "1");
60+
assert_eq!(format!("{:x}", 1u32), "1");
61+
assert_eq!(format!("{:x}", 1u64), "1");
62+
assert_eq!(format!("{:X}", 1usize), "1");
63+
assert_eq!(format!("{:X}", 1u8), "1");
64+
assert_eq!(format!("{:X}", 1u16), "1");
65+
assert_eq!(format!("{:X}", 1u32), "1");
66+
assert_eq!(format!("{:X}", 1u64), "1");
67+
assert_eq!(format!("{:o}", 1usize), "1");
68+
assert_eq!(format!("{:o}", 1u8), "1");
69+
assert_eq!(format!("{:o}", 1u16), "1");
70+
assert_eq!(format!("{:o}", 1u32), "1");
71+
assert_eq!(format!("{:o}", 1u64), "1");
7272

7373
// Test a larger number
74-
assert!(format!("{:b}", 55) == "110111");
75-
assert!(format!("{:o}", 55) == "67");
76-
assert!(format!("{}", 55) == "55");
77-
assert!(format!("{:x}", 55) == "37");
78-
assert!(format!("{:X}", 55) == "37");
74+
assert_eq!(format!("{:b}", 55), "110111");
75+
assert_eq!(format!("{:o}", 55), "67");
76+
assert_eq!(format!("{}", 55), "55");
77+
assert_eq!(format!("{:x}", 55), "37");
78+
assert_eq!(format!("{:X}", 55), "37");
7979
}
8080

8181
#[test]
8282
fn test_format_int_zero() {
83-
assert!(format!("{}", 0) == "0");
84-
assert!(format!("{:?}", 0) == "0");
85-
assert!(format!("{:b}", 0) == "0");
86-
assert!(format!("{:o}", 0) == "0");
87-
assert!(format!("{:x}", 0) == "0");
88-
assert!(format!("{:X}", 0) == "0");
83+
assert_eq!(format!("{}", 0), "0");
84+
assert_eq!(format!("{:?}", 0), "0");
85+
assert_eq!(format!("{:b}", 0), "0");
86+
assert_eq!(format!("{:o}", 0), "0");
87+
assert_eq!(format!("{:x}", 0), "0");
88+
assert_eq!(format!("{:X}", 0), "0");
8989

90-
assert!(format!("{}", 0u32) == "0");
91-
assert!(format!("{:?}", 0u32) == "0");
92-
assert!(format!("{:b}", 0u32) == "0");
93-
assert!(format!("{:o}", 0u32) == "0");
94-
assert!(format!("{:x}", 0u32) == "0");
95-
assert!(format!("{:X}", 0u32) == "0");
90+
assert_eq!(format!("{}", 0u32), "0");
91+
assert_eq!(format!("{:?}", 0u32), "0");
92+
assert_eq!(format!("{:b}", 0u32), "0");
93+
assert_eq!(format!("{:o}", 0u32), "0");
94+
assert_eq!(format!("{:x}", 0u32), "0");
95+
assert_eq!(format!("{:X}", 0u32), "0");
9696
}
9797

9898
#[test]
9999
fn test_format_int_flags() {
100-
assert!(format!("{:3}", 1) == " 1");
101-
assert!(format!("{:>3}", 1) == " 1");
102-
assert!(format!("{:>+3}", 1) == " +1");
103-
assert!(format!("{:<3}", 1) == "1 ");
104-
assert!(format!("{:#}", 1) == "1");
105-
assert!(format!("{:#x}", 10) == "0xa");
106-
assert!(format!("{:#X}", 10) == "0xA");
107-
assert!(format!("{:#5x}", 10) == " 0xa");
108-
assert!(format!("{:#o}", 10) == "0o12");
109-
assert!(format!("{:08x}", 10) == "0000000a");
110-
assert!(format!("{:8x}", 10) == " a");
111-
assert!(format!("{:<8x}", 10) == "a ");
112-
assert!(format!("{:>8x}", 10) == " a");
113-
assert!(format!("{:#08x}", 10) == "0x00000a");
114-
assert!(format!("{:08}", -10) == "-0000010");
115-
assert!(format!("{:x}", !0u8) == "ff");
116-
assert!(format!("{:X}", !0u8) == "FF");
117-
assert!(format!("{:b}", !0u8) == "11111111");
118-
assert!(format!("{:o}", !0u8) == "377");
119-
assert!(format!("{:#x}", !0u8) == "0xff");
120-
assert!(format!("{:#X}", !0u8) == "0xFF");
121-
assert!(format!("{:#b}", !0u8) == "0b11111111");
122-
assert!(format!("{:#o}", !0u8) == "0o377");
100+
assert_eq!(format!("{:3}", 1), " 1");
101+
assert_eq!(format!("{:>3}", 1), " 1");
102+
assert_eq!(format!("{:>+3}", 1), " +1");
103+
assert_eq!(format!("{:<3}", 1), "1 ");
104+
assert_eq!(format!("{:#}", 1), "1");
105+
assert_eq!(format!("{:#x}", 10), "0xa");
106+
assert_eq!(format!("{:#X}", 10), "0xA");
107+
assert_eq!(format!("{:#5x}", 10), " 0xa");
108+
assert_eq!(format!("{:#o}", 10), "0o12");
109+
assert_eq!(format!("{:08x}", 10), "0000000a");
110+
assert_eq!(format!("{:8x}", 10), " a");
111+
assert_eq!(format!("{:<8x}", 10), "a ");
112+
assert_eq!(format!("{:>8x}", 10), " a");
113+
assert_eq!(format!("{:#08x}", 10), "0x00000a");
114+
assert_eq!(format!("{:08}", -10), "-0000010");
115+
assert_eq!(format!("{:x}", !0u8), "ff");
116+
assert_eq!(format!("{:X}", !0u8), "FF");
117+
assert_eq!(format!("{:b}", !0u8), "11111111");
118+
assert_eq!(format!("{:o}", !0u8), "377");
119+
assert_eq!(format!("{:#x}", !0u8), "0xff");
120+
assert_eq!(format!("{:#X}", !0u8), "0xFF");
121+
assert_eq!(format!("{:#b}", !0u8), "0b11111111");
122+
assert_eq!(format!("{:#o}", !0u8), "0o377");
123123
}
124124

125125
#[test]
126126
fn test_format_int_sign_padding() {
127-
assert!(format!("{:+5}", 1) == " +1");
128-
assert!(format!("{:+5}", -1) == " -1");
129-
assert!(format!("{:05}", 1) == "00001");
130-
assert!(format!("{:05}", -1) == "-0001");
131-
assert!(format!("{:+05}", 1) == "+0001");
132-
assert!(format!("{:+05}", -1) == "-0001");
127+
assert_eq!(format!("{:+5}", 1), " +1");
128+
assert_eq!(format!("{:+5}", -1), " -1");
129+
assert_eq!(format!("{:05}", 1), "00001");
130+
assert_eq!(format!("{:05}", -1), "-0001");
131+
assert_eq!(format!("{:+05}", 1), "+0001");
132+
assert_eq!(format!("{:+05}", -1), "-0001");
133133
}
134134

135135
#[test]
136136
fn test_format_int_twos_complement() {
137-
use core::{i8, i16, i32, i64};
138-
assert!(format!("{}", i8::MIN) == "-128");
139-
assert!(format!("{}", i16::MIN) == "-32768");
140-
assert!(format!("{}", i32::MIN) == "-2147483648");
141-
assert!(format!("{}", i64::MIN) == "-9223372036854775808");
137+
use core::{i16, i32, i64, i8};
138+
assert_eq!(format!("{}", i8::MIN), "-128");
139+
assert_eq!(format!("{}", i16::MIN), "-32768");
140+
assert_eq!(format!("{}", i32::MIN), "-2147483648");
141+
assert_eq!(format!("{}", i64::MIN), "-9223372036854775808");
142142
}
143143

144144
#[test]
145145
fn test_format_debug_hex() {
146-
assert!(format!("{:02x?}", b"Foo\0") == "[46, 6f, 6f, 00]");
147-
assert!(format!("{:02X?}", b"Foo\0") == "[46, 6F, 6F, 00]");
146+
assert_eq!(format!("{:02x?}", b"Foo\0"), "[46, 6f, 6f, 00]");
147+
assert_eq!(format!("{:02X?}", b"Foo\0"), "[46, 6F, 6F, 00]");
148148
}

0 commit comments

Comments
 (0)