Move if_not_empty() to calling module

Author: djc

src/config.rs

@@ -291,7 +291,7 @@ impl<'a> Cfg<'a> {
         let env_override = process
             .var("RUSTUP_TOOLCHAIN")
             .ok()
-            .and_then(utils::if_not_empty)
+            .and_then(if_not_empty)
             .map(ResolvableLocalToolchainName::try_from)
             .transpose()?
             .map(|t| t.resolve(&default_host_triple))
@@ -307,7 +307,7 @@ impl<'a> Cfg<'a> {
                 process
                     .var("RUSTUP_DIST_ROOT")
                     .ok()
-                    .and_then(utils::if_not_empty)
+                    .and_then(if_not_empty)
                     .inspect(|url| trace!("`RUSTUP_DIST_ROOT` has been set to `{url}`"))
                     .map_or(Cow::Borrowed(dist::DEFAULT_DIST_ROOT), Cow::Owned)
                     .as_ref()
@@ -1000,6 +1000,14 @@ fn get_default_host_triple(s: &Settings, process: &Process) -> dist::TargetTripl
         .unwrap_or_else(|| dist::TargetTriple::from_host_or_build(process))
 }
 
+fn if_not_empty<S: PartialEq<str>>(s: S) -> Option<S> {
+    if s == *"" {
+        None
+    } else {
+        Some(s)
+    }
+}
+
 fn no_toolchain_error(process: &Process) -> anyhow::Error {
     RustupError::ToolchainNotSelected(process.name().unwrap_or_else(|| "Rust".into())).into()
 }

src/utils/raw.rs

@@ -65,14 +65,6 @@ pub(crate) fn random_string(length: usize) -> String {
         .collect()
 }
 
-pub(crate) fn if_not_empty<S: PartialEq<str>>(s: S) -> Option<S> {
-    if s == *"" {
-        None
-    } else {
-        Some(s)
-    }
-}
-
 pub fn write_file(path: &Path, contents: &str) -> io::Result<()> {
     let mut file = fs::OpenOptions::new()
         .write(true)

src/utils/utils.rs

@@ -17,7 +17,7 @@ use crate::utils::raw;
 
 #[cfg(not(windows))]
 pub(crate) use crate::utils::utils::raw::find_cmd;
-pub(crate) use crate::utils::utils::raw::{if_not_empty, is_directory};
+pub(crate) use crate::utils::utils::raw::is_directory;
 
 pub use crate::utils::utils::raw::{is_file, path_exists};