From c2a5ec7d00052086f499ff20a34c36afc31520a1 Mon Sep 17 00:00:00 2001
From: hi-rustin <rustin.liu@gmail.com>
Date: Thu, 19 Aug 2021 11:38:19 +0800
Subject: [PATCH] Make all src functions and structs crate-private
Signed-off-by: hi-rustin <rustin.liu@gmail.com>
Fmt code
Signed-off-by: hi-rustin <rustin.liu@gmail.com>
---
src/config.rs | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/config.rs b/src/config.rs
index a4cce22eb3f..e15e04474ae 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -491,7 +491,11 @@ impl Cfg {
}
}
+<<<<<<< HEAD
pub(crate) fn which_binary(&self, path: &Path, binary: &str) -> Result<PathBuf> {
+=======
+ pub(crate) fn which_binary(&self, path: &Path, binary: &str) -> Result<Option<PathBuf>> {
+>>>>>>> 2fcb8beb (Make all src functions and structs crate-private)
let (toolchain, _) = self.find_or_install_override_toolchain_or_default(path)?;
Ok(toolchain.binary_file(binary))
}
@@ -1008,9 +1012,13 @@ impl Cfg {
}
pub(crate) fn resolve_toolchain(&self, name: &str) -> Result<String> {
+<<<<<<< HEAD
// remove trailing slashes in toolchain name
let normalized_name = name.trim_end_matches('/');
if let Ok(desc) = dist::PartialToolchainDesc::from_str(normalized_name) {
+=======
+ if let Ok(desc) = dist::PartialToolchainDesc::from_str(name) {
+>>>>>>> 2fcb8beb (Make all src functions and structs crate-private)
let host = self.get_default_host_triple()?;
Ok(desc.resolve(&host)?.to_string())
} else {