Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make niches into nices #18973

Merged
merged 4 commits into from
Jan 25, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 84 additions & 1 deletion crates/ide/src/hover/render.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1082,7 +1082,19 @@ fn render_memory_layout(

if config.niches {
if let Some(niches) = layout.niches() {
format_to!(label, "niches = {niches}, ");
if niches > 1024 {
if niches.is_power_of_two() {
format_to!(label, "niches = 2{}, ", pwr2_to_exponent(niches));
} else if is_pwr2plus1(niches) {
format_to!(label, "niches = 2{} + 1, ", pwr2_to_exponent(niches - 1));
} else if is_pwr2minus1(niches) {
format_to!(label, "niches = 2{} - 1, ", pwr2_to_exponent(niches + 1));
} else {
format_to!(label, "niches = a lot, ");
}
} else {
format_to!(label, "niches = {niches}, ");
}
}
}
label.pop(); // ' '
Expand Down Expand Up @@ -1210,3 +1222,74 @@ fn render_dyn_compatibility(
}
}
}

fn is_pwr2minus1(val: u128) -> bool {
val == u128::MAX || (val + 1).is_power_of_two()
}

fn is_pwr2plus1(val: u128) -> bool {
val != 0 && (val - 1).is_power_of_two()
}

/// Formats a power of two as an exponent of two, i.e. 16 => ⁴. Note that `num` MUST be a power
/// of 2, or this function will panic.
fn pwr2_to_exponent(num: u128) -> String {
const DIGITS: [char; 10] = ['⁰', '¹', '²', '³', '⁴', '⁵', '⁶', '⁷', '⁸', '⁹'];
assert_eq!(num.count_ones(), 1);
num.trailing_zeros()
.to_string()
.chars()
.map(|c| c.to_digit(10).unwrap() as usize)
.map(|idx| DIGITS[idx])
.collect::<String>()
}

#[cfg(test)]
mod tests {
use super::*;

const TESTERS: [u128; 10] = [0, 1, 2, 3, 4, 255, 256, 257, u128::MAX - 1, u128::MAX];

#[test]
fn test_is_pwr2minus1() {
const OUTCOMES: [bool; 10] =
[true, true, false, true, false, true, false, false, false, true];
for (test, expected) in TESTERS.iter().zip(OUTCOMES) {
let actual = is_pwr2minus1(*test);
assert_eq!(actual, expected, "is_pwr2minu1({test}) gave {actual}, expected {expected}");
}
}

#[test]
fn test_is_pwr2plus1() {
const OUTCOMES: [bool; 10] =
[false, false, true, true, false, false, false, true, false, false];
for (test, expected) in TESTERS.iter().zip(OUTCOMES) {
let actual = is_pwr2plus1(*test);
assert_eq!(actual, expected, "is_pwr2plus1({test}) gave {actual}, expected {expected}");
}
}

#[test]
fn test_pwr2_to_exponent() {
const TESTERS: [u128; 9] = [
1,
2,
4,
8,
16,
9223372036854775808,
18446744073709551616,
36893488147419103232,
170141183460469231731687303715884105728,
];
const OUTCOMES: [&str; 9] = ["⁰", "¹", "²", "³", "⁴", "⁶³", "⁶⁴", "⁶⁵", "¹²⁷"];
for (test, expected) in TESTERS.iter().zip(OUTCOMES) {
let actual = pwr2_to_exponent(*test);
assert_eq!(
actual, expected,
"pwr2_to_exponent({test}) returned {actual}, expected {expected}",
);
}
}
}
2 changes: 1 addition & 1 deletion crates/ide/src/hover/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1357,7 +1357,7 @@ fn hover_enum_limit() {
---
size = 12 (0xC), align = 4, niches = 4294967288
size = 12 (0xC), align = 4, niches = a lot
"#]],
);
}
Expand Down
Loading