@@ -309,7 +309,6 @@ impl RustwideBuilder {
309309 if in_target { & res. target } else { "" } ,
310310 true ,
311311 ) ?;
312- successful_targets. push ( DEFAULT_TARGET . to_string ( ) ) ;
313312
314313 if in_target {
315314 // Then build the documentation for all the targets
@@ -385,14 +384,7 @@ impl RustwideBuilder {
385384 let cargo_metadata =
386385 CargoMetadata :: load ( & self . workspace , & self . toolchain , & build. host_source_dir ( ) ) ?;
387386
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 ( ) ) ) ;
396388
397389 let mut rustdoc_flags: Vec < String > = vec ! [
398390 "-Z" . to_string( ) ,
@@ -419,9 +411,11 @@ impl RustwideBuilder {
419411 "doc" . to_owned( ) ,
420412 "--lib" . to_owned( ) ,
421413 "--no-deps" . to_owned( ) ,
422- "--target" . to_owned( ) ,
423- target. to_owned( ) ,
424414 ] ;
415+ if let Some ( explicit_target) = target {
416+ cargo_args. push ( "--target" . to_owned ( ) ) ;
417+ cargo_args. push ( explicit_target. to_owned ( ) ) ;
418+ } ;
425419 if let Some ( features) = & metadata. features {
426420 cargo_args. push ( "--features" . to_owned ( ) ) ;
427421 cargo_args. push ( features. join ( " " ) ) ;
@@ -445,8 +439,9 @@ impl RustwideBuilder {
445439 "RUSTFLAGS" ,
446440 metadata
447441 . rustc_args
442+ . as_ref ( )
448443 . map ( |args| args. join ( " " ) )
449- . unwrap_or ( "" . to_owned ( ) ) ,
444+ . unwrap_or_default ( )
450445 )
451446 . env ( "RUSTDOCFLAGS" , rustdoc_flags. join ( " " ) )
452447 . args ( & cargo_args)
@@ -460,7 +455,7 @@ impl RustwideBuilder {
460455 docsrs_version : format ! ( "docsrs {}" , :: BUILD_VERSION ) ,
461456 successful,
462457 cargo_metadata,
463- target : target. to_string ( ) ,
458+ target : target. unwrap_or_default ( ) . to_string ( ) ,
464459 } )
465460 }
466461
0 commit comments