diff options
| author | Mara Bos <m-ou.se@m-ou.se> | 2020-11-12 19:46:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-12 19:46:16 +0100 |
| commit | a2e8fb540dec5616c686b98e5a953e816df4eb5a (patch) | |
| tree | d2eddf3459afb2edbff50dff475c1a910b63997a | |
| parent | 76fa5f25abc02d1e3d97c105a24ecaed619deaf6 (diff) | |
| parent | cd314ae99c15eea83ac8cb7044035160180e41dd (diff) | |
| download | rust-a2e8fb540dec5616c686b98e5a953e816df4eb5a.tar.gz rust-a2e8fb540dec5616c686b98e5a953e816df4eb5a.zip | |
Rollup merge of #78970 - calebcartwright:update-rustfmt, r=Aaron1011
update rustfmt to v1.4.25 Contains changes from https://github.com/rust-lang/rustfmt/pull/4507 r? ``@Aaron1011``
| -rw-r--r-- | Cargo.lock | 2 | ||||
| m--------- | src/tools/rustfmt | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Cargo.lock b/Cargo.lock index 45a19fd7963..c72c7b8481b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4329,7 +4329,7 @@ dependencies = [ [[package]] name = "rustfmt-nightly" -version = "1.4.24" +version = "1.4.25" dependencies = [ "annotate-snippets 0.6.1", "anyhow", diff --git a/src/tools/rustfmt b/src/tools/rustfmt -Subproject eb894d53708122a67762de9489881c11aa8ce25 +Subproject 0f29ff6da0c5ff622e739beb8fc3bbe77119b3c |