@@ -309,7 +309,6 @@ impl RustwideBuilder {
309
309
if in_target { & res. target } else { "" } ,
310
310
true ,
311
311
) ?;
312
- successful_targets. push ( DEFAULT_TARGET . to_string ( ) ) ;
313
312
314
313
if in_target {
315
314
// Then build the documentation for all the targets
@@ -385,14 +384,7 @@ impl RustwideBuilder {
385
384
let cargo_metadata =
386
385
CargoMetadata :: load ( & self . workspace , & self . toolchain , & build. host_source_dir ( ) ) ?;
387
386
388
- let target = if let Some ( target) = target {
389
- target
390
- } else if let Some ( target) = metadata. default_target . as_ref ( ) . map ( |s| s. as_str ( ) ) {
391
- target
392
- } else {
393
- DEFAULT_TARGET
394
- }
395
- . to_string ( ) ;
387
+ let target = target. or_else ( || metadata. default_target . as_ref ( ) . map ( |s| s. as_str ( ) ) ) ;
396
388
397
389
let mut rustdoc_flags: Vec < String > = vec ! [
398
390
"-Z" . to_string( ) ,
@@ -419,9 +411,11 @@ impl RustwideBuilder {
419
411
"doc" . to_owned( ) ,
420
412
"--lib" . to_owned( ) ,
421
413
"--no-deps" . to_owned( ) ,
422
- "--target" . to_owned( ) ,
423
- target. to_owned( ) ,
424
414
] ;
415
+ if let Some ( explicit_target) = target {
416
+ cargo_args. push ( "--target" . to_owned ( ) ) ;
417
+ cargo_args. push ( explicit_target. to_owned ( ) ) ;
418
+ } ;
425
419
if let Some ( features) = & metadata. features {
426
420
cargo_args. push ( "--features" . to_owned ( ) ) ;
427
421
cargo_args. push ( features. join ( " " ) ) ;
@@ -445,8 +439,9 @@ impl RustwideBuilder {
445
439
"RUSTFLAGS" ,
446
440
metadata
447
441
. rustc_args
442
+ . as_ref ( )
448
443
. map ( |args| args. join ( " " ) )
449
- . unwrap_or ( "" . to_owned ( ) ) ,
444
+ . unwrap_or_default ( )
450
445
)
451
446
. env ( "RUSTDOCFLAGS" , rustdoc_flags. join ( " " ) )
452
447
. args ( & cargo_args)
@@ -460,7 +455,7 @@ impl RustwideBuilder {
460
455
docsrs_version : format ! ( "docsrs {}" , :: BUILD_VERSION ) ,
461
456
successful,
462
457
cargo_metadata,
463
- target : target. to_string ( ) ,
458
+ target : target. unwrap_or_default ( ) . to_string ( ) ,
464
459
} )
465
460
}
466
461
0 commit comments