diff options
| author | bjorn3 <bjorn3@users.noreply.github.com> | 2021-08-31 18:31:29 +0200 |
|---|---|---|
| committer | bjorn3 <bjorn3@users.noreply.github.com> | 2021-09-08 18:25:46 +0200 |
| commit | a4a22f07d79b1a2adc6e59811ebfbcd8b2cf21a4 (patch) | |
| tree | 5e9b0f1fc9a84c9638c7cf5a73eb1dbf2ad98aaf | |
| parent | 434cb437b55d61bcb54a01921de7ac752e6dee13 (diff) | |
| download | rust-a4a22f07d79b1a2adc6e59811ebfbcd8b2cf21a4.tar.gz rust-a4a22f07d79b1a2adc6e59811ebfbcd8b2cf21a4.zip | |
Doc comments
| -rw-r--r-- | compiler/rustc_session/src/filesearch.rs | 12 | ||||
| -rw-r--r-- | compiler/rustc_session/src/search_paths.rs | 22 |
2 files changed, 17 insertions, 17 deletions
diff --git a/compiler/rustc_session/src/filesearch.rs b/compiler/rustc_session/src/filesearch.rs index 6fe6a555f1a..a9999e1d921 100644 --- a/compiler/rustc_session/src/filesearch.rs +++ b/compiler/rustc_session/src/filesearch.rs @@ -1,3 +1,5 @@ +//! A module for searching for libraries + pub use self::FileMatch::*; use std::env; @@ -14,8 +16,6 @@ pub enum FileMatch { FileDoesntMatch, } -// A module for searching for libraries - #[derive(Clone)] pub struct FileSearch<'a> { sysroot: &'a Path, @@ -83,12 +83,12 @@ impl<'a> FileSearch<'a> { FileSearch { sysroot, triple, search_paths, tlib_path, kind } } - // Returns just the directories within the search paths. + /// Returns just the directories within the search paths. pub fn search_path_dirs(&self) -> Vec<PathBuf> { self.search_paths().map(|sp| sp.dir.to_path_buf()).collect() } - // Returns a list of directories where target-specific tool binaries are located. + /// Returns a list of directories where target-specific tool binaries are located. pub fn get_tools_search_paths(&self, self_contained: bool) -> Vec<PathBuf> { let rustlib_path = rustc_target::target_rustlib_path(self.sysroot, &self.triple); let p = std::array::IntoIter::new([ @@ -107,8 +107,8 @@ pub fn make_target_lib_path(sysroot: &Path, target_triple: &str) -> PathBuf { .collect::<PathBuf>() } -// This function checks if sysroot is found using env::args().next(), and if it -// is not found, uses env::current_exe() to imply sysroot. +/// This function checks if sysroot is found using env::args().next(), and if it +/// is not found, uses env::current_exe() to imply sysroot. pub fn get_or_default_sysroot() -> PathBuf { // Follow symlinks. If the resolved path is relative, make it absolute. fn canonicalize(path: PathBuf) -> PathBuf { diff --git a/compiler/rustc_session/src/search_paths.rs b/compiler/rustc_session/src/search_paths.rs index 83b737a73b1..acb6c735e05 100644 --- a/compiler/rustc_session/src/search_paths.rs +++ b/compiler/rustc_session/src/search_paths.rs @@ -9,17 +9,17 @@ pub struct SearchPath { pub files: Vec<SearchPathFile>, } -// The obvious implementation of `SearchPath::files` is a `Vec<PathBuf>`. But -// it is searched repeatedly by `find_library_crate`, and the searches involve -// checking the prefix and suffix of the filename of each `PathBuf`. This is -// doable, but very slow, because it involves calls to `file_name` and -// `extension` that are themselves slow. -// -// This type augments the `PathBuf` with an `Option<String>` containing the -// `PathBuf`'s filename. The prefix and suffix checking is much faster on the -// `Option<String>` than the `PathBuf`. (It's an `Option` because -// `Path::file_name` can fail; if that happens then all subsequent checking -// will also fail, which is fine.) +/// The obvious implementation of `SearchPath::files` is a `Vec<PathBuf>`. But +/// it is searched repeatedly by `find_library_crate`, and the searches involve +/// checking the prefix and suffix of the filename of each `PathBuf`. This is +/// doable, but very slow, because it involves calls to `file_name` and +/// `extension` that are themselves slow. +/// +/// This type augments the `PathBuf` with an `Option<String>` containing the +/// `PathBuf`'s filename. The prefix and suffix checking is much faster on the +/// `Option<String>` than the `PathBuf`. (It's an `Option` because +/// `Path::file_name` can fail; if that happens then all subsequent checking +/// will also fail, which is fine.) #[derive(Clone, Debug)] pub struct SearchPathFile { pub path: PathBuf, |
