File tree Expand file tree Collapse file tree 3 files changed +10
-9
lines changed Expand file tree Collapse file tree 3 files changed +10
-9
lines changed Original file line number Diff line number Diff line change @@ -95,7 +95,7 @@ impl Step for Std {
9595 const DEFAULT : bool = true ;
9696
9797 fn should_run ( run : ShouldRun < ' _ > ) -> ShouldRun < ' _ > {
98- run. crate_or_deps ( "sysroot" ) . path ( "library" ) . alias ( "core" )
98+ run. crate_or_deps ( "sysroot" ) . path ( "library" )
9999 }
100100
101101 fn make_run ( run : RunConfig < ' _ > ) {
Original file line number Diff line number Diff line change @@ -572,10 +572,7 @@ impl Step for Std {
572572
573573 fn should_run ( run : ShouldRun < ' _ > ) -> ShouldRun < ' _ > {
574574 let builder = run. builder ;
575- run. crate_or_deps ( "sysroot" )
576- . path ( "library" )
577- . alias ( "core" )
578- . default_condition ( builder. config . docs )
575+ run. crate_or_deps ( "sysroot" ) . path ( "library" ) . default_condition ( builder. config . docs )
579576 }
580577
581578 fn make_run ( run : RunConfig < ' _ > ) {
Original file line number Diff line number Diff line change @@ -127,10 +127,14 @@ impl RunConfig<'_> {
127127 pub fn cargo_crates_in_set ( & self ) -> Vec < String > {
128128 let mut crates = Vec :: new ( ) ;
129129 for krate in & self . paths {
130- let path = krate. assert_single_path ( ) ;
131- let Some ( crate_name) = self . builder . crate_paths . get ( & path. path ) else {
132- panic ! ( "missing crate for path {}" , path. path. display( ) )
133- } ;
130+ let path = & krate. assert_single_path ( ) . path ;
131+
132+ let crate_name = self
133+ . builder
134+ . crate_paths
135+ . get ( path)
136+ . unwrap_or_else ( || panic ! ( "missing crate for path {}" , path. display( ) ) ) ;
137+
134138 crates. push ( crate_name. to_string ( ) ) ;
135139 }
136140 crates
You can’t perform that action at this time.
0 commit comments