development/cargo
development/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo synced 2024-08-28 11:50:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch to using existing is_locked implementation

Browse source 
semver hasn't merged the upstream PR (yet)
This commit is contained in:
Daniel Wagner-Hall 2020-05-20 20:38:23 +01:00
parent 806490947d
commit b71927224f
8 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -52,7 +52,7 @@ percent-encoding = "2.0"
remove_dir_all = "0.5.2"
rustfix = "0.5.0"
same-file = "1"
semver = { git = "https://github.com/illicitonion/semver.git", rev = "f1f912703f67ed63b751c525839731a90239bdcf", features = ["serde"] }
semver = { version = "0.9.0", features = ["serde"] }
serde = { version = "1.0.82", features = ["derive"] }
serde_ignored = "0.1.0"
serde_json = { version = "1.0.30", features = ["raw_value"] }

4
crates/resolver-tests/src/lib.rs
View file

@ -734,8 +734,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),]),\

2
src/cargo/ops/cargo_install.rs
View file

@ -559,7 +559,7 @@ fn installed_exact_package<T>(
where
T: Source,
{
if !dep.version_req().is_exact() {
if !dep.is_locked() {
// If the version isn't exact, we may need to update the registry and look for a newer
// version - we can't know if the package is installed without doing so.
return Ok(None);

4
tests/testsuite/build.rs
View file

@ -1023,7 +1023,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.
@ -1068,7 +1068,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.

2
tests/testsuite/install.rs
View file

@ -175,7 +175,7 @@ fn bad_version() {
.with_stderr(
"\
[UPDATING] [..] index
[ERROR] could not find `foo` in registry `[..]` with version `=0.2.0`
[ERROR] could not find `foo` in registry `[..]` with version `= 0.2.0`
",
)
.run();

2
tests/testsuite/install_upgrade.rs
View file

@ -802,7 +802,7 @@ fn already_installed_updates_yank_status_on_upgrade() {
.with_stderr(
"\
[UPDATING] `[..]` index
[ERROR] could not find `foo` in registry `[..]` with version `=1.0.1`
[ERROR] could not find `foo` in registry `[..]` with version `= 1.0.1`
",
)
.run();

6
tests/testsuite/registry.rs
View file

@ -223,7 +223,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 ([..])`
@ -238,7 +238,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 ([..])`
@ -543,7 +543,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`

2
tests/testsuite/replace.rs
View file

@ -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();