Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/project-model/src/sysroot.rs')
| -rw-r--r-- | crates/project-model/src/sysroot.rs | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/crates/project-model/src/sysroot.rs b/crates/project-model/src/sysroot.rs index 13812e96fe..c92dc9f6a6 100644 --- a/crates/project-model/src/sysroot.rs +++ b/crates/project-model/src/sysroot.rs @@ -6,16 +6,16 @@ use std::{env, fs, ops::Not, path::Path, process::Command}; -use anyhow::{format_err, Result}; +use anyhow::{Result, format_err}; use itertools::Itertools; use paths::{AbsPath, AbsPathBuf, Utf8PathBuf}; use rustc_hash::FxHashMap; use stdx::format_to; -use toolchain::{probe_for_binary, Tool}; +use toolchain::{Tool, probe_for_binary}; use crate::{ - cargo_workspace::CargoMetadataConfig, utf8_stdout, CargoWorkspace, ManifestPath, ProjectJson, - RustSourceWorkspaceConfig, + CargoWorkspace, ManifestPath, ProjectJson, RustSourceWorkspaceConfig, + cargo_workspace::CargoMetadataConfig, utf8_stdout, }; #[derive(Debug, Clone, PartialEq, Eq)] @@ -424,21 +424,13 @@ fn get_rustc_src(sysroot_path: &AbsPath) -> Option<ManifestPath> { let rustc_src = sysroot_path.join("lib/rustlib/rustc-src/rust/compiler/rustc/Cargo.toml"); let rustc_src = ManifestPath::try_from(rustc_src).ok()?; tracing::debug!("checking for rustc source code: {rustc_src}"); - if fs::metadata(&rustc_src).is_ok() { - Some(rustc_src) - } else { - None - } + if fs::metadata(&rustc_src).is_ok() { Some(rustc_src) } else { None } } fn get_rust_lib_src(sysroot_path: &AbsPath) -> Option<AbsPathBuf> { let rust_lib_src = sysroot_path.join("lib/rustlib/src/rust/library"); tracing::debug!("checking sysroot library: {rust_lib_src}"); - if fs::metadata(&rust_lib_src).is_ok() { - Some(rust_lib_src) - } else { - None - } + if fs::metadata(&rust_lib_src).is_ok() { Some(rust_lib_src) } else { None } } // FIXME: Remove this, that will bump our project MSRV to 1.82 |