diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-03-29 12:32:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-29 12:32:23 +0100 |
| commit | 38af98ee5f3f438299cadbf0760274c66d9206d4 (patch) | |
| tree | 1878f24ae132d61e2a181b3ebb2f1385870b2de3 | |
| parent | 8e0855b5b7f33a0b6386ca93f11a61b70a8b15bf (diff) | |
| parent | c728ae0fd1fe1bfc98598f345fa3a290094390d3 (diff) | |
| download | rust-38af98ee5f3f438299cadbf0760274c66d9206d4.tar.gz rust-38af98ee5f3f438299cadbf0760274c66d9206d4.zip | |
Rollup merge of #59454 - topecongiro:rustfmt-1.2.0, r=nrc
Update rustfmt to 1.2.0 This release includes bug fixes and performance improvements from 1.1.0. Also it adds a new rustfmt tool attribute `#[rustfmt::skip::macros]`, which lets you skip formatting macro calls of your choice. cc @nrc @Centril @Xanewok
| -rw-r--r-- | Cargo.lock | 4 | ||||
| m--------- | src/tools/rustfmt | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/Cargo.lock b/Cargo.lock index 660e3663bc0..44756876c53 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2260,7 +2260,7 @@ dependencies = [ "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-workspace-hack 1.0.0", "rustc_tools_util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rustfmt-nightly 1.1.0", + "rustfmt-nightly 1.2.0", "serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.81 (registry+https://github.com/rust-lang/crates.io-index)", "serde_ignored 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3056,7 +3056,7 @@ dependencies = [ [[package]] name = "rustfmt-nightly" -version = "1.1.0" +version = "1.2.0" dependencies = [ "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "bytecount 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/src/tools/rustfmt b/src/tools/rustfmt -Subproject 1427e4c20ba5cdc80a338347585c9de71a0dea4 +Subproject 09940a70d0a9fabfb4985426aa7d66ca1875c65 |