update rustfmt from 2020-06-02 to 2020-07-26

oxidecomputer · Jan 2, 2021 · aaac2c8 · aaac2c8
1 parent 2882580
commit aaac2c8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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