@@ -326,7 +326,7 @@ fn invoke_rustdoc(
326
326
327
327
#[ derive( Debug , Clone , Hash , PartialEq , Eq ) ]
328
328
pub struct Standalone {
329
- compiler : Compiler ,
329
+ build_compiler : Compiler ,
330
330
target : TargetSelection ,
331
331
}
332
332
@@ -341,7 +341,11 @@ impl Step for Standalone {
341
341
342
342
fn make_run ( run : RunConfig < ' _ > ) {
343
343
run. builder . ensure ( Standalone {
344
- compiler : run. builder . compiler ( run. builder . top_stage , run. builder . config . host_target ) ,
344
+ build_compiler : prepare_doc_compiler (
345
+ run. builder ,
346
+ run. builder . host_target ,
347
+ run. builder . top_stage ,
348
+ ) ,
345
349
target : run. target ,
346
350
} ) ;
347
351
}
@@ -356,8 +360,8 @@ impl Step for Standalone {
356
360
/// In the end, this is just a glorified wrapper around rustdoc!
357
361
fn run ( self , builder : & Builder < ' _ > ) {
358
362
let target = self . target ;
359
- let compiler = self . compiler ;
360
- let _guard = builder. msg_doc ( compiler , "standalone" , target) ;
363
+ let build_compiler = self . build_compiler ;
364
+ let _guard = builder. msg_doc ( build_compiler , "standalone" , target) ;
361
365
let out = builder. doc_out ( target) ;
362
366
t ! ( fs:: create_dir_all( & out) ) ;
363
367
@@ -376,7 +380,7 @@ impl Step for Standalone {
376
380
}
377
381
378
382
let html = out. join ( filename) . with_extension ( "html" ) ;
379
- let rustdoc = builder. rustdoc_for_compiler ( compiler ) ;
383
+ let rustdoc = builder. rustdoc_for_compiler ( build_compiler ) ;
380
384
if up_to_date ( & path, & html)
381
385
&& up_to_date ( & footer, & html)
382
386
&& up_to_date ( & favicon, & html)
@@ -387,7 +391,7 @@ impl Step for Standalone {
387
391
continue ;
388
392
}
389
393
390
- let mut cmd = builder. rustdoc_cmd ( compiler ) ;
394
+ let mut cmd = builder. rustdoc_cmd ( build_compiler ) ;
391
395
392
396
cmd. arg ( "--html-after-content" )
393
397
. arg ( & footer)
@@ -424,11 +428,15 @@ impl Step for Standalone {
424
428
builder. open_in_browser ( index) ;
425
429
}
426
430
}
431
+
432
+ fn metadata ( & self ) -> Option < StepMetadata > {
433
+ Some ( StepMetadata :: doc ( "standalone" , self . target ) . built_by ( self . build_compiler ) )
434
+ }
427
435
}
428
436
429
437
#[ derive( Debug , Clone , Hash , PartialEq , Eq ) ]
430
438
pub struct Releases {
431
- compiler : Compiler ,
439
+ build_compiler : Compiler ,
432
440
target : TargetSelection ,
433
441
}
434
442
@@ -443,7 +451,11 @@ impl Step for Releases {
443
451
444
452
fn make_run ( run : RunConfig < ' _ > ) {
445
453
run. builder . ensure ( Releases {
446
- compiler : run. builder . compiler ( run. builder . top_stage , run. builder . config . host_target ) ,
454
+ build_compiler : prepare_doc_compiler (
455
+ run. builder ,
456
+ run. builder . host_target ,
457
+ run. builder . top_stage ,
458
+ ) ,
447
459
target : run. target ,
448
460
} ) ;
449
461
}
@@ -455,15 +467,12 @@ impl Step for Releases {
455
467
/// the headline added. In the end, the conversion is done by Rustdoc.
456
468
fn run ( self , builder : & Builder < ' _ > ) {
457
469
let target = self . target ;
458
- let compiler = self . compiler ;
459
- let _guard = builder. msg_doc ( compiler , "releases" , target) ;
470
+ let build_compiler = self . build_compiler ;
471
+ let _guard = builder. msg_doc ( build_compiler , "releases" , target) ;
460
472
let out = builder. doc_out ( target) ;
461
473
t ! ( fs:: create_dir_all( & out) ) ;
462
474
463
- builder. ensure ( Standalone {
464
- compiler : builder. compiler ( builder. top_stage , builder. config . host_target ) ,
465
- target,
466
- } ) ;
475
+ builder. ensure ( Standalone { build_compiler, target } ) ;
467
476
468
477
let version_info = builder. ensure ( SharedAssets { target : self . target } ) . version_info ;
469
478
@@ -474,7 +483,7 @@ impl Step for Releases {
474
483
let html = out. join ( "releases.html" ) ;
475
484
let tmppath = out. join ( "releases.md" ) ;
476
485
let inpath = builder. src . join ( "RELEASES.md" ) ;
477
- let rustdoc = builder. rustdoc_for_compiler ( compiler ) ;
486
+ let rustdoc = builder. rustdoc_for_compiler ( build_compiler ) ;
478
487
if !up_to_date ( & inpath, & html)
479
488
|| !up_to_date ( & footer, & html)
480
489
|| !up_to_date ( & favicon, & html)
@@ -487,7 +496,7 @@ impl Step for Releases {
487
496
t ! ( tmpfile. write_all( b"% Rust Release Notes\n \n " ) ) ;
488
497
t ! ( io:: copy( & mut t!( fs:: File :: open( & inpath) ) , & mut tmpfile) ) ;
489
498
mem:: drop ( tmpfile) ;
490
- let mut cmd = builder. rustdoc_cmd ( compiler ) ;
499
+ let mut cmd = builder. rustdoc_cmd ( build_compiler ) ;
491
500
492
501
cmd. arg ( "--html-after-content" )
493
502
. arg ( & footer)
@@ -520,6 +529,10 @@ impl Step for Releases {
520
529
builder. open_in_browser ( & html) ;
521
530
}
522
531
}
532
+
533
+ fn metadata ( & self ) -> Option < StepMetadata > {
534
+ Some ( StepMetadata :: doc ( "releases" , self . target ) . built_by ( self . build_compiler ) )
535
+ }
523
536
}
524
537
525
538
#[ derive( Debug , Clone ) ]
0 commit comments