github-mirror/fish-shell
github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-04-01 09:25:13 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Remove some unnecessary widestrs

Browse Source
This commit is contained in:
ridiculousfish 2023-11-18 17:31:54 -08:00
parent f0eaa516c0
commit da646a38ba
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fish-rust/src/common.rs
View File

@ -1249,24 +1249,23 @@ pub fn should_suppress_stderr_for_tests() -> bool {
}
/// Format the specified size (in bytes, kilobytes, etc.) into the specified stringbuffer.
#[widestrs]
pub fn format_size(mut sz: i64) -> WString {
let mut result = WString::new();
const sz_names: [&wstr; 8] = ["kB"L, "MB"L, "GB"L, "TB"L, "PB"L, "EB"L, "ZB"L, "YB"L];
const sz_names: [&str; 8] = ["kB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"];
if sz < 0 {
result += "unknown"L;
result += "unknown";
} else if sz == 0 {
result += wgettext!("empty");
} else if sz < 1024 {
result += &sprintf!("%lldB"L, sz)[..];
result += &sprintf!("%lldB", sz)[..];
} else {
for (i, sz_name) in sz_names.iter().enumerate() {
if sz < (1024 * 1024) || i == sz_names.len() - 1 {
let isz = sz / 1024;
if isz > 9 {
result += &sprintf!("%ld%ls"L, isz, *sz_name)[..];
result += &sprintf!("%ld%ls", isz, *sz_name)[..];
} else {
result += &sprintf!("%.1f%ls"L, sz as f64 / 1024.0, *sz_name)[..];
result += &sprintf!("%.1f%ls", sz as f64 / 1024.0, *sz_name)[..];
}
break;
}

9
fish-rust/src/io.rs
View File

@ -664,7 +664,6 @@ impl IoChain {
/// Attempt to resolve a list of redirection specs to IOs, appending to 'this'.
/// \return true on success, false on error, in which case an error will have been printed.
#[widestrs]
pub fn append_from_specs(&mut self, specs: &RedirectionSpecList, pwd: &wstr) -> bool {
let mut have_error = false;
for spec in specs {
@ -703,15 +702,11 @@ impl IoChain {
if !md.is_dir() {
FLOGF!(
warning,
"Path '%ls' is not a directory"L,
"Path '%ls' is not a directory",
next
);
} else {
FLOGF!(
warning,
"Path '%ls' does not exist"L,
dname
);
FLOGF!(warning, "Path '%ls' does not exist", dname);
}
break;
}