Skip to content

Commit 0b3a002

Browse files
JohnTitordtolnay
authored andcommitted
Reorder widening_impls to make the doc clearer
1 parent d22dd65 commit 0b3a002

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

library/core/src/num/mod.rs

+18-18
Original file line numberDiff line numberDiff line change
@@ -201,33 +201,33 @@ macro_rules! widening_impl {
201201

202202
#[lang = "i8"]
203203
impl i8 {
204-
widening_impl! { i8, i16, 8, signed }
205204
int_impl! { i8, i8, u8, 8, 7, -128, 127, 2, "-0x7e", "0xa", "0x12", "0x12", "0x48",
206205
"[0x12]", "[0x12]", "", "" }
206+
widening_impl! { i8, i16, 8, signed }
207207
}
208208

209209
#[lang = "i16"]
210210
impl i16 {
211-
widening_impl! { i16, i32, 16, signed }
212211
int_impl! { i16, i16, u16, 16, 15, -32768, 32767, 4, "-0x5ffd", "0x3a", "0x1234", "0x3412",
213212
"0x2c48", "[0x34, 0x12]", "[0x12, 0x34]", "", "" }
213+
widening_impl! { i16, i32, 16, signed }
214214
}
215215

216216
#[lang = "i32"]
217217
impl i32 {
218-
widening_impl! { i32, i64, 32, signed }
219218
int_impl! { i32, i32, u32, 32, 31, -2147483648, 2147483647, 8, "0x10000b3", "0xb301",
220219
"0x12345678", "0x78563412", "0x1e6a2c48", "[0x78, 0x56, 0x34, 0x12]",
221220
"[0x12, 0x34, 0x56, 0x78]", "", "" }
221+
widening_impl! { i32, i64, 32, signed }
222222
}
223223

224224
#[lang = "i64"]
225225
impl i64 {
226-
widening_impl! { i64, i128, 64, signed }
227226
int_impl! { i64, i64, u64, 64, 63, -9223372036854775808, 9223372036854775807, 12,
228227
"0xaa00000000006e1", "0x6e10aa", "0x1234567890123456", "0x5634129078563412",
229228
"0x6a2c48091e6a2c48", "[0x56, 0x34, 0x12, 0x90, 0x78, 0x56, 0x34, 0x12]",
230229
"[0x12, 0x34, 0x56, 0x78, 0x90, 0x12, 0x34, 0x56]", "", "" }
230+
widening_impl! { i64, i128, 64, signed }
231231
}
232232

233233
#[lang = "i128"]
@@ -245,41 +245,41 @@ impl i128 {
245245
#[cfg(target_pointer_width = "16")]
246246
#[lang = "isize"]
247247
impl isize {
248-
widening_impl! { isize, i32, 16, signed }
249248
int_impl! { isize, i16, usize, 16, 15, -32768, 32767, 4, "-0x5ffd", "0x3a", "0x1234",
250249
"0x3412", "0x2c48", "[0x34, 0x12]", "[0x12, 0x34]",
251250
usize_isize_to_xe_bytes_doc!(), usize_isize_from_xe_bytes_doc!() }
251+
widening_impl! { isize, i32, 16, signed }
252252
}
253253

254254
#[cfg(target_pointer_width = "32")]
255255
#[lang = "isize"]
256256
impl isize {
257-
widening_impl! { isize, i64, 32, signed }
258257
int_impl! { isize, i32, usize, 32, 31, -2147483648, 2147483647, 8, "0x10000b3", "0xb301",
259258
"0x12345678", "0x78563412", "0x1e6a2c48", "[0x78, 0x56, 0x34, 0x12]",
260259
"[0x12, 0x34, 0x56, 0x78]",
261260
usize_isize_to_xe_bytes_doc!(), usize_isize_from_xe_bytes_doc!() }
261+
widening_impl! { isize, i64, 32, signed }
262262
}
263263

264264
#[cfg(target_pointer_width = "64")]
265265
#[lang = "isize"]
266266
impl isize {
267-
widening_impl! { isize, i128, 64, signed }
268267
int_impl! { isize, i64, usize, 64, 63, -9223372036854775808, 9223372036854775807,
269268
12, "0xaa00000000006e1", "0x6e10aa", "0x1234567890123456", "0x5634129078563412",
270-
"0x6a2c48091e6a2c48", "[0x56, 0x34, 0x12, 0x90, 0x78, 0x56, 0x34, 0x12]",
271-
"[0x12, 0x34, 0x56, 0x78, 0x90, 0x12, 0x34, 0x56]",
272-
usize_isize_to_xe_bytes_doc!(), usize_isize_from_xe_bytes_doc!() }
269+
"0x6a2c48091e6a2c48", "[0x56, 0x34, 0x12, 0x90, 0x78, 0x56, 0x34, 0x12]",
270+
"[0x12, 0x34, 0x56, 0x78, 0x90, 0x12, 0x34, 0x56]",
271+
usize_isize_to_xe_bytes_doc!(), usize_isize_from_xe_bytes_doc!() }
272+
widening_impl! { isize, i128, 64, signed }
273273
}
274274

275275
/// If 6th bit set ascii is upper case.
276276
const ASCII_CASE_MASK: u8 = 0b0010_0000;
277277

278278
#[lang = "u8"]
279279
impl u8 {
280-
widening_impl! { u8, u16, 8, unsigned }
281280
uint_impl! { u8, u8, i8, 8, 255, 2, "0x82", "0xa", "0x12", "0x12", "0x48", "[0x12]",
282281
"[0x12]", "", "" }
282+
widening_impl! { u8, u16, 8, unsigned }
283283

284284
/// Checks if the value is within the ASCII range.
285285
///
@@ -826,26 +826,26 @@ impl u8 {
826826

827827
#[lang = "u16"]
828828
impl u16 {
829-
widening_impl! { u16, u32, 16, unsigned }
830829
uint_impl! { u16, u16, i16, 16, 65535, 4, "0xa003", "0x3a", "0x1234", "0x3412", "0x2c48",
831830
"[0x34, 0x12]", "[0x12, 0x34]", "", "" }
831+
widening_impl! { u16, u32, 16, unsigned }
832832
}
833833

834834
#[lang = "u32"]
835835
impl u32 {
836-
widening_impl! { u32, u64, 32, unsigned }
837836
uint_impl! { u32, u32, i32, 32, 4294967295, 8, "0x10000b3", "0xb301", "0x12345678",
838837
"0x78563412", "0x1e6a2c48", "[0x78, 0x56, 0x34, 0x12]", "[0x12, 0x34, 0x56, 0x78]", "", "" }
838+
widening_impl! { u32, u64, 32, unsigned }
839839
}
840840

841841
#[lang = "u64"]
842842
impl u64 {
843-
widening_impl! { u64, u128, 64, unsigned }
844843
uint_impl! { u64, u64, i64, 64, 18446744073709551615, 12, "0xaa00000000006e1", "0x6e10aa",
845844
"0x1234567890123456", "0x5634129078563412", "0x6a2c48091e6a2c48",
846845
"[0x56, 0x34, 0x12, 0x90, 0x78, 0x56, 0x34, 0x12]",
847846
"[0x12, 0x34, 0x56, 0x78, 0x90, 0x12, 0x34, 0x56]",
848847
"", ""}
848+
widening_impl! { u64, u128, 64, unsigned }
849849
}
850850

851851
#[lang = "u128"]
@@ -863,29 +863,29 @@ impl u128 {
863863
#[cfg(target_pointer_width = "16")]
864864
#[lang = "usize"]
865865
impl usize {
866-
widening_impl! { usize, u32, 16, unsigned }
867866
uint_impl! { usize, u16, isize, 16, 65535, 4, "0xa003", "0x3a", "0x1234", "0x3412", "0x2c48",
868867
"[0x34, 0x12]", "[0x12, 0x34]",
869868
usize_isize_to_xe_bytes_doc!(), usize_isize_from_xe_bytes_doc!() }
869+
widening_impl! { usize, u32, 16, unsigned }
870870
}
871871
#[cfg(target_pointer_width = "32")]
872872
#[lang = "usize"]
873873
impl usize {
874-
widening_impl! { usize, u64, 32, unsigned }
875874
uint_impl! { usize, u32, isize, 32, 4294967295, 8, "0x10000b3", "0xb301", "0x12345678",
876875
"0x78563412", "0x1e6a2c48", "[0x78, 0x56, 0x34, 0x12]", "[0x12, 0x34, 0x56, 0x78]",
877876
usize_isize_to_xe_bytes_doc!(), usize_isize_from_xe_bytes_doc!() }
877+
widening_impl! { usize, u64, 32, unsigned }
878878
}
879879

880880
#[cfg(target_pointer_width = "64")]
881881
#[lang = "usize"]
882882
impl usize {
883-
widening_impl! { usize, u128, 64, unsigned }
884883
uint_impl! { usize, u64, isize, 64, 18446744073709551615, 12, "0xaa00000000006e1", "0x6e10aa",
885884
"0x1234567890123456", "0x5634129078563412", "0x6a2c48091e6a2c48",
886885
"[0x56, 0x34, 0x12, 0x90, 0x78, 0x56, 0x34, 0x12]",
887-
"[0x12, 0x34, 0x56, 0x78, 0x90, 0x12, 0x34, 0x56]",
886+
"[0x12, 0x34, 0x56, 0x78, 0x90, 0x12, 0x34, 0x56]",
888887
usize_isize_to_xe_bytes_doc!(), usize_isize_from_xe_bytes_doc!() }
888+
widening_impl! { usize, u128, 64, unsigned }
889889
}
890890

891891
/// A classification of floating point numbers.

0 commit comments

Comments
 (0)