Skip to content

Commit 9f432ed

Browse files
committed
Revert "feat(tree): Add '--depth public' feature-gated value"
This reverts commit 224222e.
1 parent af13ccb commit 9f432ed

File tree

1 file changed

+4
-20
lines changed

1 file changed

+4
-20
lines changed

src/cargo/ops/tree/mod.rs

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ impl FromStr for Prefix {
9494
#[derive(Clone, Copy)]
9595
pub enum DisplayDepth {
9696
MaxDisplayDepth(u32),
97-
Public,
9897
Workspace,
9998
}
10099

@@ -104,7 +103,6 @@ impl FromStr for DisplayDepth {
104103
fn from_str(s: &str) -> Result<Self, Self::Err> {
105104
match s {
106105
"workspace" => Ok(Self::Workspace),
107-
"public" => Ok(Self::Public),
108106
s => s.parse().map(Self::MaxDisplayDepth).map_err(|_| {
109107
clap::Error::raw(
110108
clap::error::ErrorKind::ValueValidation,
@@ -428,15 +426,9 @@ fn print_dependencies<'a>(
428426
}
429427
}
430428

431-
let (max_display_depth, filter_non_workspace_member, filter_private) = match display_depth {
432-
DisplayDepth::MaxDisplayDepth(max) => (max, false, false),
433-
DisplayDepth::Workspace => (u32::MAX, true, false),
434-
DisplayDepth::Public => {
435-
if !ws.gctx().cli_unstable().unstable_options {
436-
anyhow::bail!("`--depth public` requires `-Zunstable-options`")
437-
}
438-
(u32::MAX, false, true)
439-
}
429+
let (max_display_depth, filter_non_workspace_member) = match display_depth {
430+
DisplayDepth::MaxDisplayDepth(max) => (max, false),
431+
DisplayDepth::Workspace => (u32::MAX, true),
440432
};
441433

442434
// Current level exceeds maximum display depth. Skip.
@@ -453,17 +445,9 @@ fn print_dependencies<'a>(
453445
if filter_non_workspace_member && !ws.is_member_id(*package_id) {
454446
return false;
455447
}
456-
if filter_private && !dep.public() {
457-
return false;
458-
}
459448
!pkgs_to_prune.iter().any(|spec| spec.matches(*package_id))
460449
}
461-
Node::Feature { .. } => {
462-
if filter_private && !dep.public() {
463-
return false;
464-
}
465-
true
466-
}
450+
Node::Feature { .. } => true,
467451
}
468452
})
469453
.peekable();

0 commit comments

Comments
 (0)