From 0388eb625abebe29af77e57054061af39e6450d5 Mon Sep 17 00:00:00 2001
From: tyranron <tyranron@gmail.com>
Date: Mon, 4 Jul 2022 12:13:19 +0200
Subject: [PATCH] Upgrade to 1.62 Rust

---
 .github/workflows/ci.yml | 2 +-
 Cargo.toml               | 6 +++---
 README.md                | 2 +-
 api/s3/Cargo.toml        | 2 +-
 e2e/Cargo.toml           | 4 ++--
 e2e/tests/main.rs        | 2 +-
 lib/Cargo.toml           | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7e526d7..da8ac5a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,7 +18,7 @@ env:
              && !startsWith(github.ref, 'refs/tags/v')
              && !contains(github.event.head_commit.message, '[fresh ci]') }}
   RUST_BACKTRACE: 1
-  RUST_VER: "1.61"
+  RUST_VER: "1.62"
 
 jobs:
 
diff --git a/Cargo.toml b/Cargo.toml
index e4e93f3..f0d8b26 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,7 +2,7 @@
 name = "baza"
 version = "0.1.0-dev"
 edition = "2021"
-rust-version = "1.61"
+rust-version = "1.62"
 description = "Simply scalable files storage without much fuss."
 authors = ["Instrumentisto Team <developer@instrumentisto.com>"]
 license = "BlueOak-1.0.0"
@@ -19,8 +19,8 @@ split-debuginfo = "unpacked"
 [dependencies]
 baza = { package = "baza-lib", path = "lib" }
 baza-api-s3 = { path = "api/s3" }
-clap = { version = "3.2", features = ["derive"] }
-tokio = "1.0"
+clap = { version = "3", features = ["derive"] }
+tokio = "1"
 tracing-subscriber = "0.3"
 
 [workspace]
diff --git a/README.md b/README.md
index 6d68f4d..0bb25b9 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@ Baza
 ====
 
 [![CI](https://github.com/instrumentisto/baza/workflows/CI/badge.svg?branch=main "CI")](https://github.com/instrumentisto/baza/actions?query=workflow%3ACI+branch%3Amain)
-[![Rust 1.61+](https://img.shields.io/badge/rustc-1.61+-lightgray.svg "Rust 1.61+")](https://blog.rust-lang.org/2022/05/19/Rust-1.61.0.html)
+[![Rust 1.62+](https://img.shields.io/badge/rustc-1.62+-lightgray.svg "Rust 1.62+")](https://blog.rust-lang.org/2022/06/30/Rust-1.62.0.html)
 
 [Docker Hub](https://hub.docker.com/r/instrumentisto/baza)
 | [GitHub Container Registry](https://github.com/orgs/instrumentisto/packages/container/package/baza)
diff --git a/api/s3/Cargo.toml b/api/s3/Cargo.toml
index 65ea7a6..7a65989 100644
--- a/api/s3/Cargo.toml
+++ b/api/s3/Cargo.toml
@@ -2,7 +2,7 @@
 name = "baza-api-s3"
 version = "0.0.0"
 edition = "2021"
-rust-version = "1.61"
+rust-version = "1.62"
 description = "S3 HTTP API implementation of Baza."
 authors = ["Instrumentisto Team <developer@instrumentisto.com>"]
 license = "BlueOak-1.0.0"
diff --git a/e2e/Cargo.toml b/e2e/Cargo.toml
index 1b8e4af..d55a475 100644
--- a/e2e/Cargo.toml
+++ b/e2e/Cargo.toml
@@ -2,7 +2,7 @@
 name = "baza-e2e"
 version = "0.0.0"
 edition = "2021"
-rust-version = "1.61"
+rust-version = "1.62"
 description = "E2E (end-to-end) tests of this project."
 authors = ["Instrumentisto Team <developer@instrumentisto.com>"]
 license = "BlueOak-1.0.0"
@@ -17,7 +17,7 @@ once_cell = "1.12"
 rusoto_core = "0.48"
 rusoto_credential = "0.48"
 rusoto_s3 = "0.48"
-tokio = "1.0"
+tokio = "1"
 
 [[test]]
 name = "e2e"
diff --git a/e2e/tests/main.rs b/e2e/tests/main.rs
index 54281d1..cf4b847 100644
--- a/e2e/tests/main.rs
+++ b/e2e/tests/main.rs
@@ -48,7 +48,7 @@ async fn clear_data_dir() -> Result<(), String> {
         .await
         .map_err(|e| format!("Cannot stat `{DATA_DIR}` dir: {e}"))?
         .is_dir()
-        .then(|| ())
+        .then_some(())
         .ok_or_else(|| format!("`{DATA_DIR}` is not a dir"))?;
 
     // We cannot use `async_fs::remove_dir_all` on `DATA_DIR` directly, because
diff --git a/lib/Cargo.toml b/lib/Cargo.toml
index 4987fb7..9066e1a 100644
--- a/lib/Cargo.toml
+++ b/lib/Cargo.toml
@@ -2,7 +2,7 @@
 name = "baza-lib"
 version = "0.0.0"
 edition = "2021"
-rust-version = "1.61"
+rust-version = "1.62"
 description = "Actual Baza implementation as library."
 authors = ["Instrumentisto Team <developer@instrumentisto.com>"]
 license = "BlueOak-1.0.0"