From 47eea1182793ecb2789cf8222b6d1f8534cb6997 Mon Sep 17 00:00:00 2001
From: Olivier 'reivilibre <olivier@librepush.net>
Date: Sun, 15 Aug 2021 19:09:16 +0100
Subject: [PATCH] Rust toolchain updated

---
 .drone.yml        |  6 +++---
 Cargo.lock        | 25 ++++++++++++-------------
 datman/Cargo.toml |  2 +-
 yama/Cargo.toml   |  2 +-
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index e2b7885..1732259 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -20,14 +20,14 @@ steps:
 #        - 'vendor'
 
   - name: unit tests
-    image: rust:1.49.0-slim
+    image: rust:1.54.0-slim
     commands:
       - apt-get -qq update && apt-get -yqq install pkg-config libssl-dev build-essential libsqlite3-dev
       - cargo build --all
       - cargo test --all
 
   - name: test suite
-    image: rust:1.53.0-slim-bullseye
+    image: rust:1.54.0-slim-bullseye
     commands:
       - apt-get -qq update && apt-get -yqq install pkg-config libssl-dev build-essential libsqlite3-dev python3.9 python3.9-venv
       - cargo install -q --path yama
@@ -37,7 +37,7 @@ steps:
       - cd testsuite && ./.venv/bin/green
 
   - name: deploy manual
-    image: rust:1.53.0-slim
+    image: rust:1.54.0-slim
     when:
       branch:
         - develop
diff --git a/Cargo.lock b/Cargo.lock
index 9ce3fb4..7869728 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -119,9 +119,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "3.0.0-beta.2"
+version = "3.0.0-beta.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bd1061998a501ee7d4b6d449020df3266ca3124b941ec56cf2005c3779ca142"
+checksum = "fcd70aa5597dbc42f7217a543f9ef2768b2ef823ba29036072d30e1d88e98406"
 dependencies = [
  "atty",
  "bitflags",
@@ -132,15 +132,14 @@ dependencies = [
  "strsim",
  "termcolor",
  "textwrap",
- "unicode-width",
  "vec_map",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "3.0.0-beta.2"
+version = "3.0.0-beta.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "370f715b81112975b1b69db93e0b56ea4cd4e5002ac43b2da8474106a54096a1"
+checksum = "0b5bb0d655624a0b8770d1c178fb8ffcb1f91cc722cb08f451e3dc72465421ac"
 dependencies = [
  "heck",
  "proc-macro-error",
@@ -660,9 +659,9 @@ checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56"
 
 [[package]]
 name = "os_str_bytes"
-version = "2.4.0"
+version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afb2e1c3ee07430c2cf76151675e583e0f19985fa6efae47d6848a3e2c824f85"
+checksum = "6acbef58a60fe69ab50510a55bc8cdd4d6cf2283d27ad338f54cb52747a9cf2d"
 
 [[package]]
 name = "pkg-config"
@@ -708,9 +707,9 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.27"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038"
+checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612"
 dependencies = [
  "unicode-xid",
 ]
@@ -975,9 +974,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
 [[package]]
 name = "syn"
-version = "1.0.73"
+version = "1.0.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f71489ff30030d2ae598524f61326b902466f72a0fb1a8564c001cc63425bcc7"
+checksum = "1873d832550d4588c3dbc20f01361ab00bfe741048f71e3fecf145a7cc18b29c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1023,9 +1022,9 @@ dependencies = [
 
 [[package]]
 name = "textwrap"
-version = "0.12.1"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "203008d98caf094106cfaba70acfed15e18ed3ddb7d94e49baec153a2b462789"
+checksum = "0066c8d12af8b5acd21e00547c3797fde4e8677254a7ee429176ccebbe93dd80"
 dependencies = [
  "unicode-width",
 ]
diff --git a/datman/Cargo.toml b/datman/Cargo.toml
index 5d7ccc8..09f85c1 100644
--- a/datman/Cargo.toml
+++ b/datman/Cargo.toml
@@ -11,7 +11,7 @@ description = "A chunked and deduplicated backup system using Yama"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-clap = "3.0.0-beta.2"
+clap = "= 3.0.0-beta.4"
 anyhow = "1.0"
 thiserror = "1.0"
 serde = { version = "1.0.104", features = ["derive"] }
diff --git a/yama/Cargo.toml b/yama/Cargo.toml
index c027d79..d5e8053 100644
--- a/yama/Cargo.toml
+++ b/yama/Cargo.toml
@@ -14,7 +14,7 @@ license = "GPL-3.0-or-later"
 fastcdc = "1.0.2"
 zstd = "0.6.0"  # 0.6.0+zstd.1.4.8
 sshish = "0.1.0"
-clap = "3.0.0-beta.2"
+clap = "= 3.0.0-beta.4"
 blake = "2.0.0"
 twox-hash = "1.5.0"
 serde = { version = "1.0.104", features = ["derive"] }