From b71927224fd9306b2b5bd2b4f8c22268eadfeb6a Mon Sep 17 00:00:00 2001 From: Daniel Wagner-Hall Date: Wed, 20 May 2020 20:38:23 +0100 Subject: [PATCH] Switch to using existing is_locked implementation semver hasn't merged the upstream PR (yet) --- Cargo.toml | 2 +- crates/resolver-tests/src/lib.rs | 4 ++-- src/cargo/ops/cargo_install.rs | 2 +- tests/testsuite/build.rs | 4 ++-- tests/testsuite/install.rs | 2 +- tests/testsuite/install_upgrade.rs | 2 +- tests/testsuite/registry.rs | 6 +++--- tests/testsuite/replace.rs | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index e1a6e06b9d3..ef5857b845b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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"] } diff --git a/crates/resolver-tests/src/lib.rs b/crates/resolver-tests/src/lib.rs index a1cdb9d11a2..ef47f11ffc5 100644 --- a/crates/resolver-tests/src/lib.rs +++ b/crates/resolver-tests/src/lib.rs @@ -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),]),\ diff --git a/src/cargo/ops/cargo_install.rs b/src/cargo/ops/cargo_install.rs index 9434b1b3def..9b1b08a7254 100644 --- a/src/cargo/ops/cargo_install.rs +++ b/src/cargo/ops/cargo_install.rs @@ -559,7 +559,7 @@ fn installed_exact_package( 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); diff --git a/tests/testsuite/build.rs b/tests/testsuite/build.rs index 93b652fb241..dc987c6e602 100644 --- a/tests/testsuite/build.rs +++ b/tests/testsuite/build.rs @@ -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. diff --git a/tests/testsuite/install.rs b/tests/testsuite/install.rs index 01a81fc3e29..68bcf22e8b0 100644 --- a/tests/testsuite/install.rs +++ b/tests/testsuite/install.rs @@ -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(); diff --git a/tests/testsuite/install_upgrade.rs b/tests/testsuite/install_upgrade.rs index 41f00087126..59a904d5854 100644 --- a/tests/testsuite/install_upgrade.rs +++ b/tests/testsuite/install_upgrade.rs @@ -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(); diff --git a/tests/testsuite/registry.rs b/tests/testsuite/registry.rs index 0197facaef7..e298e23e625 100644 --- a/tests/testsuite/registry.rs +++ b/tests/testsuite/registry.rs @@ -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` diff --git a/tests/testsuite/replace.rs b/tests/testsuite/replace.rs index 9672c462974..17149fa6d93 100644 --- a/tests/testsuite/replace.rs +++ b/tests/testsuite/replace.rs @@ -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();