Skip to content

Commit

Permalink
Update to semver forked from newer master
Browse files Browse the repository at this point in the history
  • Loading branch information
illicitonion committed Mar 20, 2020
1 parent 4c7a638 commit e8b0344
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ percent-encoding = "2.0"
remove_dir_all = "0.5.2"
rustfix = "0.5.0"
same-file = "1"
semver = { version = "0.9.0", features = ["serde"] }
semver = { git = "https://github.com/illicitonion/semver.git", rev = "f1f912703f67ed63b751c525839731a90239bdcf", features = ["serde"] }
serde = { version = "1.0.82", features = ["derive"] }
serde_ignored = "0.1.0"
serde_json = { version = "1.0.30", features = ["raw_value"] }
Expand Down
4 changes: 2 additions & 2 deletions crates/resolver-tests/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -738,8 +738,8 @@ fn meta_test_deep_pretty_print_registry() {
"vec![pkg!((\"foo\", \"1.0.1\") => [dep_req(\"bar\", \"^1\"),]),\
pkg!((\"foo\", \"1.0.0\") => [dep_req(\"bar\", \"^2\"),]),\
pkg!((\"foo\", \"2.0.0\") => [dep(\"bar\"),]),\
pkg!((\"bar\", \"1.0.0\") => [dep_req(\"baz\", \"= 1.0.2\"),dep_req(\"other\", \"^1\"),]),\
pkg!((\"bar\", \"2.0.0\") => [dep_req(\"baz\", \"= 1.0.1\"),]),\
pkg!((\"bar\", \"1.0.0\") => [dep_req(\"baz\", \"=1.0.2\"),dep_req(\"other\", \"^1\"),]),\
pkg!((\"bar\", \"2.0.0\") => [dep_req(\"baz\", \"=1.0.1\"),]),\
pkg!((\"baz\", \"1.0.2\") => [dep_req(\"other\", \"^2\"),]),\
pkg!((\"baz\", \"1.0.1\")),\
pkg!((\"cat\", \"1.0.2\") => [dep_req_kind(\"other\", \"^2\", DepKind::Build, false),]),\
Expand Down
4 changes: 2 additions & 2 deletions tests/testsuite/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -993,7 +993,7 @@ fn incompatible_dependencies() {
error: failed to select a version for `bad`.
... required by package `qux v0.1.0`
... which is depended on by `foo v0.0.1 ([..])`
versions that meet the requirements `>= 1.0.1` are: 1.0.2, 1.0.1
versions that meet the requirements `>=1.0.1` are: 1.0.2, 1.0.1
all possible versions conflict with previously selected packages.
Expand Down Expand Up @@ -1038,7 +1038,7 @@ fn incompatible_dependencies_with_multi_semver() {
"\
error: failed to select a version for `bad`.
... required by package `foo v0.0.1 ([..])`
versions that meet the requirements `>= 1.0.1, <= 2.0.0` are: 2.0.0, 1.0.1
versions that meet the requirements `>=1.0.1, <=2.0.0` are: 2.0.0, 1.0.1
all possible versions conflict with previously selected packages.
Expand Down
6 changes: 3 additions & 3 deletions tests/testsuite/registry.rs
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ fn wrong_version() {
.with_status(101)
.with_stderr_contains(
"\
error: failed to select a version for the requirement `foo = \">= 1.0.0\"`
error: failed to select a version for the requirement `foo = \">=1.0.0\"`
candidate versions found which didn't match: 0.0.2, 0.0.1
location searched: `[..]` index (which is replacing registry `[..]`)
required by package `foo v0.0.1 ([..])`
Expand All @@ -240,7 +240,7 @@ required by package `foo v0.0.1 ([..])`
.with_status(101)
.with_stderr_contains(
"\
error: failed to select a version for the requirement `foo = \">= 1.0.0\"`
error: failed to select a version for the requirement `foo = \">=1.0.0\"`
candidate versions found which didn't match: 0.0.4, 0.0.3, 0.0.2, ...
location searched: `[..]` index (which is replacing registry `[..]`)
required by package `foo v0.0.1 ([..])`
Expand Down Expand Up @@ -540,7 +540,7 @@ fn relying_on_a_yank_is_bad() {
.with_status(101)
.with_stderr_contains(
"\
error: failed to select a version for the requirement `baz = \"= 0.0.2\"`
error: failed to select a version for the requirement `baz = \"=0.0.2\"`
candidate versions found which didn't match: 0.0.1
location searched: `[..]` index (which is replacing registry `[..]`)
required by package `bar v0.0.1`
Expand Down
2 changes: 1 addition & 1 deletion tests/testsuite/replace.rs
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,7 @@ fn override_wrong_name() {
Caused by:
no matching package for override `[..]baz:0.1.0` found
location searched: file://[..]
version required: = 0.1.0
version required: =0.1.0
",
)
.run();
Expand Down

0 comments on commit e8b0344

Please sign in to comment.