Restyle just-changed and related code for clarity

Eliah Kagan committed 2 years ago

Commit 98b3d901 parent 9eaa0d92 files · +14 −16Browse files

Unified · Split

2 files

gix-path/src/env/git.rs +7 −9
gix-path/src/env/mod.rs +7 −7

-use std::path::PathBuf;
+use std::ffi::OsString;
-use std::{
+use std::path::{Path, PathBuf};
-    ffi::OsString,
+use std::process::{Command, Stdio};
-    path::Path,
-    process::{Command, Stdio},
-};
 use bstr::{BStr, BString, ByteSlice};
+use once_cell::sync::Lazy;
 /// Other places to find Git in.
 #[cfg(windows)]
-pub(super) static ALTERNATIVE_LOCATIONS: once_cell::sync::Lazy<Vec<OsString>> = once_cell::sync::Lazy::new(|| {
+pub(super) static ALTERNATIVE_LOCATIONS: Lazy<Vec<OsString>> = Lazy::new(|| {
     vec![
         "C:/Program Files/Git/mingw64/bin".into(),
         "C:/Program Files (x86)/Git/mingw32/bin".into(),
 pub(super) static EXE_NAME: &str = "git";
 /// Invoke the git executable in PATH to obtain the origin configuration, which is cached and returned.
-pub(super) static EXE_INFO: once_cell::sync::Lazy<Option<BString>> = once_cell::sync::Lazy::new(|| {
+pub(super) static EXE_INFO: Lazy<Option<BString>> = Lazy::new(|| {
     let git_cmd = |executable: PathBuf| {
         let mut cmd = Command::new(executable);
         cmd.args(["config", "-l", "--show-origin"])
 /// if no `git` executable was found or there were other errors during execution.
 pub(super) fn install_config_path() -> Option<&'static BStr> {
     let _span = gix_trace::detail!("gix_path::git::install_config_path()");
-    static PATH: once_cell::sync::Lazy<Option<BString>> = once_cell::sync::Lazy::new(|| {
+    static PATH: Lazy<Option<BString>> = Lazy::new(|| {
         // Shortcut: in Msys shells this variable is set which allows to deduce the installation directory,
         // so we can save the `git` invocation.
         #[cfg(windows)]

gix-path/src/env/mod.rs+7−7

-use std::{
+use std::ffi::OsString;
-    ffi::OsString,
+use std::path::{Path, PathBuf};
-    path::{Path, PathBuf},
-};
-use crate::env::git::EXE_NAME;
 use bstr::{BString, ByteSlice};
+use once_cell::sync::Lazy;
+use crate::env::git::EXE_NAME;
 mod git;
     if cfg!(windows) {
         /// The path to the Git executable as located in the `PATH` or in other locations that it's known to be installed to.
         /// It's `None` if environment variables couldn't be read or if no executable could be found.
-        static EXECUTABLE_PATH: once_cell::sync::Lazy<Option<PathBuf>> = once_cell::sync::Lazy::new(|| {
+        static EXECUTABLE_PATH: Lazy<Option<PathBuf>> = Lazy::new(|| {
             std::env::split_paths(&std::env::var_os("PATH")?)
                 .chain(git::ALTERNATIVE_LOCATIONS.iter().map(Into::into))
                 .find_map(|prefix| {
 /// wasn't built with a well-known directory structure or environment.
 pub fn system_prefix() -> Option<&'static Path> {
     if cfg!(windows) {
-        static PREFIX: once_cell::sync::Lazy<Option<PathBuf>> = once_cell::sync::Lazy::new(|| {
+        static PREFIX: Lazy<Option<PathBuf>> = Lazy::new(|| {
             if let Some(root) = std::env::var_os("EXEPATH").map(PathBuf::from) {
                 for candidate in ["mingw64", "mingw32"] {
                     let candidate = root.join(candidate);