From 2df66b62b786c038b930a57213a8545642df4a74 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Fri, 23 Sep 2022 14:20:57 +0400
Subject: [PATCH] Update MSRV/toolchain versions

---
 .github/workflows/ci.yml | 42 ++++++----------------------------------
 rust-toolchain.toml      |  2 +-
 2 files changed, 7 insertions(+), 37 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 589bb662..5143bb29 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,17 +17,12 @@ env:
   CARGO_NET_RETRY: 10
   RUSTUP_MAX_RETRIES: 10
 
-  rust_nightly: nightly-2022-01-17
+  rust_nightly: nightly-2022-09-23
   # When updating this, also update:
   # - README.md
   # - src/lib.rs
   # - down below in a matrix  
-  rust_msrv: 1.58.0
-  # When updating this, also update:
-  # - down below in a matrix
-  #
-  # This is needed because some of our tests can't run on MSRV.
-  rust_msrv_dev: 1.59.0
+  rust_msrv: 1.64.0
 
   CI: 1
 
@@ -43,7 +38,6 @@ jobs:
       - check-examples
       - clippy
       - doc
-      - msrv
 
     steps:
       - run: exit 0
@@ -82,7 +76,7 @@ jobs:
           - stable
           - beta
           - nightly
-          - msrv_dev
+          - msrv
     
         include:
           - rust: stable
@@ -92,10 +86,10 @@ jobs:
             toolchain: beta
             features: "--features full"
           - rust: nightly
-            toolchain: nightly-2022-01-17
+            toolchain: nightly-2022-09-23
             features: "--all-features"
-          - rust: msrv_dev
-            toolchain: 1.59.0
+          - rust: msrv
+            toolchain: 1.64.0
             features: "--features full"
 
     steps:      
@@ -194,27 +188,3 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: docs # from .cargo/config.toml
-
-  msrv:
-    name: minimal supported rust version
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Install Rust ${{ env.rust_msrv }}
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: ${{ env.rust_msrv }}
-          override: true
-
-      - name: Cache Dependencies
-        uses: Swatinem/rust-cache@v1
-
-      - name: Check 
-        uses: actions-rs/cargo@v1
-        with:
-          command: check
-          args: --verbose --features full
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 66a1979e..b4990f3d 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,4 +1,4 @@
 [toolchain]
-channel = "nightly-2022-01-17"
+channel = "nightly-2022-09-23"
 components = ["rustfmt", "clippy"]
 profile = "minimal"