From da10b4bc1be67f6d363bd2a152c28320cc82b78b Mon Sep 17 00:00:00 2001
From: Ben Boeckel <ben.boeckel@kitware.com>
Date: Fri, 5 Aug 2022 08:36:15 -0400
Subject: [PATCH 1/3] ci: update to tarpaulin 0.20.1

This adds support for the 2021 edition for clap 3.
---
 .gitlab/ci/tarpaulin.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab/ci/tarpaulin.sh b/.gitlab/ci/tarpaulin.sh
index b55f2a1..53812a2 100755
--- a/.gitlab/ci/tarpaulin.sh
+++ b/.gitlab/ci/tarpaulin.sh
@@ -2,8 +2,8 @@
 
 set -e
 
-readonly version="0.11.1"
-readonly sha256sum="b51d5c233e1145036c50168d50a4fb3a9f09c19511a04da866f662ed7217eb5f"
+readonly version="0.20.1"
+readonly sha256sum="ec7c17e6a1406cc9dfb6ccd1a2319a7414bff84266372997be8d760524416eb0"
 readonly filename="cargo-tarpaulin-$version-travis"
 readonly tarball="$filename.tar.gz"
 
-- 
GitLab


From 4e5b66908977a0a667a8f3a113facb14c2bf15d7 Mon Sep 17 00:00:00 2001
From: Ben Boeckel <ben.boeckel@kitware.com>
Date: Thu, 4 Aug 2022 21:23:59 -0400
Subject: [PATCH 2/3] cargo: update to clap 3

This avoids a transitive dependency on a now-unmaintained crate
`term_size`.

In the process, also explicitly list the features wanted.

Also bump to Rust 1.56 to support the 2021 edition.
---
 .gitlab-ci.yml             |  2 +-
 webhook-listen/Cargo.toml  |  2 +-
 webhook-listen/src/main.rs | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f012049..55f0849 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,7 @@ stages:
     - test
 
 .rust_minimum:
-    image: "rust:1.46.0"
+    image: "rust:1.56.0"
 
     variables:
         CARGO_UPDATE_POLICY: newest
diff --git a/webhook-listen/Cargo.toml b/webhook-listen/Cargo.toml
index 1d9de78..4dba5ff 100644
--- a/webhook-listen/Cargo.toml
+++ b/webhook-listen/Cargo.toml
@@ -14,7 +14,7 @@ edition = "2018"
 workspace = ".."
 
 [dependencies]
-clap = "^2.20"
+clap = { version = "^3", default-features = false, features = ["cargo", "std"] }
 env_logger = "~0.9"
 futures = "~0.3"
 http = "~0.2"
diff --git a/webhook-listen/src/main.rs b/webhook-listen/src/main.rs
index 6d866b1..aef3565 100644
--- a/webhook-listen/src/main.rs
+++ b/webhook-listen/src/main.rs
@@ -162,7 +162,7 @@ fn try_main() -> Result<(), Box<dyn Error>> {
         .about("Listen over HTTP for JSON webhook events to pass along to a handler")
         .arg(
             Arg::with_name("ADDRESS")
-                .short("a")
+                .short('a')
                 .long("address")
                 .help("The address to listen on")
                 .required_unless("VERIFY")
@@ -171,7 +171,7 @@ fn try_main() -> Result<(), Box<dyn Error>> {
         )
         .arg(
             Arg::with_name("CONFIG")
-                .short("c")
+                .short('c')
                 .long("config")
                 .help("Path to the configuration file")
                 .required_unless("RELOAD")
@@ -180,14 +180,14 @@ fn try_main() -> Result<(), Box<dyn Error>> {
         )
         .arg(
             Arg::with_name("DEBUG")
-                .short("d")
+                .short('d')
                 .long("debug")
                 .help("Increase verbosity")
                 .multiple(true),
         )
         .arg(
             Arg::with_name("LOGGER")
-                .short("l")
+                .short('l')
                 .long("logger")
                 .default_value("env")
                 .possible_values(&[
@@ -211,13 +211,13 @@ fn try_main() -> Result<(), Box<dyn Error>> {
         )
         .arg(
             Arg::with_name("VERIFY")
-                .short("v")
+                .short('v')
                 .long("verify")
                 .help("Check the configuration file and exit"),
         )
         .arg(
             Arg::with_name("RELOAD")
-                .short("r")
+                .short('r')
                 .long("reload")
                 .help("Reload the configuration"),
         )
-- 
GitLab


From 85e036f31197c32d3e99739e3c3bf92d7f256225 Mon Sep 17 00:00:00 2001
From: Ben Boeckel <ben.boeckel@kitware.com>
Date: Thu, 4 Aug 2022 21:24:36 -0400
Subject: [PATCH 3/3] cargo: update systemd and sentry

---
 webhook-listen/Cargo.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webhook-listen/Cargo.toml b/webhook-listen/Cargo.toml
index 4dba5ff..5be4446 100644
--- a/webhook-listen/Cargo.toml
+++ b/webhook-listen/Cargo.toml
@@ -21,10 +21,10 @@ http = "~0.2"
 human-panic = "^1.0.2"
 hyper = { version = "~0.14.12", features = ["client", "http1", "server", "stream", "tcp"] }
 log = "~0.4.4"
-sentry = { version = "~0.23", optional = true, default-features = false }
+sentry = { version = "~0.27", optional = true, default-features = false }
 serde = "^1.0"
 serde_derive = "^1.0"
-systemd = { version = "~0.9", optional = true }
+systemd = { version = "~0.10", optional = true }
 thiserror = "^1.0"
 tokio = { version = "^1.8.4", features = ["rt", "rt-multi-thread"] }
 webhook-router = { version = "~0.2", path = "../webhook-router" }
-- 
GitLab