Extend pkgid syntax with @ support
#10582
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -41,8 +41,10 @@ impl PackageIdSpec { | |
| /// "https://crates.io/foo", | ||
| /// "https://crates.io/foo#1.2.3", | ||
| /// "https://crates.io/foo#bar:1.2.3", | ||
| /// "https://crates.io/foo#[email protected]", | ||
| /// "foo", | ||
| /// "foo:1.2.3", | ||
| /// "[email protected]", | ||
| /// ]; | ||
| /// for spec in specs { | ||
| /// assert!(PackageIdSpec::parse(spec).is_ok()); | ||
|
|
@@ -65,7 +67,7 @@ impl PackageIdSpec { | |
| ); | ||
| } | ||
| } | ||
| let mut parts = spec.splitn(2, [':', '@']); | ||
| let name = parts.next().unwrap(); | ||
| let version = match parts.next() { | ||
| Some(version) => Some(version.to_semver()?), | ||
|
|
@@ -122,7 +124,7 @@ impl PackageIdSpec { | |
| })?; | ||
| match frag { | ||
| Some(fragment) => { | ||
| let mut parts = fragment.splitn(2, [':', '@']); | ||
| let name_or_version = parts.next().unwrap(); | ||
| match parts.next() { | ||
| Some(part) => { | ||
|
|
@@ -268,7 +270,7 @@ impl PackageIdSpec { | |
| } | ||
| for id in ids { | ||
| if version_cnt[id.version()] == 1 { | ||
| msg.push_str(&format!("\n {}@{}", spec.name(), id.version())); | ||
| } else { | ||
| msg.push_str(&format!("\n {}", PackageIdSpec::from_package_id(*id))); | ||
| } | ||
|
|
@@ -290,11 +292,11 @@ impl fmt::Display for PackageIdSpec { | |
| } | ||
| None => { | ||
| printed_name = true; | ||
| write!(f, "{}", self.name)?; | ||
| } | ||
| } | ||
| if let Some(ref v) = self.version { | ||
| write!(f, "{}{}", if printed_name { "@" } else { "#" }, v)?; | ||
| } | ||
| Ok(()) | ||
| } | ||
|
|
@@ -329,10 +331,11 @@ mod tests { | |
|
|
||
| #[test] | ||
| fn good_parsing() { | ||
| #[track_caller] | ||
| fn ok(spec: &str, expected: PackageIdSpec, expected_rendered: &str) { | ||
| let parsed = PackageIdSpec::parse(spec).unwrap(); | ||
| assert_eq!(parsed, expected); | ||
| assert_eq!(parsed.to_string(), expected_rendered); | ||
| } | ||
|
|
||
| ok( | ||
|
|
@@ -342,6 +345,7 @@ mod tests { | |
| version: None, | ||
| url: Some(Url::parse("https://crates.io/foo").unwrap()), | ||
| }, | ||
| "https://crates.io/foo", | ||
| ); | ||
| ok( | ||
| "https://crates.io/foo#1.2.3", | ||
|
|
@@ -350,6 +354,7 @@ mod tests { | |
| version: Some("1.2.3".to_semver().unwrap()), | ||
| url: Some(Url::parse("https://crates.io/foo").unwrap()), | ||
| }, | ||
| "https://crates.io/foo#1.2.3", | ||
| ); | ||
| ok( | ||
| "https://crates.io/foo#bar:1.2.3", | ||
|
|
@@ -358,6 +363,16 @@ mod tests { | |
| version: Some("1.2.3".to_semver().unwrap()), | ||
| url: Some(Url::parse("https://crates.io/foo").unwrap()), | ||
| }, | ||
| "https://crates.io/foo#[email protected]", | ||
| ); | ||
| ok( | ||
| "https://crates.io/foo#[email protected]", | ||
| PackageIdSpec { | ||
| name: InternedString::new("bar"), | ||
| version: Some("1.2.3".to_semver().unwrap()), | ||
| url: Some(Url::parse("https://crates.io/foo").unwrap()), | ||
| }, | ||
| "https://crates.io/foo#[email protected]", | ||
| ); | ||
| ok( | ||
| "foo", | ||
|
|
@@ -366,6 +381,7 @@ mod tests { | |
| version: None, | ||
| url: None, | ||
| }, | ||
| "foo", | ||
| ); | ||
| ok( | ||
| "foo:1.2.3", | ||
|
|
@@ -374,6 +390,16 @@ mod tests { | |
| version: Some("1.2.3".to_semver().unwrap()), | ||
| url: None, | ||
| }, | ||
| "[email protected]", | ||
| ); | ||
| ok( | ||
| "[email protected]", | ||
| PackageIdSpec { | ||
| name: InternedString::new("foo"), | ||
| version: Some("1.2.3".to_semver().unwrap()), | ||
| url: None, | ||
| }, | ||
| "[email protected]", | ||
| ); | ||
| } | ||
|
|
||
|
|
@@ -382,6 +408,9 @@ mod tests { | |
| assert!(PackageIdSpec::parse("baz:").is_err()); | ||
| assert!(PackageIdSpec::parse("baz:*").is_err()); | ||
| assert!(PackageIdSpec::parse("baz:1.0").is_err()); | ||
| assert!(PackageIdSpec::parse("baz@").is_err()); | ||
| assert!(PackageIdSpec::parse("baz@*").is_err()); | ||
| assert!(PackageIdSpec::parse("[email protected]").is_err()); | ||
| assert!(PackageIdSpec::parse("https://baz:1.0").is_err()); | ||
| assert!(PackageIdSpec::parse("https://#baz:1.0").is_err()); | ||
| } | ||
|
|
@@ -397,5 +426,7 @@ mod tests { | |
| assert!(!PackageIdSpec::parse("foo").unwrap().matches(bar)); | ||
| assert!(PackageIdSpec::parse("foo:1.2.3").unwrap().matches(foo)); | ||
| assert!(!PackageIdSpec::parse("foo:1.2.2").unwrap().matches(foo)); | ||
| assert!(PackageIdSpec::parse("[email protected]").unwrap().matches(foo)); | ||
| assert!(!PackageIdSpec::parse("[email protected]").unwrap().matches(foo)); | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,12 +9,12 @@ is a string which is used to uniquely refer to one package within a graph of | |
| packages. | ||
|
|
||
| The specification may be fully qualified, such as | ||
| `https://github.com/rust-lang/crates.io-index#regex@1.4.3` or it may be | ||
| abbreviated, such as `regex`. The abbreviated form may be used as long as it | ||
| uniquely identifies a single package in the dependency graph. If there is | ||
| ambiguity, additional qualifiers can be added to make it unique. For example, | ||
| if there are two versions of the `regex` package in the graph, then it can be | ||
| qualified with a version to make it unique, such as `regex@1.4.3`. | ||
|
|
||
| #### Specification grammar | ||
|
|
||
|
|
@@ -23,7 +23,7 @@ The formal grammar for a Package Id Specification is: | |
| ```notrust | ||
| spec := pkgname | ||
| | proto "://" hostname-and-path [ "#" ( pkgname | semver ) ] | ||
| pkgname := name [ ("@" | ":" ) semver ] | ||
|
|
||
| proto := "http" | "git" | ... | ||
| ``` | ||
|
|
@@ -40,17 +40,17 @@ The following are references to the `regex` package on `crates.io`: | |
| | Spec | Name | Version | | ||
| |:------------------------------------------------------------|:-------:|:-------:| | ||
| | `regex` | `regex` | `*` | | ||
| | `regex@1.4.3` | `regex` | `1.4.3` | | ||
| | `https://github.com/rust-lang/crates.io-index#regex` | `regex` | `*` | | ||
| | `https://github.com/rust-lang/crates.io-index#regex@1.4.3` | `regex` | `1.4.3` | | ||
|
|
||
| The following are some examples of specs for several different git dependencies: | ||
|
|
||
| | Spec | Name | Version | | ||
| |:----------------------------------------------------------|:----------------:|:--------:| | ||
| | `https://github.com/rust-lang/cargo#0.52.0` | `cargo` | `0.52.0` | | ||
| | `https://github.com/rust-lang/cargo#cargo-platform@0.1.2` | <nobr>`cargo-platform`</nobr> | `0.1.2` | | ||
| | `ssh://[email protected]/rust-lang/regex.git#regex@1.4.3` | `regex` | `1.4.3` | | ||
|
|
||
| Local packages on the filesystem can use `file://` URLs to reference them: | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -361,7 +361,7 @@ fn yank() { | |
| .with_stderr( | ||
| "\ | ||
| [UPDATING] [..] | ||
| [YANK] foo@0.1.0 | ||
| ", | ||
| ) | ||
| .run(); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
And with the following line:
This changes how the reports are created on disk. The
report future-incompat --packageflag doesn't take a package-spec but whatever was put into the report here.:but thenreport future-incompatwill only accept:report future-incompattry to generate both formatsAny thoughts? @joshtriplett since I think you had worked on this
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@epage We discussed this in the Cargo meeting; summary: go ahead and change it, don't worry about
:at all. There's a format version number that you could bump so that old Cargo doesn't think it can read this.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've not dug further but from what I've seen of the code and failure modes, I don't think we even need to bump the format version number. It looks like
report future-incompatis completely neutral to the pkgid spec format. It accepts a parameter and uses it as a key. You should be able to have old cargo's read the file.