Skip to content

Commit a63cfff

Browse files
committed
sort: remove nix from dep
1 parent db25551 commit a63cfff

4 files changed

Lines changed: 3 additions & 22 deletions

File tree

Cargo.lock

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

fuzz/Cargo.lock

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/uu/sort/Cargo.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,6 @@ rustix = { workspace = true, features = ["process"] }
5353
[target.'cfg(not(any(target_os = "redox", target_os = "wasi")))'.dependencies]
5454
ctrlc = { workspace = true }
5555

56-
[target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies]
57-
nix = { workspace = true }
58-
5956
[target.'cfg(unix)'.dependencies]
6057
libc = { workspace = true }
6158

src/uu/sort/src/buffer_hint.rs

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -104,24 +104,10 @@ fn physical_memory_bytes() -> Option<u128> {
104104
}
105105
}
106106

107-
#[cfg(all(
108-
target_family = "unix",
109-
not(target_os = "redox"),
110-
any(target_os = "linux", target_os = "android")
111-
))]
107+
#[cfg(any(target_os = "linux", target_os = "android"))]
112108
fn physical_memory_bytes_unix() -> Option<u128> {
113-
use nix::unistd::{SysconfVar, sysconf};
114-
115-
let pages = match sysconf(SysconfVar::_PHYS_PAGES) {
116-
Ok(Some(pages)) if pages > 0 => u128::try_from(pages).ok()?,
117-
_ => return None,
118-
};
119-
120-
let page_size = match sysconf(SysconfVar::PAGE_SIZE) {
121-
Ok(Some(page_size)) if page_size > 0 => u128::try_from(page_size).ok()?,
122-
_ => return None,
123-
};
124-
109+
let page_size = rustix::param::page_size() as u128;
110+
let pages = rustix::system::sysinfo().totalram as u128;
125111
Some(pages.saturating_mul(page_size))
126112
}
127113

0 commit comments

Comments
 (0)