@@ -951,7 +951,7 @@ pub struct Cargo {
951
951
}
952
952
953
953
impl Step for Cargo {
954
- type Output = GeneratedTarball ;
954
+ type Output = Option < GeneratedTarball > ;
955
955
const ONLY_HOSTS : bool = true ;
956
956
957
957
fn should_run ( run : ShouldRun < ' _ > ) -> ShouldRun < ' _ > {
@@ -969,7 +969,7 @@ impl Step for Cargo {
969
969
} ) ;
970
970
}
971
971
972
- fn run ( self , builder : & Builder < ' _ > ) -> GeneratedTarball {
972
+ fn run ( self , builder : & Builder < ' _ > ) -> Option < GeneratedTarball > {
973
973
let compiler = self . compiler ;
974
974
let target = self . target ;
975
975
@@ -994,7 +994,7 @@ impl Step for Cargo {
994
994
}
995
995
}
996
996
997
- tarball. generate ( )
997
+ Some ( tarball. generate ( ) )
998
998
}
999
999
}
1000
1000
@@ -1106,7 +1106,7 @@ pub struct Clippy {
1106
1106
}
1107
1107
1108
1108
impl Step for Clippy {
1109
- type Output = GeneratedTarball ;
1109
+ type Output = Option < GeneratedTarball > ;
1110
1110
const ONLY_HOSTS : bool = true ;
1111
1111
1112
1112
fn should_run ( run : ShouldRun < ' _ > ) -> ShouldRun < ' _ > {
@@ -1124,7 +1124,7 @@ impl Step for Clippy {
1124
1124
} ) ;
1125
1125
}
1126
1126
1127
- fn run ( self , builder : & Builder < ' _ > ) -> GeneratedTarball {
1127
+ fn run ( self , builder : & Builder < ' _ > ) -> Option < GeneratedTarball > {
1128
1128
let compiler = self . compiler ;
1129
1129
let target = self . target ;
1130
1130
assert ! ( builder. config. extended) ;
@@ -1145,7 +1145,7 @@ impl Step for Clippy {
1145
1145
tarball. add_file ( clippy, "bin" , 0o755 ) ;
1146
1146
tarball. add_file ( cargoclippy, "bin" , 0o755 ) ;
1147
1147
tarball. add_legal_and_readme_to ( "share/doc/clippy" ) ;
1148
- tarball. generate ( )
1148
+ Some ( tarball. generate ( ) )
1149
1149
}
1150
1150
}
1151
1151
@@ -1374,8 +1374,8 @@ impl Step for Extended {
1374
1374
return ;
1375
1375
}
1376
1376
1377
- tarballs. push ( cargo_installer) ;
1378
- tarballs. push ( clippy_installer) ;
1377
+ tarballs. extend ( cargo_installer) ;
1378
+ tarballs. extend ( clippy_installer) ;
1379
1379
tarballs. extend ( rust_demangler_installer. clone ( ) ) ;
1380
1380
tarballs. extend ( rls_installer. clone ( ) ) ;
1381
1381
tarballs. extend ( rust_analyzer_installer. clone ( ) ) ;
0 commit comments