From 8ffb81f63f96ec01a6cf66c83e0f2e70d89dd1c6 Mon Sep 17 00:00:00 2001
From: Harry Maclean <harryjmaclean@googlemail.com>
Date: Thu, 6 Apr 2023 08:19:58 +0800
Subject: [PATCH] QL: Bump clap to 4.2

---
 ql/Cargo.lock                     | Bin 24184 -> 31060 bytes
 ql/extractor/Cargo.toml           |   2 +-
 ql/extractor/src/bin/extractor.rs |  20 +++++++++++---------
 ql/extractor/src/bin/generator.rs |  18 +++++++++++-------
 4 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/ql/Cargo.lock b/ql/Cargo.lock
index 41b76f14cfc6add81e8026cba5eec0068d7d33c0..967121da94e9dfe9bb75e04c7ddf68e9cbf42b3a 100644
GIT binary patch
delta 4777
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

delta 874
zcmZ9KJ8RTI6vf$?D87x7M6K3<Q6a{;^PVEO7Ak@eR<u$KbLZaCg}ltJMiFfM2xBW&
zf~D{WD-rzyR#rA*ZKWV+BhIec*xeb1d*+<;`|z#x<8|xho^3O|<pFQ5&hEO$oBiJU
zT6?iQD;7W&G12Xikue}TP9kOPbutFL6451=4oM2Kj$^XgF(79&76r0qRv{Wgvb>v^
zDnD<v$Kzn|pu9VCs63fj>QF!xkik1A2tZ3ngn%Jv7quZ$Svd|$1evgo&Vu&RM+JdQ
zX7;14zvlPug#`$+^Sj!!D?Lo*lsn#h-+q5$TrMbGS{J%!qp%>1*5E}_9=!(vnNyZT
zR%ryMqm|6r25qy~l#`7Pq%$B<c_?3}rmw}d{@;X#LPH-TMeGgoO1#w{9r}YB-Rfu@
z@cqHoX51JZ?ymLHI`QeP9u01fZtihfUX2^&+}zRfcyY2^T|CiT+W)lGJUjS)vbjFD
zvo$_6RqjkLb*w~foze<}#;Bd8gwhB>QcH@2HAG_^W$%Lm5tDPtPzWGIj4>%SifQ*r
zSK8aIlvgME&6krG#+n<ax5mcQ9|b9ZSXIBZ$Sj0&#wExiQew+qy3F2KnK4O^nL>i9
z2g%wLA)D+%=^mOX55?!^nEW)^%%6Y1z2%3&cRWV}5NfSMWU!*3m5hi6R1{hU<+XRd
z?jvF=QvEtY3V|46Fww@+y?D5Je);3r%)dDQ!?R4PD;-kO)`GJZK2>rUZ8ngUtKJ3c
zP+9aw*c5cN6-a66E65cDFG5CPMGa`Wyg4w}JX#X_%KFW>JO0(vor-5OAW?=&DY6Zc
pT}UQpj_3n`l2lh@sVtMSQLE(Y5bASlm}{<~eBC_Kh~*bMe*-MR1gii5

diff --git a/ql/extractor/Cargo.toml b/ql/extractor/Cargo.toml
index fe4712a03d5..3d37379c8a7 100644
--- a/ql/extractor/Cargo.toml
+++ b/ql/extractor/Cargo.toml
@@ -13,7 +13,7 @@ tree-sitter-ql-dbscheme = { git = "https://github.com/erik-krogh/tree-sitter-ql-
 tree-sitter-ql-yaml = {git = "https://github.com/erik-krogh/tree-sitter-ql.git", rev = "cf704bf3671e1ae148e173464fb65a4d2bbf5f99"}
 tree-sitter-blame = {path = "../buramu/tree-sitter-blame"}
 tree-sitter-json = {git = "https://github.com/tausbn/tree-sitter-json.git", rev = "745663ee997f1576fe1e7187e6347e0db36ec7a9"}
-clap = "2.33"
+clap = "4.2"
 tracing = "0.1"
 tracing-subscriber = { version = "0.3.16", features = ["env-filter"] }
 rayon = "1.7.0"
diff --git a/ql/extractor/src/bin/extractor.rs b/ql/extractor/src/bin/extractor.rs
index a91b12caf5b..592c98b1b15 100644
--- a/ql/extractor/src/bin/extractor.rs
+++ b/ql/extractor/src/bin/extractor.rs
@@ -58,27 +58,29 @@ fn main() -> std::io::Result<()> {
         .build_global()
         .unwrap();
 
-    let matches = clap::App::new("QL extractor")
+    let matches = clap::Command::new("QL extractor")
         .version("1.0")
         .author("GitHub")
         .about("CodeQL QL extractor")
-        .args_from_usage(
-            "--source-archive-dir=<DIR> 'Sets a custom source archive folder'
-                    --output-dir=<DIR>         'Sets a custom trap folder'
-                    --file-list=<FILE_LIST>    'A text files containing the paths of the files to extract'",
-        )
+        .args(&[
+            clap::arg!(--"source-archive-dir" <DIR> "Sets a custom source archive folder"),
+            clap::arg!(--"output-dir" <DIR> "Sets a custom trap folder"),
+            clap::arg!(--"file-list" <FILE_LIST> "A text file containing the paths of the files to extract"),
+        ])
         .get_matches();
     let src_archive_dir = matches
-        .value_of("source-archive-dir")
+        .get_one::<String>("source-archive-dir")
         .expect("missing --source-archive-dir");
     let src_archive_dir = PathBuf::from(src_archive_dir);
 
     let trap_dir = matches
-        .value_of("output-dir")
+        .get_one::<String>("output-dir")
         .expect("missing --output-dir");
     let trap_dir = PathBuf::from(trap_dir);
 
-    let file_list = matches.value_of("file-list").expect("missing --file-list");
+    let file_list = matches
+        .get_one::<String>("file-list")
+        .expect("missing --file-list");
     let file_list = fs::File::open(file_list)?;
 
     let language = tree_sitter_ql::language();
diff --git a/ql/extractor/src/bin/generator.rs b/ql/extractor/src/bin/generator.rs
index 97508c5ca4f..45a13f6a18d 100644
--- a/ql/extractor/src/bin/generator.rs
+++ b/ql/extractor/src/bin/generator.rs
@@ -10,19 +10,23 @@ fn main() -> std::io::Result<()> {
         .with_env_filter(tracing_subscriber::EnvFilter::from_default_env())
         .init();
 
-    let matches = clap::App::new("QL dbscheme generator")
+    let matches = clap::Command::new("QL dbscheme generator")
         .version("1.0")
         .author("GitHub")
         .about("CodeQL QL dbscheme generator")
-        .args_from_usage(
-            "--dbscheme=<FILE>                  'Path of the generated dbscheme file'
-             --library=<FILE>                   'Path of the generated QLL file'",
-        )
+        .args(&[
+            clap::arg!(--dbscheme <FILE> "Path of the generated dbscheme file"),
+            clap::arg!(--library <FILE> "Path of the generated QLL file"),
+        ])
         .get_matches();
-    let dbscheme_path = matches.value_of("dbscheme").expect("missing --dbscheme");
+    let dbscheme_path = matches
+        .get_one::<String>("dbscheme")
+        .expect("missing --dbscheme");
     let dbscheme_path = PathBuf::from(dbscheme_path);
 
-    let ql_library_path = matches.value_of("library").expect("missing --library");
+    let ql_library_path = matches
+        .get_one::<String>("library")
+        .expect("missing --library");
     let ql_library_path = PathBuf::from(ql_library_path);
 
     let languages = vec![