Invert the boolean

Author: jyn514

crates/metadata/lib.rs

@@ -20,7 +20,7 @@
 //! let metadata = Metadata::from_crate_root(&source_root)?;
 //!
 //! // Next, learn what arguments we need to pass to `cargo`.
-//! let targets = metadata.targets(/* only_build_default_target: */ false);
+//! let targets = metadata.targets(/* include_default_targets: */ true);
 //! let mut cargo_args = metadata.cargo_args(&[], &[]);
 //! cargo_args.push(targets.default_target.into());
 //!
@@ -193,7 +193,7 @@ impl Metadata {
     /// If `only_build_default_target` is `false` and `targets` is unset, this also includes
     /// [`DEFAULT_TARGETS`]. Otherwise, if `only_build_default_target` is `true` and `targets`
     /// is unset, `other_targets` will be empty.
-    pub fn targets(&self, only_build_default_target: bool) -> BuildTargets<'_> {
+    pub fn targets(&self, include_default_targets: bool) -> BuildTargets<'_> {
         let default_target = self
             .default_target
             .as_deref()
@@ -210,10 +210,10 @@ impl Metadata {
             .as_ref()
             .map(|targets| targets.iter().map(String::as_str).collect());
         // Let people opt-in to only having specific targets
-        let mut targets: HashSet<_> = if only_build_default_target {
-            crate_targets.unwrap_or_default()
-        } else {
+        let mut targets: HashSet<_> = if include_default_targets {
             crate_targets.unwrap_or_else(|| DEFAULT_TARGETS.iter().copied().collect())
+        } else {
+            crate_targets.unwrap_or_default()
         };
 
         targets.remove(&default_target);
@@ -418,7 +418,7 @@ mod test_targets {
         let BuildTargets {
             default_target: default,
             other_targets: tier_one,
-        } = metadata.targets(false);
+        } = metadata.targets(true);
         assert_eq!(default, HOST_TARGET);
 
         // should be equal to TARGETS \ {HOST_TARGET}
@@ -440,7 +440,7 @@ mod test_targets {
         let BuildTargets {
             default_target: default,
             other_targets: others,
-        } = metadata.targets(false);
+        } = metadata.targets(true);
 
         assert_eq!(default, HOST_TARGET);
         assert!(others.is_empty());
@@ -454,7 +454,7 @@ mod test_targets {
         let BuildTargets {
             default_target: default,
             other_targets: others,
-        } = metadata.targets(false);
+        } = metadata.targets(true);
 
         assert_eq!(default, "i686-pc-windows-msvc");
         assert_eq!(others.len(), 1);
@@ -465,7 +465,7 @@ mod test_targets {
         let BuildTargets {
             default_target: default,
             other_targets: others,
-        } = metadata.targets(false);
+        } = metadata.targets(true);
 
         assert_eq!(default, HOST_TARGET);
         assert!(others.is_empty());
@@ -479,7 +479,7 @@ mod test_targets {
         let BuildTargets {
             default_target: default,
             other_targets: others,
-        } = metadata.targets(false);
+        } = metadata.targets(true);
 
         assert_eq!(default, "i686-pc-windows-msvc");
         assert!(others.is_empty());
@@ -489,7 +489,7 @@ mod test_targets {
         let BuildTargets {
             default_target: default,
             other_targets: others,
-        } = metadata.targets(false);
+        } = metadata.targets(true);
 
         assert_eq!(default, "i686-apple-darwin");
         assert_eq!(others.len(), 1);
@@ -500,7 +500,7 @@ mod test_targets {
         let BuildTargets {
             default_target: default,
             other_targets: others,
-        } = metadata.targets(false);
+        } = metadata.targets(true);
 
         assert_eq!(default, "i686-apple-darwin");
         assert!(others.is_empty());
@@ -510,7 +510,7 @@ mod test_targets {
         let BuildTargets {
             default_target: default,
             other_targets: others,
-        } = metadata.targets(false);
+        } = metadata.targets(true);
 
         assert_eq!(default, "i686-apple-darwin");
         let tier_one_targets_no_default = DEFAULT_TARGETS
@@ -529,7 +529,7 @@ mod test_targets {
         let BuildTargets {
             other_targets: others,
             ..
-        } = metadata.targets(true);
+        } = metadata.targets(false);
         assert!(others.is_empty(), "{:?}", others);
     }
 }

src/docbuilder/rustwide_builder.rs

@@ -322,7 +322,7 @@ impl RustwideBuilder {
                 let BuildTargets {
                     default_target,
                     other_targets,
-                } = metadata.targets(self.config.only_build_default_target);
+                } = metadata.targets(!self.config.only_build_default_target);
 
                 // Perform an initial build
                 let res = self.execute_build(default_target, true, &build, &limits, &metadata)?;