bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Remove root field from CrateLocator

Browse source
This commit is contained in:
bjorn3 2021-08-31 16:50:00 +02:00
parent 3a8c457916
commit b3f850a50c
2 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compiler/rustc_metadata/src/creader.rs
View file

@ -555,7 +555,6 @@ impl<'a> CrateLoader<'a> {
extra_filename, extra_filename,
false, // is_host false, // is_host
path_kind, path_kind,
root,
); );
match self.load(&mut locator)? { match self.load(&mut locator)? {
@ -564,7 +563,7 @@ impl<'a> CrateLoader<'a> {
dep_kind = CrateDepKind::MacrosOnly; dep_kind = CrateDepKind::MacrosOnly;
match self.load_proc_macro(&mut locator, path_kind, host_hash)? { match self.load_proc_macro(&mut locator, path_kind, host_hash)? {
Some(res) => res, Some(res) => res,
None => return Err(locator.into_error()), None => return Err(locator.into_error(root.cloned())),
} }
} }
} }

10
compiler/rustc_metadata/src/locator.rs
View file

@ -252,7 +252,6 @@ crate struct CrateLocator<'a> {
pub target: &'a Target, pub target: &'a Target,
pub triple: TargetTriple, pub triple: TargetTriple,
pub filesearch: FileSearch<'a>, pub filesearch: FileSearch<'a>,
root: Option<&'a CratePaths>,
pub is_proc_macro: bool, pub is_proc_macro: bool,
// Mutable in-progress state or output. // Mutable in-progress state or output.
@ -301,7 +300,6 @@ impl<'a> CrateLocator<'a> {
extra_filename: Option<&'a str>, extra_filename: Option<&'a str>,
is_host: bool, is_host: bool,
path_kind: PathKind, path_kind: PathKind,
root: Option<&'a CratePaths>,
) -> CrateLocator<'a> { ) -> CrateLocator<'a> {
// The all loop is because `--crate-type=rlib --crate-type=rlib` is // The all loop is because `--crate-type=rlib --crate-type=rlib` is
// legal and produces both inside this type. // legal and produces both inside this type.
@ -344,7 +342,6 @@ impl<'a> CrateLocator<'a> {
} else { } else {
sess.target_filesearch(path_kind) sess.target_filesearch(path_kind)
}, },
root,
is_proc_macro: false, is_proc_macro: false,
rejected_via_hash: Vec::new(), rejected_via_hash: Vec::new(),
rejected_via_triple: Vec::new(), rejected_via_triple: Vec::new(),
@ -709,10 +706,10 @@ impl<'a> CrateLocator<'a> {
Ok(self.extract_lib(rlibs, rmetas, dylibs)?.map(|(_, lib)| lib)) Ok(self.extract_lib(rlibs, rmetas, dylibs)?.map(|(_, lib)| lib))
} }
crate fn into_error(self) -> CrateError { crate fn into_error(self, root: Option<CratePaths>) -> CrateError {
CrateError::LocatorCombined(CombinedLocatorError { CrateError::LocatorCombined(CombinedLocatorError {
crate_name: self.crate_name, crate_name: self.crate_name,
root: self.root.cloned(), root,
triple: self.triple, triple: self.triple,
dll_prefix: self.target.dll_prefix.clone(), dll_prefix: self.target.dll_prefix.clone(),
dll_suffix: self.target.dll_suffix.clone(), dll_suffix: self.target.dll_suffix.clone(),
@ -807,7 +804,6 @@ fn find_plugin_registrar_impl<'a>(
None, // extra_filename None, // extra_filename
true, // is_host true, // is_host
PathKind::Crate, PathKind::Crate,
None, // root
); );
match locator.maybe_load_library_crate()? { match locator.maybe_load_library_crate()? {
@ -815,7 +811,7 @@ fn find_plugin_registrar_impl<'a>(
Some(dylib) => Ok(dylib.0), Some(dylib) => Ok(dylib.0),
None => Err(CrateError::NonDylibPlugin(name)), None => Err(CrateError::NonDylibPlugin(name)),
}, },
None => Err(locator.into_error()), None => Err(locator.into_error(None)),
} }
} }