Skip to content

Commit 57c6235

Browse files
author
Falk Hüffner
committed
Cosmetic fixes.
1 parent d53c483 commit 57c6235

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

library/core/benches/num/int_log/mod.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![feature(int_log)]
2-
31
use rand::Rng;
42
use test::{black_box, Bencher};
53

library/core/src/num/int_log10.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,27 @@ mod unchecked {
77
// in the bits above the low 8 bits.
88

99
// Adding c1 to val gives 10 in the top bits for val < 10, 11 for val >= 10
10-
let c1 = 0b11_00000000 - 10; // 758
10+
const C1: u32 = 0b11_00000000 - 10; // 758
1111
// Adding c2 to val gives 01 in the top bits for val < 100, 10 for val >= 100
12-
let c2 = 0b10_00000000 - 100; // 412
12+
const C2: u32 = 0b10_00000000 - 100; // 412
1313

1414
// Value of top bits:
1515
// +c1 +c2 1&2
1616
// 0..=9 10 01 00 = 0
1717
// 10..=99 11 01 01 = 1
1818
// 100..=255 11 10 10 = 2
19-
((val + c1) & (val + c2)) >> 8
19+
((val + C1) & (val + C2)) >> 8
2020
}
2121

2222
// 0 < val < 100_000
2323
const fn less_than_5(val: u32) -> u32 {
2424
// Similar to u8, when adding one of these constants to val,
2525
// we get two possible bit patterns above the low 17 bits,
2626
// depending on whether val is below or above the threshold.
27-
let c1 = 0b011_00000000000000000 - 10; // 393206
28-
let c2 = 0b100_00000000000000000 - 100; // 524188
29-
let c3 = 0b111_00000000000000000 - 1000; // 916504
30-
let c4 = 0b100_00000000000000000 - 10000; // 514288
27+
const C1: u32 = 0b011_00000000000000000 - 10; // 393206
28+
const C2: u32 = 0b100_00000000000000000 - 100; // 524188
29+
const C3: u32 = 0b111_00000000000000000 - 1000; // 916504
30+
const C4: u32 = 0b100_00000000000000000 - 10000; // 514288
3131

3232
// Value of top bits:
3333
// +c1 +c2 1&2 +c3 +c4 3&4 ^
@@ -36,7 +36,7 @@ mod unchecked {
3636
// 100..=999 011 100 000 110 011 010 010 = 2
3737
// 1000..=9999 011 100 000 111 011 011 011 = 3
3838
// 10000..=99999 011 100 000 111 100 100 100 = 4
39-
(((val + c1) & (val + c2)) ^ ((val + c3) & (val + c4))) >> 17
39+
(((val + C1) & (val + C2)) ^ ((val + C3) & (val + C4))) >> 17
4040
}
4141

4242
// 0 < val <= u16::MAX

0 commit comments

Comments
 (0)