]> git.lizzy.rs Git - rust.git/commitdiff
Rollup merge of #59454 - topecongiro:rustfmt-1.2.0, r=nrc
authorMazdak Farrokhzad <twingoow@gmail.com>
Fri, 29 Mar 2019 11:32:23 +0000 (12:32 +0100)
committerGitHub <noreply@github.com>
Fri, 29 Mar 2019 11:32:23 +0000 (12:32 +0100)
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

Cargo.lock
src/tools/rustfmt

index 660e3663bc094085ce260fe9c4ade1966d5234b1..44756876c539156664c83877fdfc45610f718b98 100644 (file)
@@ -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)",
index 1427e4c20ba5cdc80a338347585c9de71a0dea4d..09940a70d0a9fabfb4985426aa7d66ca1875c65e 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 1427e4c20ba5cdc80a338347585c9de71a0dea4d
+Subproject commit 09940a70d0a9fabfb4985426aa7d66ca1875c65e