File tree 4 files changed +2
-6
lines changed
4 files changed +2
-6
lines changed Original file line number Diff line number Diff line change @@ -817,7 +817,6 @@ impl Step for LldWrapper {
817
817
fields( build_compiler = ?self . build_compiler, target_compiler = ?self . target_compiler) ,
818
818
) ,
819
819
) ]
820
-
821
820
fn run ( self , builder : & Builder < ' _ > ) -> ToolBuildResult {
822
821
if builder. config . dry_run ( ) {
823
822
return ToolBuildResult {
Original file line number Diff line number Diff line change @@ -1276,7 +1276,6 @@ impl<'a> Builder<'a> {
1276
1276
) ,
1277
1277
) ,
1278
1278
) ]
1279
-
1280
1279
/// FIXME: This function is unnecessary (and dangerous, see <https://github.com/rust-lang/rust/issues/137469>).
1281
1280
/// We already have uplifting logic for the compiler, so remove this.
1282
1281
pub fn compiler_for (
Original file line number Diff line number Diff line change @@ -1557,7 +1557,7 @@ Executed at: {executed_at}"#,
1557
1557
!self . config . full_bootstrap
1558
1558
&& !self . config . download_rustc ( )
1559
1559
&& stage >= 2
1560
- && ( self . hosts . iter ( ) . any ( |h| * h == target) || target == self . build )
1560
+ && ( self . hosts . contains ( & target) || target == self . build )
1561
1561
}
1562
1562
1563
1563
/// Checks whether the `compiler` compiling for `target` should be forced to
Original file line number Diff line number Diff line change @@ -432,9 +432,7 @@ pub fn dir_is_empty(dir: &Path) -> bool {
432
432
/// the "y" part from the string.
433
433
pub fn extract_beta_rev ( version : & str ) -> Option < String > {
434
434
let parts = version. splitn ( 2 , "-beta." ) . collect :: < Vec < _ > > ( ) ;
435
- let count = parts. get ( 1 ) . and_then ( |s| s. find ( ' ' ) . map ( |p| s[ ..p] . to_string ( ) ) ) ;
436
-
437
- count
435
+ parts. get ( 1 ) . and_then ( |s| s. find ( ' ' ) . map ( |p| s[ ..p] . to_string ( ) ) )
438
436
}
439
437
440
438
pub enum LldThreads {
You can’t perform that action at this time.
0 commit comments