fixup tests

Author: mladedav

tests/testsuite/feature_unification.rs

@@ -253,6 +253,180 @@ fn package_feature_unification() {
         .with_stderr_data(str![[r#"
 [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
 
+"#]])
+        .run();
+    // Sanity check that compilation without package feature unification does not work
+    p.cargo("check -p a -p b")
+        .arg("-Zfeature-unification")
+        .masquerade_as_nightly_cargo(&["feature-unification"])
+        .env("CARGO_RESOLVER_FEATURE_UNIFICATION", "selected")
+        .with_status(101)
+        .with_stderr_contains("[ERROR] features were unified")
+        .run();
+}
+
+#[cargo_test]
+fn feature_unification_cargo_tree() {
+    Package::new("outside", "0.1.0")
+        .feature("a", &[])
+        .feature("b", &[])
+        .file(
+            "src/lib.rs",
+            r#"
+                #[cfg(all(feature = "a", feature = "b"))]
+                compile_error!("features were unified");
+                #[cfg(feature = "a")]
+                pub fn a() {}
+                #[cfg(feature = "b")]
+                pub fn b() {}
+            "#,
+        )
+        .publish();
+
+    let p = project()
+        .file(
+            "Cargo.toml",
+            r#"
+                [workspace]
+                resolver = "2"
+                members = ["common", "a", "b"]
+            "#,
+        )
+        .file(
+            "common/Cargo.toml",
+            r#"
+                [package]
+                name = "common"
+                version = "0.1.0"
+                edition = "2021"
+
+                [features]
+                a = []
+                b = []
+            "#,
+        )
+        .file(
+            "common/src/lib.rs",
+            r#"
+                #[cfg(all(feature = "a", feature = "b"))]
+                compile_error!("features were unified");
+                #[cfg(feature = "a")]
+                pub fn a() {}
+                #[cfg(feature = "b")]
+                pub fn b() {}
+            "#,
+        )
+        .file(
+            "a/Cargo.toml",
+            r#"
+                [package]
+                name = "a"
+                version = "0.1.0"
+                edition = "2021"
+
+                [dependencies]
+                common = { path = "../common", features = ["a"] }
+                outside = { version = "0.1.0", features = ["a"] }
+            "#,
+        )
+        .file("a/src/lib.rs", "pub use common::a;")
+        .file(
+            "b/Cargo.toml",
+            r#"
+                [package]
+                name = "b"
+                version = "0.1.0"
+                edition = "2021"
+
+                [dependencies]
+                common = { path = "../common", features = ["b"] }
+                outside = { version = "0.1.0", features = ["b"] }
+            "#,
+        )
+        .file("b/src/lib.rs", "pub use common::b;")
+        .build();
+
+    p.cargo("tree -e features")
+        .arg("-Zfeature-unification")
+        .masquerade_as_nightly_cargo(&["feature-unification"])
+        .env("CARGO_RESOLVER_FEATURE_UNIFICATION", "selected")
+        .with_stdout_data(str![[r#"
+common v0.1.0 ([ROOT]/foo/common)
+a v0.1.0 ([ROOT]/foo/a)
+├── common feature "a"
+│   └── common v0.1.0 ([ROOT]/foo/common)
+├── common feature "default"
+│   └── common v0.1.0 ([ROOT]/foo/common)
+├── outside feature "a"
+│   └── outside v0.1.0
+└── outside feature "default"
+    └── outside v0.1.0
+b v0.1.0 ([ROOT]/foo/b)
+├── common feature "b"
+│   └── common v0.1.0 ([ROOT]/foo/common)
+├── common feature "default"
+│   └── common v0.1.0 ([ROOT]/foo/common)
+├── outside feature "b"
+│   └── outside v0.1.0
+└── outside feature "default"
+    └── outside v0.1.0 ([ROOT]/foo/common)
+
+"#]])
+        .run();
+
+    p.cargo("tree -e features")
+        .arg("-Zfeature-unification")
+        .masquerade_as_nightly_cargo(&["feature-unification"])
+        .env("CARGO_RESOLVER_FEATURE_UNIFICATION", "package")
+        .with_stdout_data(str![[r#"
+common v0.1.0 ([ROOT]/foo/common)
+a v0.1.0 ([ROOT]/foo/a)
+├── common feature "a"
+│   └── common v0.1.0 ([ROOT]/foo/common)
+├── common feature "default"
+│   └── common v0.1.0 ([ROOT]/foo/common)
+├── outside feature "a"
+│   └── outside v0.1.0
+└── outside feature "default"
+    └── outside v0.1.0
+b v0.1.0 ([ROOT]/foo/b)
+├── common feature "b"
+│   └── common v0.1.0 ([ROOT]/foo/common)
+├── common feature "default"
+│   └── common v0.1.0 ([ROOT]/foo/common)
+├── outside feature "b"
+│   └── outside v0.1.0
+└── outside feature "default"
+    └── outside v0.1.0
+
+"#]])
+        .run();
+
+    p.cargo("tree -e features")
+        .arg("-Zfeature-unification")
+        .masquerade_as_nightly_cargo(&["feature-unification"])
+        .env("CARGO_RESOLVER_FEATURE_UNIFICATION", "workspace")
+        .with_stdout_data(str![[r#"
+a v0.1.0 ([ROOT]/foo/a)
+├── common feature "a"
+│   └── common v0.1.0 ([ROOT]/foo/common)
+├── common feature "default" (command-line)
+│   └── common v0.1.0 ([ROOT]/foo/common)
+├── outside feature "a"
+│   └── outside v0.1.0
+└── outside feature "default"
+    └── outside v0.1.0
+
+b v0.1.0 ([ROOT]/foo/b)
+├── common feature "b"
+│   └── common v0.1.0 ([ROOT]/foo/common)
+├── common feature "default" (command-line) (*)
+├── outside feature "b"
+│   └── outside v0.1.0
+└── outside feature "default" (*)
+
+common v0.1.0 ([ROOT]/foo/common)
+
 "#]])
         .run();
 }