Auto merge of #46740 - oli-obk:rls, r=nrc

Update the rls and rustfmt submodules r? @nrc
rust-lang · Dec 15, 2017 · 5a0dc2d · 5a0dc2d
2 parents b4f3232 + b1e7597
commit 5a0dc2d
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 19 deletions.
diff --git a/src/Cargo.lock b/src/Cargo.lock
diff --git a/src/tools/rls b/src/tools/rls
diff --git a/src/tools/rustfmt b/src/tools/rustfmt
diff --git a/src/tools/toolstate.toml b/src/tools/toolstate.toml
@@ -29,8 +29,8 @@ miri = "Testing"
 clippy = "Testing"
 
 # ping @nrc
-rls = "Broken"
+rls = "Testing"
 
 # ping @nrc
 # when breaking rustfmt, always break rls as well
-rustfmt = "Broken"
+rustfmt = "Testing"