Change --no-filter-targets to --target=all.

Author: ehuss

src/bin/cargo/commands/tree.rs

@@ -16,10 +16,6 @@ pub fn cli() -> App {
         .arg_target_triple(
             "Filter dependencies matching the given target-triple (default host platform)",
         )
-        .arg(opt(
-            "no-filter-targets",
-            "Return dependencies for all targets",
-        ))
         .arg(opt("no-dev-dependencies", "Skip dev dependencies"))
         .arg(opt("invert", "Invert the tree direction").short("i"))
         .arg(Arg::with_name("no-indent").long("no-indent").hidden(true))
@@ -81,13 +77,13 @@ pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
         .map_err(|e| anyhow::anyhow!("{}", e))?;
     let prefix = tree::Prefix::from_str(args.value_of("prefix").unwrap())
         .map_err(|e| anyhow::anyhow!("{}", e))?;
+    let target = tree::Target::from_cli(args.value_of("target"));
     let opts = tree::TreeOptions {
         features: values(args, "features"),
         all_features: args.is_present("all-features"),
         no_default_features: args.is_present("no-default-features"),
         packages: args.packages_from_flags()?,
-        target: args.target(),
-        no_filter_targets: args.is_present("no-filter-targets"),
+        target,
         no_dev_dependencies: args.is_present("no-dev-dependencies"),
         invert: args.is_present("invert"),
         prefix,

src/cargo/ops/tree/graph.rs

@@ -315,6 +315,7 @@ fn add_pkg(
     let mut dep_name_map: HashMap<InternedString, HashSet<(usize, bool)>> = HashMap::new();
     let mut deps: Vec<_> = resolve.deps(package_id).collect();
     deps.sort_unstable_by_key(|(dep_id, _)| *dep_id);
+    let show_all_targets = opts.target == super::Target::All;
     for (dep_id, deps) in deps {
         let mut deps: Vec<_> = deps
             .iter()
@@ -328,7 +329,7 @@ fn add_pkg(
                     (_, DepKind::Development) => node_kind,
                 };
                 // Filter out inactivated targets.
-                if !opts.no_filter_targets && !target_data.dep_platform_activated(dep, kind) {
+                if !show_all_targets && !target_data.dep_platform_activated(dep, kind) {
                     return false;
                 }
                 // Filter out dev-dependencies if requested.

src/cargo/ops/tree/mod.rs

@@ -24,10 +24,7 @@ pub struct TreeOptions {
     /// The packages to display the tree for.
     pub packages: Packages,
     /// The platform to filter for.
-    /// If `None`, use the host platform.
-    pub target: Option<String>,
-    /// If `true`, ignores the `target` field and returns all targets.
-    pub no_filter_targets: bool,
+    pub target: Target,
     pub no_dev_dependencies: bool,
     pub invert: bool,
     /// The style of prefix for each line.
@@ -48,6 +45,23 @@ pub struct TreeOptions {
     pub graph_features: bool,
 }
 
+#[derive(PartialEq)]
+pub enum Target {
+    Host,
+    Specific(String),
+    All,
+}
+
+impl Target {
+    pub fn from_cli(target: Option<&str>) -> Target {
+        match target {
+            None => Target::Host,
+            Some("all") => Target::All,
+            Some(target) => Target::Specific(target.to_string()),
+        }
+    }
+}
+
 pub enum Charset {
     Utf8,
     Ascii,
@@ -108,13 +122,16 @@ static ASCII_SYMBOLS: Symbols = Symbols {
 
 /// Entry point for the `cargo tree` command.
 pub fn build_and_print(ws: &Workspace<'_>, opts: &TreeOptions) -> CargoResult<()> {
-    if opts.no_filter_targets && opts.target.is_some() {
-        bail!("cannot specify both `--target` and `--no-filter-targets`");
-    }
     if opts.graph_features && opts.duplicates {
         bail!("the `--graph-features` flag does not support `--duplicates`");
     }
-    let requested_kind = CompileKind::from_requested_target(ws.config(), opts.target.as_deref())?;
+    let requested_target = match &opts.target {
+        Target::All | Target::Host => None,
+        Target::Specific(t) => Some(t.as_ref()),
+    };
+    // TODO: Target::All is broken with -Zfeatures=itarget. To handle that properly,
+    // `FeatureResolver` will need to be taught what "all" means.
+    let requested_kind = CompileKind::from_requested_target(ws.config(), requested_target)?;
     let target_data = RustcTargetData::new(ws, requested_kind)?;
     let specs = opts.packages.to_package_id_specs(ws)?;
     let resolve_opts = ResolveOpts::new(

src/doc/man/cargo-tree.adoc

@@ -68,11 +68,8 @@ only one instance is built.
 
 *--target* _TRIPLE_::
     Filter dependencies matching the given target-triple.
-    The default is the host platform.
-
-*--no-filter-targets*::
-    Show dependencies for all target platforms. Cannot be specified with
-    `--target`.
+    The default is the host platform. Use the value `all` to include *all*
+    targets.
 
 *--graph-features*::
     Runs in a special mode where features are included as individual nodes.

src/doc/man/generated/cargo-tree.html

@@ -81,12 +81,8 @@ <h3 id="cargo_tree_tree_options">Tree Options</h3>
 <dt class="hdlist1"><strong>--target</strong> <em>TRIPLE</em></dt>
 <dd>
 <p>Filter dependencies matching the given target-triple.
-The default is the host platform.</p>
-</dd>
-<dt class="hdlist1"><strong>--no-filter-targets</strong></dt>
-<dd>
-<p>Show dependencies for all target platforms. Cannot be specified with
-<code>--target</code>.</p>
+The default is the host platform. Use the value <code>all</code> to include <strong>all</strong>
+targets.</p>
 </dd>
 <dt class="hdlist1"><strong>--graph-features</strong></dt>
 <dd>

src/etc/man/cargo-tree.1

@@ -95,13 +95,8 @@ Do not include dev\-dependencies.
 \fB\-\-target\fP \fITRIPLE\fP
 .RS 4
 Filter dependencies matching the given target\-triple.
-The default is the host platform.
-.RE
-.sp
-\fB\-\-no\-filter\-targets\fP
-.RS 4
-Show dependencies for all target platforms. Cannot be specified with
-\fB\-\-target\fP.
+The default is the host platform. Use the value \fBall\fP to include \fBall\fP
+targets.
 .RE
 .sp
 \fB\-\-graph\-features\fP

tests/testsuite/tree.rs

@@ -414,13 +414,7 @@ foo v0.1.0 ([..]/foo)
         )
         .run();
 
-    p.cargo("tree --no-filter-targets --target")
-        .arg(alternate())
-        .with_status(101)
-        .with_stderr("[ERROR] cannot specify both `--target` and `--no-filter-targets`")
-        .run();
-
-    p.cargo("tree --no-filter-targets")
+    p.cargo("tree --target=all")
         .with_stdout(
             "\
 foo v0.1.0 ([..]/foo)

tests/testsuite/tree_graph_features.rs

@@ -344,7 +344,7 @@ foo v0.1.0 ([..]/foo)
 ",
         )
         .run();
-    p.cargo("tree --graph-features --all-features --no-filter-targets")
+    p.cargo("tree --graph-features --all-features --target=all")
         .with_stdout(
             "\
 foo v0.1.0 ([..]/foo)