Skip to content

lscpu: Use parse_size from uucore #412

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.

Sign up for GitHub

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

Merged
cakebaker merged 1 commit into from
Oct 12, 2025
Merged

lscpu: Use parse_size from uucore #412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 41 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/uu/lscpu/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ path = "src/main.rs"
[dependencies]
regex = { workspace = true }
sysinfo = { workspace = true }
uucore = { workspace = true }
uucore = { workspace = true, features = ["parser"] }
clap = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
21 changes: 2 additions & 19 deletions src/uu/lscpu/src/sysfs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
// file that was distributed with this source code.

use std::{collections::HashSet, fs, path::PathBuf};
use uucore::parser::parse_size;

pub struct CpuVulnerability {
pub name: String,
Expand Down Expand Up @@ -93,25 +94,7 @@ impl CacheSize {
}

fn parse(s: &str) -> Self {
// Yes, this will break if we ever reach a point where caches exceed terabytes in size...
const EXPONENTS: [(char, u32); 4] = [('K', 1), ('M', 2), ('G', 3), ('T', 4)];

// If we only have numbers, treat it as a raw amount of bytes and parse as-is
if s.chars().all(char::is_numeric) {
return Self(s.parse::<u64>().expect("Could not parse cache size"));
};

for (suffix, exponent) in EXPONENTS {
if s.ends_with(suffix) {
let nums = s.strip_suffix(suffix).unwrap();
let value = nums.parse::<u64>().expect("Could not parse cache size");
let multiplier = 1024_u64.pow(exponent);

return Self(value * multiplier);
}
}

panic!("No known suffix in cache size string");
Self(parse_size::parse_size_u64(s).expect("Could not parse cache size"))
}

pub fn size_bytes(&self) -> u64 {
Expand Down