RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-29 12:07:46 +00:00
Code Issues Activity

Modified to remove 2 unnecessary consts now that we use std::env::temp_dir

Browse source
This commit is contained in:
electricboogie 2021-04-27 15:39:20 -05:00
parent f3ed5a100f
commit ec19bb72d5
1 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/uu/sort/src/sort.rs
View file

@ -91,12 +91,6 @@ static THOUSANDS_SEP: char = ',';
static NEGATIVE: char = '-'; static NEGATIVE: char = '-';
static POSITIVE: char = '+'; static POSITIVE: char = '+';
#[cfg(any(target_os = "windows",))]
static DEFAULT_TMPDIR: &str = r"%USERPROFILE%\AppData\Local\Temp";
#[cfg(not(any(target_os = "windows",)))]
static DEFAULT_TMPDIR: &str = r"/tmp";
static DEFAULT_BUF_SIZE: usize = std::usize::MAX; static DEFAULT_BUF_SIZE: usize = std::usize::MAX;
#[derive(Eq, Ord, PartialEq, PartialOrd, Clone, Copy)] #[derive(Eq, Ord, PartialEq, PartialOrd, Clone, Copy)]
@ -179,7 +173,7 @@ impl Default for GlobalSettings {
threads: String::new(), threads: String::new(),
zero_terminated: false, zero_terminated: false,
buffer_size: DEFAULT_BUF_SIZE, buffer_size: DEFAULT_BUF_SIZE,
tmp_dir: PathBuf::from(DEFAULT_TMPDIR), tmp_dir: PathBuf::new(),
ext_sort: false, ext_sort: false,
} }
} }
@ -1064,7 +1058,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
let result = matches let result = matches
.value_of(OPT_TMP_DIR) .value_of(OPT_TMP_DIR)
.map(String::from) .map(String::from)
.unwrap_or(DEFAULT_TMPDIR.to_owned()); .unwrap_or(format!("{}", env::temp_dir().display()));
settings.tmp_dir = PathBuf::from(result); settings.tmp_dir = PathBuf::from(result);
settings.ext_sort = true; settings.ext_sort = true;
} else { } else {