Skip to content

Commit ff98cb6

Browse files
committed
Remove unused argument from resolve_crate
1 parent f59198a commit ff98cb6

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

compiler/rustc_metadata/src/creader.rs

+6-9
Original file line numberDiff line numberDiff line change
@@ -511,12 +511,9 @@ impl<'a> CrateLoader<'a> {
511511
name: Symbol,
512512
span: Span,
513513
dep_kind: CrateDepKind,
514-
dep: Option<(&'b CratePaths, &'b CrateDep)>,
515514
) -> CrateNum {
516-
if dep.is_none() {
517-
self.used_extern_options.insert(name);
518-
}
519-
self.maybe_resolve_crate(name, dep_kind, dep).unwrap_or_else(|err| {
515+
self.used_extern_options.insert(name);
516+
self.maybe_resolve_crate(name, dep_kind, None).unwrap_or_else(|err| {
520517
let missing_core =
521518
self.maybe_resolve_crate(sym::core, CrateDepKind::Explicit, None).is_err();
522519
err.report(&self.sess, span, missing_core)
@@ -753,7 +750,7 @@ impl<'a> CrateLoader<'a> {
753750
};
754751
info!("panic runtime not found -- loading {}", name);
755752

756-
let cnum = self.resolve_crate(name, DUMMY_SP, CrateDepKind::Implicit, None);
753+
let cnum = self.resolve_crate(name, DUMMY_SP, CrateDepKind::Implicit);
757754
let data = self.cstore.get_crate_data(cnum);
758755

759756
// Sanity check the loaded crate to ensure it is indeed a panic runtime
@@ -793,7 +790,7 @@ impl<'a> CrateLoader<'a> {
793790
);
794791
}
795792

796-
let cnum = self.resolve_crate(name, DUMMY_SP, CrateDepKind::Implicit, None);
793+
let cnum = self.resolve_crate(name, DUMMY_SP, CrateDepKind::Implicit);
797794
let data = self.cstore.get_crate_data(cnum);
798795

799796
// Sanity check the loaded crate to ensure it is indeed a profiler runtime
@@ -1013,7 +1010,7 @@ impl<'a> CrateLoader<'a> {
10131010
CrateDepKind::Explicit
10141011
};
10151012

1016-
let cnum = self.resolve_crate(name, item.span, dep_kind, None);
1013+
let cnum = self.resolve_crate(name, item.span, dep_kind);
10171014

10181015
let path_len = definitions.def_path(def_id).data.len();
10191016
self.update_extern_crate(
@@ -1032,7 +1029,7 @@ impl<'a> CrateLoader<'a> {
10321029
}
10331030

10341031
pub fn process_path_extern(&mut self, name: Symbol, span: Span) -> CrateNum {
1035-
let cnum = self.resolve_crate(name, span, CrateDepKind::Explicit, None);
1032+
let cnum = self.resolve_crate(name, span, CrateDepKind::Explicit);
10361033

10371034
self.update_extern_crate(
10381035
cnum,

0 commit comments

Comments
 (0)