From 7ae7aeedb3e736e813a868fc96dcafb17b9497ed Mon Sep 17 00:00:00 2001
From: David Drysdale <drysdale@google.com>
Date: Wed, 7 Jul 2021 06:54:18 +0000
Subject: [PATCH] Update nightly Rust version (#16)

---
 .github/workflows/ci.yml | 14 +++++++-------
 .rustfmt.toml            |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5cd6b14..1ac3986 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
         rust:
           - stable
           - beta
-          - nightly-2020-10-19
+          - nightly-2021-07-01
     steps:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
@@ -34,7 +34,7 @@ jobs:
         rust:
           - stable
           - beta
-          - nightly-2020-10-19
+          - nightly-2021-07-01
     steps:
       - uses: actions/checkout@v2
         with:
@@ -58,7 +58,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: nightly-2020-10-19
+          toolchain: nightly-2021-07-01
           override: true
           components: rustfmt
       - run: cargo fmt --all -- --check
@@ -71,7 +71,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: nightly-2020-10-19
+          toolchain: nightly-2021-07-01
           override: true
           components: rustfmt, clippy
       - run: cargo clippy --all-features --all-targets
@@ -94,7 +94,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: nightly-2020-10-19
+          toolchain: nightly-2021-07-01
           override: true
           components: rustfmt
       - uses: actions-rs/install@v0.1.2
@@ -111,7 +111,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: nightly-2020-10-19
+          toolchain: nightly-2021-07-01
           override: true
           components: rustfmt
       - run: cargo install --locked --version 0.8.5 cargo-deny
@@ -127,7 +127,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: nightly-2020-10-19
+          toolchain: nightly-2021-07-01
           override: true
           components: rustfmt
       - uses: actions-rs/install@v0.1.2
diff --git a/.rustfmt.toml b/.rustfmt.toml
index 66ca745..3bc3e9a 100644
--- a/.rustfmt.toml
+++ b/.rustfmt.toml
@@ -4,6 +4,6 @@ format_code_in_doc_comments = true
 max_width = 100
 normalize_doc_attributes = true
 wrap_comments = true
-merge_imports = true
+imports_granularity = "Crate"
 imports_layout = "mixed"
 edition = "2018"