@@ -1043,30 +1043,6 @@ impl Step for Src {
1043
1043
builder. copy ( & builder. src . join ( file) , & dst_src. join ( file) ) ;
1044
1044
}
1045
1045
1046
- // libtest includes std and everything else, so vendoring it
1047
- // creates exactly what's needed for `cargo -Zbuild-std` or any
1048
- // other analysis of the stdlib's source. Cargo also needs help
1049
- // finding the lock, so we copy it to libtest temporarily.
1050
- //
1051
- // Note that this requires std to only have one version of each
1052
- // crate. e.g. two versions of getopts won't be patchable.
1053
- let dst_libtest = dst_src. join ( "library/test" ) ;
1054
- let dst_vendor = dst_src. join ( "vendor" ) ;
1055
- let root_lock = dst_src. join ( "Cargo.lock" ) ;
1056
- let temp_lock = dst_libtest. join ( "Cargo.lock" ) ;
1057
-
1058
- // `cargo vendor` will delete everything from the lockfile that
1059
- // isn't used by libtest, so we need to not use any links!
1060
- builder. really_copy ( & root_lock, & temp_lock) ;
1061
-
1062
- let mut cmd = Command :: new ( & builder. initial_cargo ) ;
1063
- cmd. arg ( "vendor" ) . arg ( dst_vendor) . current_dir ( & dst_libtest) ;
1064
- builder. info ( "Dist src" ) ;
1065
- let _time = timeit ( builder) ;
1066
- builder. run ( & mut cmd) ;
1067
-
1068
- builder. remove ( & temp_lock) ;
1069
-
1070
1046
// Create source tarball in rust-installer format
1071
1047
let mut cmd = rust_installer ( builder) ;
1072
1048
cmd. arg ( "generate" )
@@ -1083,6 +1059,8 @@ impl Step for Src {
1083
1059
. arg ( "--component-name=rust-src" )
1084
1060
. arg ( "--legacy-manifest-dirs=rustlib,cargo" ) ;
1085
1061
1062
+ builder. info ( "Dist src" ) ;
1063
+ let _time = timeit ( builder) ;
1086
1064
builder. run ( & mut cmd) ;
1087
1065
1088
1066
builder. remove_dir ( & image) ;
0 commit comments