Also handle --examples

Author: Jon Gjengset

src/cargo/ops/cargo_install.rs

@@ -331,27 +331,29 @@ impl<'cfg, 'a> InstallablePackage<'cfg, 'a> {
             // target selection, and --bin=requires_a without --features=a will fail with "target
             // .. requires the features ..". But rather than assume that's the case, we define the
             // behavior for this fallback case as well.
-            if matches!(
-                self.opts.filter,
-                CompileFilter::Only {
-                    bins: FilterRule::Just(..),
-                    ..
+            if let CompileFilter::Only { bins, examples, .. } = &self.opts.filter {
+                let mut any_specific = false;
+                if let FilterRule::Just(ref v) = bins {
+                    if !v.is_empty() {
+                        any_specific = true;
+                    }
+                }
+                if let FilterRule::Just(ref v) = examples {
+                    if !v.is_empty() {
+                        any_specific = true;
+                    }
+                }
+                if any_specific {
+                    bail!("no binaries are available for install using the selected features");
                 }
-            ) {
-                bail!("no binaries are available for install using the selected features");
             }
 
-            // If the user did not specify a filter and there _are_ binaries available, but none
-            // were selected given the current set of features, let the user know.
-            if matches!(
-                self.opts.filter,
-                CompileFilter::Default { .. }
-                    | CompileFilter::Only {
-                        bins: FilterRule::All,
-                        ..
-                    }
-            ) && self.pkg.targets().iter().any(|t| t.is_bin())
-            {
+            // If there _are_ binaries available, but none were selected given the current set of
+            // features, let the user know.
+            //
+            // Note that we know at this point that _if_ bins or examples is set to `::Just`,
+            // they're `::Just([])`, which is `FilterRule::none()`.
+            if self.pkg.targets().iter().any(|t| t.is_bin()) {
                 self.config
                     .shell()
                     .warn("none of the package's binaries are available for install using the selected features")?;

tests/testsuite/required_features.rs

@@ -754,20 +754,51 @@ fn install_multiple_required_features() {
                 name = "foo_2"
                 path = "src/foo_2.rs"
                 required-features = ["a"]
+
+                [[example]]
+                name = "foo_3"
+                path = "src/foo_3.rs"
+                required-features = ["b", "c"]
+
+                [[example]]
+                name = "foo_4"
+                path = "src/foo_4.rs"
+                required-features = ["a"]
             "#,
         )
         .file("src/foo_1.rs", "fn main() {}")
         .file("src/foo_2.rs", "fn main() {}")
+        .file("src/foo_3.rs", "fn main() {}")
+        .file("src/foo_4.rs", "fn main() {}")
         .build();
 
     p.cargo("install --path .").run();
     assert_has_not_installed_exe(cargo_home(), "foo_1");
     assert_has_installed_exe(cargo_home(), "foo_2");
+    assert_has_not_installed_exe(cargo_home(), "foo_3");
+    assert_has_not_installed_exe(cargo_home(), "foo_4");
+    p.cargo("uninstall foo").run();
+
+    p.cargo("install --path . --bins --examples").run();
+    assert_has_not_installed_exe(cargo_home(), "foo_1");
+    assert_has_installed_exe(cargo_home(), "foo_2");
+    assert_has_not_installed_exe(cargo_home(), "foo_3");
+    assert_has_installed_exe(cargo_home(), "foo_4");
     p.cargo("uninstall foo").run();
 
     p.cargo("install --path . --features c").run();
     assert_has_installed_exe(cargo_home(), "foo_1");
     assert_has_installed_exe(cargo_home(), "foo_2");
+    assert_has_not_installed_exe(cargo_home(), "foo_3");
+    assert_has_not_installed_exe(cargo_home(), "foo_4");
+    p.cargo("uninstall foo").run();
+
+    p.cargo("install --path . --features c --bins --examples")
+        .run();
+    assert_has_installed_exe(cargo_home(), "foo_1");
+    assert_has_installed_exe(cargo_home(), "foo_2");
+    assert_has_installed_exe(cargo_home(), "foo_3");
+    assert_has_installed_exe(cargo_home(), "foo_4");
     p.cargo("uninstall foo").run();
 
     p.cargo("install --path . --no-default-features")
@@ -776,11 +807,43 @@ fn install_multiple_required_features() {
 [INSTALLING] foo v0.0.1 ([..])
 [FINISHED] release [optimized] target(s) in [..]
 [WARNING] none of the package's binaries are available for install using the selected features
+",
+        )
+        .run();
+    p.cargo("install --path . --no-default-features --bins")
+        .with_stderr(
+            "\
+[INSTALLING] foo v0.0.1 ([..])
+[WARNING] Target filter `bins` specified, but no targets matched. This is a no-op
+[FINISHED] release [optimized] target(s) in [..]
+[WARNING] none of the package's binaries are available for install using the selected features
+",
+        )
+        .run();
+    p.cargo("install --path . --no-default-features --examples")
+        .with_stderr(
+            "\
+[INSTALLING] foo v0.0.1 ([..])
+[WARNING] Target filter `examples` specified, but no targets matched. This is a no-op
+[FINISHED] release [optimized] target(s) in [..]
+[WARNING] none of the package's binaries are available for install using the selected features
+",
+        )
+        .run();
+    p.cargo("install --path . --no-default-features --bins --examples")
+        .with_stderr(
+            "\
+[INSTALLING] foo v0.0.1 ([..])
+[WARNING] Target filters `bins`, `examples` specified, but no targets matched. This is a no-op
+[FINISHED] release [optimized] target(s) in [..]
+[WARNING] none of the package's binaries are available for install using the selected features
 ",
         )
         .run();
     assert_has_not_installed_exe(cargo_home(), "foo_1");
     assert_has_not_installed_exe(cargo_home(), "foo_2");
+    assert_has_not_installed_exe(cargo_home(), "foo_3");
+    assert_has_not_installed_exe(cargo_home(), "foo_4");
 }
 
 #[cargo_test]