From aaac2c8081feade8d2d9ca5416d34ad44280f00f Mon Sep 17 00:00:00 2001 From: "Joshua M. Clulow" Date: Sat, 2 Jan 2021 01:34:17 +0000 Subject: [PATCH] update rustfmt from 2020-06-02 to 2020-07-26 --- .github/workflows/rust.yml | 4 ++-- .vscode/settings.json | 2 +- rustfmt.toml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 28e66960b..34482da42 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -17,11 +17,11 @@ jobs: - uses: actions/checkout@28c7f3d2b5162b5ddd3dfd9a45aa55eaf396478b - uses: actions-rs/toolchain@b223206e28798aa3c3668bdd6409258e6dc29172 with: - toolchain: nightly-2020-06-02 + toolchain: nightly-2020-07-26 default: false components: rustfmt - name: Check style - run: cargo +nightly-2020-06-02 fmt -- --check + run: cargo +nightly-2020-07-26 fmt -- --check build-and-test: runs-on: ${{ matrix.os }} diff --git a/.vscode/settings.json b/.vscode/settings.json index fdfa83174..aa647e78a 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,7 +2,7 @@ "rust-analyzer.rustfmt.overrideCommand": [ "rustup", "run", - "nightly-2020-06-02", + "nightly-2020-07-26", "rustfmt" ] } diff --git a/rustfmt.toml b/rustfmt.toml index 852e30fef..391cb7aac 100644 --- a/rustfmt.toml +++ b/rustfmt.toml @@ -83,7 +83,7 @@ use_field_init_shorthand = false force_explicit_abi = true condense_wildcard_suffixes = false color = "Auto" -required_version = "1.4.15" +required_version = "1.4.19" disable_all_formatting = false skip_children = false hide_parse_errors = false