about summary refs log tree commit diff
diff options
context:
space:
mode:
authorNick Cameron <ncameron@mozilla.com>2017-11-29 20:33:14 +1300
committerNick Cameron <ncameron@mozilla.com>2017-11-29 20:34:06 +1300
commit1cec22e15787931da123f77003f54f0b86a2ea31 (patch)
tree5c17798623dad9396acbad5054b9d19cdc952d8b
parent02c89f703d1e9a7b355aca0f139c138e6fe39461 (diff)
Update Rustfmt again
-rw-r--r--src/Cargo.lock14
m---------src/tools/rustfmt24
-rw-r--r--src/tools/toolstate.toml2
3 files changed, 20 insertions, 20 deletions
diff --git a/src/Cargo.lock b/src/Cargo.lock
index a789e6bca0c..cde93b1a6a6 100644
--- a/src/Cargo.lock
+++ b/src/Cargo.lock
@@ -224,6 +224,18 @@ dependencies = [
 ]
 
 [[package]]
+name = "cargo_metadata"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "semver 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
 name = "cargotest"
 version = "0.1.0"
 dependencies = [
@@ -2019,6 +2031,7 @@ dependencies = [
 name = "rustfmt-nightly"
 version = "0.2.16"
 dependencies = [
+ "cargo_metadata 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "derive-new 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "diff 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2671,6 +2684,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b3c30d3802dfb7281680d6285f2ccdaa8c2d8fee41f93805dba5c4cf50dc23cf"
 "checksum bufstream 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f2f382711e76b9de6c744cc00d0497baba02fb00a787f088c879f01d09468e32"
 "checksum cargo_metadata 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "be1057b8462184f634c3a208ee35b0f935cfd94b694b26deadccd98732088d7b"
+"checksum cargo_metadata 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1f56ec3e469bca7c276f2eea015aa05c5e381356febdbb0683c2580189604537"
 "checksum cc 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a9b13a57efd6b30ecd6598ebdb302cca617930b5470647570468a65d12ef9719"
 "checksum cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c819a1287eb618df47cc647173c5c4c66ba19d888a6e50d605672aed3140de"
 "checksum clap 2.28.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dc34bf7d5d66268b466b9852bca925ec1d2650654dab4da081e63fd230145c2e"
diff --git a/src/tools/rustfmt b/src/tools/rustfmt
-Subproject 2bfcadf8de0c587c04a0bf16a303c76cbef95fa
+Subproject 426ba1cdabf323cee7c42b71ca34eac1ee3192c
diff --git a/src/tools/toolstate.toml b/src/tools/toolstate.toml
index 05dd8a650cf..f1684f4c5ac 100644
--- a/src/tools/toolstate.toml
+++ b/src/tools/toolstate.toml
@@ -32,4 +32,4 @@ clippy = "Broken"
 rls = "Testing"
 
 # ping @nrc
-rustfmt = "Compiling"
+rustfmt = "Testing"