Skip to content

Commit af13ccb

Browse files
committed
test(tree): Migrate to --edges public
Some packages had their `(*)` removed in this change. This is because we skip `(*)` if, at the time of printing, we don't think there are dependencies. `--edges` get filtered before printing, removing some `(*)`. `--depth` gets filtered while printing, leaving `(*)` in place.
1 parent 99d3fed commit af13ccb

File tree

2 files changed

+31
-31
lines changed

2 files changed

+31
-31
lines changed

tests/testsuite/cargo_tree/deps.rs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1903,7 +1903,7 @@ c v0.1.0 ([ROOT]/foo/c) (*)
19031903
}
19041904

19051905
#[cargo_test(nightly, reason = "exported_private_dependencies lint is unstable")]
1906-
fn depth_public() {
1906+
fn edge_public() {
19071907
let p = project()
19081908
.file(
19091909
"Cargo.toml",
@@ -1964,37 +1964,37 @@ fn depth_public() {
19641964
.file("dep/src/lib.rs", "")
19651965
.build();
19661966

1967-
p.cargo("tree --depth public")
1968-
.masquerade_as_nightly_cargo(&["public-dependency", "depth-public"])
1967+
p.cargo("tree --edges public")
1968+
.masquerade_as_nightly_cargo(&["public-dependency", "edge-public"])
19691969
.with_status(101)
19701970
.with_stderr_data(str![[r#"
1971-
[ERROR] `--depth public` requires `-Zunstable-options`
1971+
[ERROR] `--edges public` requires `-Zunstable-options`
19721972
19731973
"#]])
19741974
.run();
19751975

1976-
p.cargo("tree --depth public -p left-pub")
1976+
p.cargo("tree --edges public -p left-pub")
19771977
.arg("-Zunstable-options")
1978-
.masquerade_as_nightly_cargo(&["public-dependency", "depth-public"])
1978+
.masquerade_as_nightly_cargo(&["public-dependency", "edge-public"])
19791979
.with_stdout_data(str![[r#"
19801980
left-pub v0.1.0 ([ROOT]/foo/left-pub)
19811981
└── dep v0.1.0 ([ROOT]/foo/dep)
19821982
19831983
"#]])
19841984
.run();
19851985

1986-
p.cargo("tree --depth public -p right-priv")
1986+
p.cargo("tree --edges public -p right-priv")
19871987
.arg("-Zunstable-options")
1988-
.masquerade_as_nightly_cargo(&["public-dependency", "depth-public"])
1988+
.masquerade_as_nightly_cargo(&["public-dependency", "edge-public"])
19891989
.with_stdout_data(str![[r#"
19901990
right-priv v0.1.0 ([ROOT]/foo/right-priv)
19911991
19921992
"#]])
19931993
.run();
19941994

1995-
p.cargo("tree --depth public -p diamond")
1995+
p.cargo("tree --edges public -p diamond")
19961996
.arg("-Zunstable-options")
1997-
.masquerade_as_nightly_cargo(&["public-dependency", "depth-public"])
1997+
.masquerade_as_nightly_cargo(&["public-dependency", "edge-public"])
19981998
.with_stdout_data(str![[r#"
19991999
diamond v0.1.0 ([ROOT]/foo/diamond)
20002000
├── left-pub v0.1.0 ([ROOT]/foo/left-pub)
@@ -2004,9 +2004,9 @@ diamond v0.1.0 ([ROOT]/foo/diamond)
20042004
"#]])
20052005
.run();
20062006

2007-
p.cargo("tree --depth public")
2007+
p.cargo("tree --edges public")
20082008
.arg("-Zunstable-options")
2009-
.masquerade_as_nightly_cargo(&["public-dependency", "depth-public"])
2009+
.masquerade_as_nightly_cargo(&["public-dependency", "edge-public"])
20102010
.with_stdout_data(str![[r#"
20112011
dep v0.1.0 ([ROOT]/foo/dep)
20122012
@@ -2017,14 +2017,14 @@ diamond v0.1.0 ([ROOT]/foo/diamond)
20172017
20182018
left-pub v0.1.0 ([ROOT]/foo/left-pub) (*)
20192019
2020-
right-priv v0.1.0 ([ROOT]/foo/right-priv) (*)
2020+
right-priv v0.1.0 ([ROOT]/foo/right-priv)
20212021
20222022
"#]])
20232023
.run();
20242024

2025-
p.cargo("tree --depth public --invert dep")
2025+
p.cargo("tree --edges public --invert dep")
20262026
.arg("-Zunstable-options")
2027-
.masquerade_as_nightly_cargo(&["public-dependency", "depth-public"])
2027+
.masquerade_as_nightly_cargo(&["public-dependency", "edge-public"])
20282028
.with_stdout_data(str![[r#"
20292029
dep v0.1.0 ([ROOT]/foo/dep)
20302030
└── left-pub v0.1.0 ([ROOT]/foo/left-pub)

tests/testsuite/cargo_tree/features.rs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ foo v0.1.0 ([ROOT]/foo)
352352
}
353353

354354
#[cargo_test(nightly, reason = "exported_private_dependencies lint is unstable")]
355-
fn depth_public_no_features() {
355+
fn edge_public_no_features() {
356356
Package::new("pub-defaultdep", "1.0.0").publish();
357357
Package::new("priv-defaultdep", "1.0.0").publish();
358358

@@ -374,9 +374,9 @@ fn depth_public_no_features() {
374374
.file("src/lib.rs", "")
375375
.build();
376376

377-
p.cargo("tree -e features --depth public")
377+
p.cargo("tree -e features --edges public")
378378
.arg("-Zunstable-options")
379-
.masquerade_as_nightly_cargo(&["public-dependency", "depth-public"])
379+
.masquerade_as_nightly_cargo(&["public-dependency", "edge-public"])
380380
.with_stdout_data(str![[r#"
381381
foo v0.1.0 ([ROOT]/foo)
382382
└── pub-defaultdep feature "default"
@@ -387,7 +387,7 @@ foo v0.1.0 ([ROOT]/foo)
387387
}
388388

389389
#[cargo_test(nightly, reason = "exported_private_dependencies lint is unstable")]
390-
fn depth_public_transitive_features() {
390+
fn edge_public_transitive_features() {
391391
Package::new("pub-defaultdep", "1.0.0")
392392
.feature("default", &["f1"])
393393
.feature("f1", &["f2"])
@@ -423,19 +423,19 @@ fn depth_public_transitive_features() {
423423
.file("src/lib.rs", "")
424424
.build();
425425

426-
p.cargo("tree -e features --depth public")
426+
p.cargo("tree -e features --edges public")
427427
.arg("-Zunstable-options")
428-
.masquerade_as_nightly_cargo(&["public-dependency", "depth-public"])
428+
.masquerade_as_nightly_cargo(&["public-dependency", "edge-public"])
429429
.with_stdout_data(str![[r#"
430430
foo v0.1.0 ([ROOT]/foo)
431431
├── priv-defaultdep feature "default"
432432
│ ├── priv-defaultdep v1.0.0
433433
│ └── priv-defaultdep feature "f1"
434-
│ ├── priv-defaultdep v1.0.0 (*)
434+
│ ├── priv-defaultdep v1.0.0
435435
│ └── priv-defaultdep feature "f2"
436-
│ ├── priv-defaultdep v1.0.0 (*)
436+
│ ├── priv-defaultdep v1.0.0
437437
│ └── priv-defaultdep feature "optdep"
438-
│ └── priv-defaultdep v1.0.0 (*)
438+
│ └── priv-defaultdep v1.0.0
439439
└── pub-defaultdep feature "default"
440440
├── pub-defaultdep v1.0.0
441441
│ └── optdep feature "default"
@@ -454,7 +454,7 @@ foo v0.1.0 ([ROOT]/foo)
454454
}
455455

456456
#[cargo_test(nightly, reason = "exported_private_dependencies lint is unstable")]
457-
fn depth_public_cli() {
457+
fn edge_public_cli() {
458458
Package::new("priv", "1.0.0").feature("f", &[]).publish();
459459
Package::new("pub", "1.0.0").feature("f", &[]).publish();
460460

@@ -482,18 +482,18 @@ fn depth_public_cli() {
482482
.file("src/lib.rs", "")
483483
.build();
484484

485-
p.cargo("tree -e features --depth public")
485+
p.cargo("tree -e features --edges public")
486486
.arg("-Zunstable-options")
487-
.masquerade_as_nightly_cargo(&["public-dependency", "depth-public"])
487+
.masquerade_as_nightly_cargo(&["public-dependency", "edge-public"])
488488
.with_stdout_data(str![[r#"
489489
foo v0.1.0 ([ROOT]/foo)
490490
491491
"#]])
492492
.run();
493493

494-
p.cargo("tree -e features --depth public --features pub-indirect")
494+
p.cargo("tree -e features --edges public --features pub-indirect")
495495
.arg("-Zunstable-options")
496-
.masquerade_as_nightly_cargo(&["public-dependency", "depth-public"])
496+
.masquerade_as_nightly_cargo(&["public-dependency", "edge-public"])
497497
.with_stdout_data(str![[r#"
498498
foo v0.1.0 ([ROOT]/foo)
499499
└── pub feature "default"
@@ -502,9 +502,9 @@ foo v0.1.0 ([ROOT]/foo)
502502
"#]])
503503
.run();
504504

505-
p.cargo("tree -e features --depth public --features priv-indirect")
505+
p.cargo("tree -e features --edges public --features priv-indirect")
506506
.arg("-Zunstable-options")
507-
.masquerade_as_nightly_cargo(&["public-dependency", "depth-public"])
507+
.masquerade_as_nightly_cargo(&["public-dependency", "edge-public"])
508508
.with_stdout_data(str![[r#"
509509
foo v0.1.0 ([ROOT]/foo)
510510

0 commit comments

Comments
 (0)