@@ -511,12 +511,9 @@ impl<'a> CrateLoader<'a> {
511
511
name : Symbol ,
512
512
span : Span ,
513
513
dep_kind : CrateDepKind ,
514
- dep : Option < ( & ' b CratePaths , & ' b CrateDep ) > ,
515
514
) -> 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| {
520
517
let missing_core =
521
518
self . maybe_resolve_crate ( sym:: core, CrateDepKind :: Explicit , None ) . is_err ( ) ;
522
519
err. report ( & self . sess , span, missing_core)
@@ -753,7 +750,7 @@ impl<'a> CrateLoader<'a> {
753
750
} ;
754
751
info ! ( "panic runtime not found -- loading {}" , name) ;
755
752
756
- let cnum = self . resolve_crate ( name, DUMMY_SP , CrateDepKind :: Implicit , None ) ;
753
+ let cnum = self . resolve_crate ( name, DUMMY_SP , CrateDepKind :: Implicit ) ;
757
754
let data = self . cstore . get_crate_data ( cnum) ;
758
755
759
756
// Sanity check the loaded crate to ensure it is indeed a panic runtime
@@ -793,7 +790,7 @@ impl<'a> CrateLoader<'a> {
793
790
) ;
794
791
}
795
792
796
- let cnum = self . resolve_crate ( name, DUMMY_SP , CrateDepKind :: Implicit , None ) ;
793
+ let cnum = self . resolve_crate ( name, DUMMY_SP , CrateDepKind :: Implicit ) ;
797
794
let data = self . cstore . get_crate_data ( cnum) ;
798
795
799
796
// Sanity check the loaded crate to ensure it is indeed a profiler runtime
@@ -1013,7 +1010,7 @@ impl<'a> CrateLoader<'a> {
1013
1010
CrateDepKind :: Explicit
1014
1011
} ;
1015
1012
1016
- let cnum = self . resolve_crate ( name, item. span , dep_kind, None ) ;
1013
+ let cnum = self . resolve_crate ( name, item. span , dep_kind) ;
1017
1014
1018
1015
let path_len = definitions. def_path ( def_id) . data . len ( ) ;
1019
1016
self . update_extern_crate (
@@ -1032,7 +1029,7 @@ impl<'a> CrateLoader<'a> {
1032
1029
}
1033
1030
1034
1031
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 ) ;
1036
1033
1037
1034
self . update_extern_crate (
1038
1035
cnum,
0 commit comments