test(priv_dep): cargo-test-support support public dependency.

rust-lang · Dec 19, 2023 · d2b4b70 · d2b4b70
1 parent 10ff613
commit d2b4b70
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 29 deletions.
diff --git a/crates/cargo-test-support/src/registry.rs b/crates/cargo-test-support/src/registry.rs
@@ -558,6 +558,7 @@ pub struct Dependency {
     package: Option<String>,
     optional: bool,
     default_features: bool,
+    public: bool,
 }
 
 /// Entry with data that corresponds to [`tar::EntryType`].
@@ -1678,6 +1679,7 @@ impl Dependency {
             optional: false,
             registry: None,
             default_features: true,
+            public: false,
         }
     }
 
@@ -1731,6 +1733,12 @@ impl Dependency {
         self
     }
 
+    /// Changes this to an public dependency.
+    pub fn public(&mut self, public: bool) -> &mut Self {
+        self.public = public;
+        self
+    }
+
     /// Adds `default-features = false` if the argument is `false`.
     pub fn default_features(&mut self, default_features: bool) -> &mut Self {
         self.default_features = default_features;

diff --git a/tests/testsuite/pub_priv.rs b/tests/testsuite/pub_priv.rs
@@ -1,7 +1,7 @@
 //! Tests for public/private dependencies.
 
 use cargo_test_support::project;
-use cargo_test_support::registry::Package;
+use cargo_test_support::registry::{Dependency, Package};
 
 #[cargo_test(nightly, reason = "exported_private_dependencies lint is unstable")]
 fn exported_priv_warning() {
@@ -486,7 +486,8 @@ fn recursive_package_pub_no_warning() {
         .file("src/lib.rs", "pub struct FromPub;")
         .publish();
     Package::new("parent_bar", "0.1.0")
-        .dep("grandparent_bar", "0.1.0")
+        .cargo_feature("public-dependency")
+        .add_dep(Dependency::new("grandparent_bar", "0.1.0").public(true))
         .file(
             "src/lib.rs",
             "
@@ -496,7 +497,8 @@ fn recursive_package_pub_no_warning() {
         )
         .publish();
     Package::new("pub_dep", "0.1.0")
-        .dep("parent_bar", "0.1.0")
+        .cargo_feature("public-dependency")
+        .add_dep(Dependency::new("parent_bar", "0.1.0").public(true))
         .file(
             "src/lib.rs",
             "
@@ -530,18 +532,8 @@ fn recursive_package_pub_no_warning() {
 
     p.cargo("check --message-format=short")
         .masquerade_as_nightly_cargo(&["public-dependency"])
-        .with_stderr(
-            "\
-[UPDATING] `[..]` index
-[DOWNLOADING] crates ...
-[DOWNLOADED] pub_dep v0.1.0 ([..])
-[DOWNLOADED] parent_bar v0.1.0 ([..])
-[DOWNLOADED] grandparent_bar v0.1.0 ([..])
-[CHECKING] grandparent_bar v0.1.0
-[CHECKING] parent_bar v0.1.0
-[CHECKING] pub_dep v0.1.0
-[CHECKING] foo v0.0.1 ([CWD])
-[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]",
+        .with_stderr_contains(
+"src/lib.rs:3:13: warning: type `FromPub` from private dependency 'grandparent_bar' in public interface"
         )
         .run()
 }
@@ -552,7 +544,8 @@ fn recursive_package_priv_warning() {
         .file("src/lib.rs", "pub struct FromPriv;")
         .publish();
     Package::new("parent_bar", "0.1.0")
-        .dep("grandparent_bar", "0.1.0")
+        .cargo_feature("public-dependency")
+        .add_dep(Dependency::new("grandparent_bar", "0.1.0").public(true))
         .file(
             "src/lib.rs",
             "
@@ -562,7 +555,8 @@ fn recursive_package_priv_warning() {
         )
         .publish();
     Package::new("priv_dep", "0.1.0")
-        .dep("parent_bar", "0.1.0")
+        .cargo_feature("public-dependency")
+        .add_dep(Dependency::new("parent_bar", "0.1.0").public(true))
         .file(
             "src/lib.rs",
             "
@@ -596,18 +590,8 @@ fn recursive_package_priv_warning() {
 
     p.cargo("check --message-format=short")
         .masquerade_as_nightly_cargo(&["public-dependency"])
-        .with_stderr(
-            "\
-[UPDATING] `[..]` index
-[DOWNLOADING] crates ...
-[DOWNLOADED] priv_dep v0.1.0 ([..])
-[DOWNLOADED] parent_bar v0.1.0 ([..])
-[DOWNLOADED] grandparent_bar v0.1.0 ([..])
-[CHECKING] grandparent_bar v0.1.0
-[CHECKING] parent_bar v0.1.0
-[CHECKING] priv_dep v0.1.0
-[CHECKING] foo v0.0.1 ([CWD])
-[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]",
+        .with_stderr_contains(
+"src/lib.rs:3:13: warning: type `FromPriv` from private dependency 'grandparent_bar' in public interface"
         )
         .run()
 }