Properly fix assertion and tests

rust-lang · Apr 26, 2019 · f4aac94 · f4aac94
1 parent 2de44c4
commit f4aac94
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/cargo/core/dependency.rs b/src/cargo/core/dependency.rs
@@ -301,8 +301,8 @@ impl Dependency {
 
     /// Sets whether the dependency is public.
     pub fn set_public(&mut self, public: bool) -> &mut Dependency {
-        if !public {
-            // Setting 'private' only makes sense for normal dependencies
+        if public {
+            // Setting 'public' only makes sense for normal dependencies
             assert_eq!(self.kind(), Kind::Normal);
         }
         Rc::make_mut(&mut self.inner).public = public;

diff --git a/tests/testsuite/support/resolver.rs b/tests/testsuite/support/resolver.rs
@@ -348,8 +348,8 @@ fn meta_test_deep_pretty_print_registry() {
                 pkg!(("baz", "1.0.1")),
                 pkg!(("cat", "1.0.2") => [dep_req_kind("other", "2", Kind::Build, false)]),
                 pkg!(("cat", "1.0.3") => [dep_req_kind("other", "2", Kind::Development, false)]),
-                pkg!(("cat", "1.0.4") => [dep_req_kind("other", "2", Kind::Build, true)]),
-                pkg!(("cat", "1.0.5") => [dep_req_kind("other", "2", Kind::Development, true)]),
+                pkg!(("cat", "1.0.4") => [dep_req_kind("other", "2", Kind::Build, false)]),
+                pkg!(("cat", "1.0.5") => [dep_req_kind("other", "2", Kind::Development, false)]),
                 pkg!(("dep_req", "1.0.0")),
                 pkg!(("dep_req", "2.0.0")),
             ])
@@ -363,8 +363,8 @@ fn meta_test_deep_pretty_print_registry() {
          pkg!((\"baz\", \"1.0.1\")),\
          pkg!((\"cat\", \"1.0.2\") => [dep_req_kind(\"other\", \"^2\", Kind::Build, false),]),\
          pkg!((\"cat\", \"1.0.3\") => [dep_req_kind(\"other\", \"^2\", Kind::Development, false),]),\
-         pkg!((\"cat\", \"1.0.4\") => [dep_req_kind(\"other\", \"^2\", Kind::Build, true),]),\
-         pkg!((\"cat\", \"1.0.5\") => [dep_req_kind(\"other\", \"^2\", Kind::Development, true),]),\
+         pkg!((\"cat\", \"1.0.4\") => [dep_req_kind(\"other\", \"^2\", Kind::Build, false),]),\
+         pkg!((\"cat\", \"1.0.5\") => [dep_req_kind(\"other\", \"^2\", Kind::Development, false),]),\
          pkg!((\"dep_req\", \"1.0.0\")),\
          pkg!((\"dep_req\", \"2.0.0\")),]"
     )