From 6d1faf9b03e543f41bf770f5038ed1c2ca5c7e70 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 9 Feb 2024 21:55:09 +0000
Subject: [PATCH] Update strsim (changes tests), clap, clap_complete

This is #3002 with tests rerun to account for changes
to `strsim`, as @thoughtpolice noticed in
https://github.com/martinvonz/jj/pull/3002#issuecomment-1936763101

The string similarity changes include an example that
seems better and one that seems worse. Decreasing
the threshold definitely makes things worse.
---
 Cargo.lock               | 24 ++++++++++++------------
 Cargo.toml               |  6 +++---
 lib/tests/test_revset.rs |  3 +--
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 90bfdf1ccd..7b8b28ea7a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -359,9 +359,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.4.18"
+version = "4.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c"
+checksum = "80c21025abd42669a92efc996ef13cfb2c5c627858421ea58d5c3b331a6c134f"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -378,9 +378,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.4.18"
+version = "4.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7"
+checksum = "458bf1f341769dfcf849846f65dffdf9146daa56bcd2a47cb4e1de9915567c99"
 dependencies = [
  "anstream",
  "anstyle",
@@ -391,18 +391,18 @@ dependencies = [
 
 [[package]]
 name = "clap_complete"
-version = "4.4.10"
+version = "4.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb745187d7f4d76267b37485a65e0149edd0e91a4cfcdd3f27524ad86cee9f3"
+checksum = "299353be8209bd133b049bf1c63582d184a8b39fd9c04f15fe65f50f88bdfe6c"
 dependencies = [
  "clap",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "4.4.7"
+version = "4.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442"
+checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -412,9 +412,9 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
+checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
 
 [[package]]
 name = "clap_mangen"
@@ -2668,9 +2668,9 @@ dependencies = [
 
 [[package]]
 name = "strsim"
-version = "0.10.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01"
 
 [[package]]
 name = "strum"
diff --git a/Cargo.toml b/Cargo.toml
index 9148f1bc03..5370ad3485 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -25,13 +25,13 @@ backoff = "0.4.0"
 blake2 = "0.10.6"
 bytes = "1.5.0"
 cargo_metadata = "0.17.0"
-clap = { version = "4.4.18", features = [
+clap = { version = "4.5.0", features = [
     "derive",
     "deprecated",
     "wrap_help",
     "string",
 ] }
-clap_complete = "4.4.10"
+clap_complete = "4.5.0"
 clap-markdown = "0.1.3"
 clap_mangen = "0.2.10"
 chrono = { version = "0.4.33", default-features = false, features = [
@@ -83,7 +83,7 @@ smallvec = { version = "1.13.0", features = [
     "const_new",
     "union",
 ] }
-strsim = "0.10.0"
+strsim = "0.11.0"
 tempfile = "3.10.0"
 test-case = "3.3.1"
 textwrap = "0.16.0"
diff --git a/lib/tests/test_revset.rs b/lib/tests/test_revset.rs
index ac8a7973fc..b5150915fb 100644
--- a/lib/tests/test_revset.rs
+++ b/lib/tests/test_revset.rs
@@ -452,6 +452,7 @@ fn test_resolve_symbol_branches() {
         candidates: [
             "local",
             "local-remote@git",
+            "local-remote@mirror",
             "local-remote@origin",
             "remote@origin",
         ],
@@ -464,8 +465,6 @@ fn test_resolve_symbol_branches() {
     NoSuchRevision {
         name: "remote",
         candidates: [
-            "local-remote@origin",
-            "local-remote@untracked",
             "remote-conflicted@origin",
             "remote@origin",
         ],