diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-04-30 03:28:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-30 03:28:37 +0200 |
| commit | 1ec56d855056d7358c493b4e532873d541ba779f (patch) | |
| tree | 194d4a8d13521bf963c67ae98e148f4413665296 | |
| parent | c54b77ca2da2584608a74eacdc78739e5e168456 (diff) | |
| parent | 710083c09d4fbff74f7f86cafd5984bc2e023b17 (diff) | |
Rollup merge of #60238 - topecongiro:rustfmt-1.2.2, r=alexcrichton
Update rustfmt to 1.2.2
| -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 aeddf35eb0d..f6713496f5b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2272,7 +2272,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.2.1", + "rustfmt-nightly 1.2.2", "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)", @@ -3090,7 +3090,7 @@ dependencies = [ [[package]] name = "rustfmt-nightly" -version = "1.2.1" +version = "1.2.2" dependencies = [ "annotate-snippets 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/src/tools/rustfmt b/src/tools/rustfmt -Subproject b860feaffccb81199c045e9b1511c2e25825dc0 +Subproject 5274b49caa1a7db6ac10c76bf1a3d5710ccef56 |