Auto merge of #56911 - rust-lang:stable-1.31.1, r=Mark-Simulacrum

bors · bors · commit 642e063a6e53 · 2018-12-18T16:51:14.000Z
[stable] 1.31.1 point release Rust 1.31.1 is scheduled to be released on Thursday 20th, with the following changes: * #56562: Update libc version required by rustc *(different patch made by me)* * #56615: Update the book to fix some edition-related bugs * rls submodule update to [`b379ef7`](rust-lang/rls@b379ef7), including: * rust-lang/rls#1170: Fix for common infinte loop regression * rust-lang/rls#1171: Can't jump to std defs r? @Mark-Simulacrum cc @rust-lang/core @rust-lang/release
diff --git a/RELEASES.md b/RELEASES.md
@@ -1,3 +1,14 @@
+Version 1.31.1 (2018-12-20)
+===========================
+
+- [Fix Rust failing to build on `powerpc-unknown-netbsd`][56562]
+- [Fix broken go-to-definition in RLS][rls/1171]
+- [Fix infinite loop on hover in RLS][rls/1170]
+
+[56562]: https://github.com/rust-lang/rust/pull/56562
+[rls/1171]: https://github.com/rust-lang/rls/issues/1171
+[rls/1170]: https://github.com/rust-lang/rls/pull/1170
+
 Version 1.31.0 (2018-12-06)
 ==========================
 
diff --git a/src/Cargo.lock b/src/Cargo.lock
diff --git a/src/Cargo.toml b/src/Cargo.toml
@@ -65,3 +65,8 @@ rustc-workspace-hack = { path = 'tools/rustc-workspace-hack' }
 [patch."https://github.com/rust-lang/rust-clippy"]
 clippy_lints = { path = "tools/clippy/clippy_lints" }
 rustc_tools_util = { path = "tools/clippy/rustc_tools_util" }
+
+# Old Clippy repository
+[patch."https://github.com/rust-lang-nursery/rust-clippy"]
+clippy_lints = { path = "tools/clippy/clippy_lints" }
+rustc_tools_util = { path = "tools/clippy/rustc_tools_util" }
diff --git a/src/bootstrap/Cargo.toml b/src/bootstrap/Cargo.toml
@@ -40,7 +40,7 @@ filetime = "0.2"
 num_cpus = "1.0"
 getopts = "0.2"
 cc = "1.0.1"
-libc = "0.2"
+libc = "0.2.44"
 serde = "1.0.8"
 serde_derive = "1.0.8"
 serde_json = "1.0.2"
diff --git a/src/bootstrap/channel.rs b/src/bootstrap/channel.rs
@@ -24,7 +24,7 @@ use Build;
 use config::Config;
 
 // The version number
-pub const CFG_RELEASE_NUM: &str = "1.31.0";
+pub const CFG_RELEASE_NUM: &str = "1.31.1";
 
 pub struct GitInfo {
     inner: Option<Info>,
diff --git a/src/doc/book b/src/doc/book
@@ -1 +1 @@
-Subproject commit 616fe4172b688393aeee5f34935cc25733c9c062
+Subproject commit 74d81d80052cb88925f0e73b12fbd0b73ab7b5a0
diff --git a/src/tools/rls b/src/tools/rls
@@ -1 +1 @@
-Subproject commit 66105269f3457fca4aad21577636047872d74fcb
+Subproject commit da98b4d65a901d627ad65f595a7cee07f53aef1e
