From ec19bb72d56be25f7cfb795aa61458b029794def Mon Sep 17 00:00:00 2001 From: electricboogie <32370782+electricboogie@users.noreply.github.com> Date: Tue, 27 Apr 2021 15:39:20 -0500 Subject: [PATCH] Modified to remove 2 unnecessary consts now that we use std::env::temp_dir --- src/uu/sort/src/sort.rs | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/uu/sort/src/sort.rs b/src/uu/sort/src/sort.rs index b6610be64..2c67f1063 100644 --- a/src/uu/sort/src/sort.rs +++ b/src/uu/sort/src/sort.rs @@ -91,12 +91,6 @@ static THOUSANDS_SEP: char = ','; static NEGATIVE: 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; #[derive(Eq, Ord, PartialEq, PartialOrd, Clone, Copy)] @@ -179,7 +173,7 @@ impl Default for GlobalSettings { threads: String::new(), zero_terminated: false, buffer_size: DEFAULT_BUF_SIZE, - tmp_dir: PathBuf::from(DEFAULT_TMPDIR), + tmp_dir: PathBuf::new(), ext_sort: false, } } @@ -1064,7 +1058,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { let result = matches .value_of(OPT_TMP_DIR) .map(String::from) - .unwrap_or(DEFAULT_TMPDIR.to_owned()); + .unwrap_or(format!("{}", env::temp_dir().display())); settings.tmp_dir = PathBuf::from(result); settings.ext_sort = true; } else {