test(pkgid): Show existing pkgid behavior

Author: epage

crates/cargo-util-schemas/src/core/package_id_spec.rs

@@ -437,6 +437,7 @@ mod tests {
             },
             "foo",
         );
+        err!("foo::bar", ErrorKind::PartialVersion(_));
         ok(
             "foo:1.2.3",
             PackageIdSpec {
@@ -447,6 +448,7 @@ mod tests {
             },
             "[email protected]",
         );
+        err!("foo::bar:1.2.3", ErrorKind::PartialVersion(_));
         ok(
             "[email protected]",
             PackageIdSpec {
@@ -457,6 +459,7 @@ mod tests {
             },
             "[email protected]",
         );
+        err!("foo::[email protected]", ErrorKind::PartialVersion(_));
         ok(
             "[email protected]",
             PackageIdSpec {
@@ -591,6 +594,16 @@ mod tests {
             },
             "file:///path/to/my/project/foo",
         );
+        ok(
+            "file:///path/to/my/project/foo::bar",
+            PackageIdSpec {
+                name: String::from("foo::bar"),
+                version: None,
+                url: Some(Url::parse("file:///path/to/my/project/foo::bar").unwrap()),
+                kind: None,
+            },
+            "file:///path/to/my/project/foo::bar",
+        );
         ok(
             "file:///path/to/my/project/foo#1.1.8",
             PackageIdSpec {
@@ -611,6 +624,48 @@ mod tests {
             },
             "path+file:///path/to/my/project/foo#1.1.8",
         );
+        ok(
+            "path+file:///path/to/my/project/foo#bar",
+            PackageIdSpec {
+                name: String::from("bar"),
+                version: None,
+                url: Some(Url::parse("file:///path/to/my/project/foo").unwrap()),
+                kind: Some(SourceKind::Path),
+            },
+            "path+file:///path/to/my/project/foo#bar",
+        );
+        err!(
+            "path+file:///path/to/my/project/foo#foo::bar",
+            ErrorKind::PartialVersion(_)
+        );
+        ok(
+            "path+file:///path/to/my/project/foo#bar:1.1.8",
+            PackageIdSpec {
+                name: String::from("bar"),
+                version: Some("1.1.8".parse().unwrap()),
+                url: Some(Url::parse("file:///path/to/my/project/foo").unwrap()),
+                kind: Some(SourceKind::Path),
+            },
+            "path+file:///path/to/my/project/foo#[email protected]",
+        );
+        err!(
+            "path+file:///path/to/my/project/foo#foo::bar:1.1.8",
+            ErrorKind::PartialVersion(_)
+        );
+        ok(
+            "path+file:///path/to/my/project/foo#[email protected]",
+            PackageIdSpec {
+                name: String::from("bar"),
+                version: Some("1.1.8".parse().unwrap()),
+                url: Some(Url::parse("file:///path/to/my/project/foo").unwrap()),
+                kind: Some(SourceKind::Path),
+            },
+            "path+file:///path/to/my/project/foo#[email protected]",
+        );
+        err!(
+            "path+file:///path/to/my/project/foo#foo::[email protected]",
+            ErrorKind::PartialVersion(_)
+        );
     }
 
     #[test]

tests/testsuite/open_namespaces.rs

@@ -327,6 +327,106 @@ fn main() {}
         .run();
 }
 
+#[cargo_test]
+fn generate_pkgid_with_namespace() {
+    let p = project()
+        .file(
+            "Cargo.toml",
+            r#"
+                cargo-features = ["open-namespaces"]
+
+                [package]
+                name = "foo::bar"
+                version = "0.0.1"
+                edition = "2015"
+            "#,
+        )
+        .file("src/lib.rs", "")
+        .build();
+
+    p.cargo("generate-lockfile")
+        .masquerade_as_nightly_cargo(&["open-namespaces"])
+        .run();
+    p.cargo("pkgid")
+        .masquerade_as_nightly_cargo(&["open-namespaces"])
+        .with_stdout_data(str![[r#"
+path+[ROOTURL]/foo#foo::[email protected]
+
+"#]])
+        .with_stderr_data("")
+        .run()
+}
+
+#[cargo_test]
+fn update_spec_accepts_namespaced_name() {
+    let p = project()
+        .file(
+            "Cargo.toml",
+            r#"
+                cargo-features = ["open-namespaces"]
+
+                [package]
+                name = "foo::bar"
+                version = "0.0.1"
+                edition = "2015"
+            "#,
+        )
+        .file("src/lib.rs", "")
+        .build();
+
+    p.cargo("generate-lockfile")
+        .masquerade_as_nightly_cargo(&["open-namespaces"])
+        .run();
+    p.cargo("update foo::bar")
+        .masquerade_as_nightly_cargo(&["open-namespaces"])
+        .with_status(101)
+        .with_stdout_data(str![""])
+        .with_stderr_data(str![[r#"
+[ERROR] invalid package ID specification: `foo::bar`
+
+	Did you mean `foo::bar`?
+
+Caused by:
+  expected a version like "1.32"
+
+"#]])
+        .run()
+}
+
+#[cargo_test]
+fn update_spec_accepts_namespaced_pkgid() {
+    let p = project()
+        .file(
+            "Cargo.toml",
+            r#"
+                cargo-features = ["open-namespaces"]
+
+                [package]
+                name = "foo::bar"
+                version = "0.0.1"
+                edition = "2015"
+            "#,
+        )
+        .file("src/lib.rs", "")
+        .build();
+
+    p.cargo("generate-lockfile")
+        .masquerade_as_nightly_cargo(&["open-namespaces"])
+        .run();
+    p.cargo(&format!("update path+{}#foo::[email protected]", p.url()))
+        .masquerade_as_nightly_cargo(&["open-namespaces"])
+        .with_status(101)
+        .with_stdout_data(str![""])
+        .with_stderr_data(str![[r#"
+[ERROR] invalid package ID specification: `path+[ROOTURL]/foo#foo::[email protected]`
+
+Caused by:
+  expected a version like "1.32"
+
+"#]])
+        .run()
+}
+
 #[cargo_test]
 #[cfg(unix)] // until we get proper packaging support
 fn publish_namespaced() {