development/cargo
development/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo synced 2024-10-02 14:04:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: new --depth option for cargo tree

Browse source
This commit is contained in:
Weihang Lo 2021-05-17 00:49:12 +08:00
parent 44596fa2b1
commit 7cbc365da8
No known key found for this signature in database
GPG key ID: D7DBF189825E82E7
2 changed files with 25 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/bin/cargo/commands/tree.rs
View file

@ -55,6 +55,7 @@ pub fn cli() -> App {
)
.short("i"),
)
.arg(opt("depth", "Maximum display depth of the dependency tree").value_name("DEPTH"))
// Deprecated, use --prefix=none instead.
.arg(Arg::with_name("no-indent").long("no-indent").hidden(true))
// Deprecated, use --prefix=depth instead.
@ -201,6 +202,7 @@ subtree of the package given to -p.\n\
charset,
format: args.value_of("format").unwrap().to_string(),
graph_features,
max_display_depth: args.value_of_u32("depth")?.unwrap_or(u32::MAX),
};
tree::build_and_print(&ws, &opts)?;

37
src/cargo/ops/tree/mod.rs
View file

@ -43,6 +43,8 @@ pub struct TreeOptions {
pub format: String,
/// Includes features in the tree as separate nodes.
pub graph_features: bool,
/// Maximum display depth of the dependency tree.
pub max_display_depth: u32,
}
#[derive(PartialEq)]
@ -241,6 +243,7 @@ fn print(
symbols,
opts.prefix,
opts.no_dedupe,
opts.max_display_depth,
&mut visited_deps,
&mut levels_continue,
&mut print_stack,
@ -259,6 +262,7 @@ fn print_node<'a>(
symbols: &Symbols,
prefix: Prefix,
no_dedupe: bool,
max_display_depth: u32,
visited_deps: &mut HashSet<usize>,
levels_continue: &mut Vec<bool>,
print_stack: &mut Vec<usize>,
@ -316,6 +320,7 @@ fn print_node<'a>(
symbols,
prefix,
no_dedupe,
max_display_depth,
visited_deps,
levels_continue,
print_stack,
@ -334,6 +339,7 @@ fn print_dependencies<'a>(
symbols: &Symbols,
prefix: Prefix,
no_dedupe: bool,
max_display_depth: u32,
visited_deps: &mut HashSet<usize>,
levels_continue: &mut Vec<bool>,
print_stack: &mut Vec<usize>,
@ -364,19 +370,22 @@ fn print_dependencies<'a>(
let mut it = deps.iter().peekable();
while let Some(dependency) = it.next() {
levels_continue.push(it.peek().is_some());
print_node(
config,
graph,
*dependency,
format,
symbols,
prefix,
no_dedupe,
visited_deps,
levels_continue,
print_stack,
);
levels_continue.pop();
if levels_continue.len() + 1 <= max_display_depth as usize {
levels_continue.push(it.peek().is_some());
print_node(
config,
graph,
*dependency,
format,
symbols,
prefix,
no_dedupe,
max_display_depth,
visited_deps,
levels_continue,
print_stack,
);
levels_continue.pop();
}
}
}