mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove constant parameter from CrateLocator::new

Browse Source
This commit is contained in:
Nilstrieb 2024-06-06 21:50:24 +02:00
parent e1ac0fa95b
commit 3a02cdb54f
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
compiler/rustc_metadata/src/creader.rs
View File

@ -581,7 +581,6 @@ impl<'a, 'tcx> CrateLoader<'a, 'tcx> {
self.tcx.crate_types().iter().all(|c| *c == CrateType::Rlib), self.tcx.crate_types().iter().all(|c| *c == CrateType::Rlib),
hash, hash,
extra_filename, extra_filename,
false, // is_host
path_kind, path_kind,
); );

16
compiler/rustc_metadata/src/locator.rs
View File

@ -222,7 +222,6 @@ use rustc_data_structures::owned_slice::slice_owned;
use rustc_data_structures::svh::Svh; use rustc_data_structures::svh::Svh;
use rustc_errors::{DiagArgValue, IntoDiagArg}; use rustc_errors::{DiagArgValue, IntoDiagArg};
use rustc_fs_util::try_canonicalize; use rustc_fs_util::try_canonicalize;
use rustc_session::config;
use rustc_session::cstore::CrateSource; use rustc_session::cstore::CrateSource;
use rustc_session::filesearch::FileSearch; use rustc_session::filesearch::FileSearch;
use rustc_session::search_paths::PathKind; use rustc_session::search_paths::PathKind;
@ -309,7 +308,6 @@ impl<'a> CrateLocator<'a> {
is_rlib: bool, is_rlib: bool,
hash: Option<Svh>, hash: Option<Svh>,
extra_filename: Option<&'a str>, extra_filename: Option<&'a str>,
is_host: bool,
path_kind: PathKind, path_kind: PathKind,
) -> CrateLocator<'a> { ) -> CrateLocator<'a> {
let needs_object_code = sess.opts.output_types.should_codegen(); let needs_object_code = sess.opts.output_types.should_codegen();
@ -340,17 +338,9 @@ impl<'a> CrateLocator<'a> {
}, },
hash, hash,
extra_filename, extra_filename,
target: if is_host { &sess.host } else { &sess.target }, target: &sess.target,
triple: if is_host { triple: sess.opts.target_triple.clone(),
TargetTriple::from_triple(config::host_triple()) filesearch: sess.target_filesearch(path_kind),
} else {
sess.opts.target_triple.clone()
},
filesearch: if is_host {
sess.host_filesearch(path_kind)
} else {
sess.target_filesearch(path_kind)
},
is_proc_macro: false, is_proc_macro: false,
crate_rejections: CrateRejections::default(), crate_rejections: CrateRejections::default(),
} }