Skip to content

publish: Normalize dependency version requirements #7245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions src/controllers/krate/publish.rs
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,15 @@ fn convert_dependency(
target: Option<&str>,
) -> EncodableCrateDependency {
let details = dep.detail();
let req = dep.req();

// Normalize version requirement with a `parse()` and `to_string()` cycle.
//
// If the value can't be parsed the `validate_dependency()` fn will return
// an error later in the call chain. Parsing the value twice is a bit
// wasteful, but we can clean this up later.
let req = semver::VersionReq::parse(dep.req())
.map(|req| req.to_string())
.unwrap_or_else(|_| dep.req().to_string());

let (crate_name, explicit_name_in_toml) = match details.and_then(|it| it.package.clone()) {
None => (name.to_string(), None),
Expand All @@ -522,7 +530,7 @@ fn convert_dependency(

EncodableCrateDependency {
name: crate_name,
version_req: req.to_string(),
version_req: req,
optional,
default_features,
features,
Expand Down
5 changes: 4 additions & 1 deletion src/tests/krate/publish/dependencies.rs
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,10 @@ fn new_krate_with_dependency() {

assert_eq!(dependencies.len(), 1);
assert_eq!(dependencies[0].crate_id, "foo-dep");
assert_eq!(dependencies[0].req, "1.0.0");
assert_eq!(dependencies[0].req, "^1.0.0");

let crates = app.crates_from_index_head("new_dep");
assert_json_snapshot!(crates);
}

#[test]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ expression: crates
"deps": [
{
"name": "dep-a",
"req": "> 0",
"req": ">0",
"features": [],
"optional": false,
"default_features": true,
Expand All @@ -18,7 +18,7 @@ expression: crates
},
{
"name": "dep-b",
"req": "> 0",
"req": ">0",
"features": [],
"optional": false,
"default_features": true,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
---
source: src/tests/krate/publish/dependencies.rs
expression: crates
---
[
{
"name": "new_dep",
"vers": "1.0.0",
"deps": [
{
"name": "foo-dep",
"req": "^1.0.0",
"features": [],
"optional": false,
"default_features": true,
"target": null,
"kind": "normal"
}
],
"cksum": "b1ce14dbe59036a964369747770d2d64695039065384b1ab56f09a59525300a6",
"features": {},
"yanked": false
}
]
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ expression: crates
"deps": [
{
"name": "my-name",
"req": "> 0",
"req": ">0",
"features": [],
"optional": false,
"default_features": true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ expression: crates
"deps": [
{
"name": "_my-name",
"req": "> 0",
"req": ">0",
"features": [],
"optional": false,
"default_features": true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ expression: crates
"deps": [
{
"name": "bar",
"req": "> 0",
"req": ">0",
"features": [],
"optional": false,
"default_features": true,
Expand Down