Skip to content

Commit

Permalink
Auto merge of #56911 - rust-lang:stable-1.31.1, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
[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
  • Loading branch information
bors committed Dec 18, 2018
2 parents abe02ce + ef6c008 commit 642e063
Show file tree
Hide file tree
Showing 7 changed files with 68 additions and 52 deletions.
11 changes: 11 additions & 0 deletions RELEASES.md
Original file line number Diff line number Diff line change
@@ -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)
==========================

Expand Down
96 changes: 48 additions & 48 deletions src/Cargo.lock

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions src/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
2 changes: 1 addition & 1 deletion src/bootstrap/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/bootstrap/channel.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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>,
Expand Down
2 changes: 1 addition & 1 deletion src/doc/book
Submodule book updated 67 files
+1 −1 redirects/attributes.md
+2 −2 redirects/bibliography.md
+2 −2 redirects/borrow-and-asref.md
+3 −3 redirects/casting-between-types.md
+3 −3 redirects/choosing-your-guarantees.md
+3 −3 redirects/closures.md
+3 −3 redirects/comments.md
+3 −3 redirects/concurrency.md
+2 −2 redirects/conditional-compilation.md
+5 −5 redirects/crates-and-modules.md
+3 −3 redirects/deref-coercions.md
+3 −3 redirects/drop.md
+2 −2 redirects/effective-rust.md
+3 −3 redirects/enums.md
+3 −3 redirects/error-handling.md
+3 −3 redirects/functions.md
+3 −3 redirects/generics.md
+3 −3 redirects/getting-started.md
+2 −2 redirects/glossary.md
+3 −3 redirects/guessing-game.md
+3 −4 redirects/if-let.md
+3 −3 redirects/iterators.md
+5 −5 redirects/lifetimes.md
+3 −3 redirects/macros.md
+5 −5 redirects/match.md
+3 −3 redirects/method-syntax.md
+3 −3 redirects/mutability.md
+3 −3 redirects/ownership.md
+3 −3 redirects/primitive-types.md
+5 −5 redirects/procedural-macros.md
+3 −3 redirects/references-and-borrowing.md
+3 −3 redirects/release-channels.md
+2 −2 redirects/structs.md
+7 −7 redirects/syntax-and-semantics.md
+5 −6 redirects/syntax-index.md
+3 −3 redirects/testing.md
+3 −3 redirects/trait-objects.md
+5 −5 redirects/traits.md
+3 −3 redirects/unsafe.md
+1 −1 redirects/using-rust-without-the-standard-library.md
+3 −3 redirects/vectors.md
+1 −1 src/appendix-03-derivable-traits.md
+1 −1 src/ch00-00-introduction.md
+47 −32 src/ch02-00-guessing-game-tutorial.md
+13 −13 src/ch03-01-variables-and-mutability.md
+2 −2 src/ch03-02-data-types.md
+3 −5 src/ch03-03-how-functions-work.md
+3 −3 src/ch03-04-comments.md
+11 −11 src/ch03-05-control-flow.md
+15 −15 src/ch04-01-what-is-ownership.md
+8 −9 src/ch04-02-references-and-borrowing.md
+20 −15 src/ch04-03-slices.md
+10 −10 src/ch05-01-defining-structs.md
+11 −12 src/ch05-02-example-structs.md
+5 −5 src/ch05-03-method-syntax.md
+3 −3 src/ch06-01-defining-an-enum.md
+5 −5 src/ch06-02-match.md
+9 −9 src/ch06-03-if-let.md
+26 −36 src/ch08-01-vectors.md
+14 −14 src/ch08-02-strings.md
+24 −24 src/ch08-03-hash-maps.md
+12 −12 src/ch09-01-unrecoverable-errors-with-panic.md
+19 −21 src/ch09-02-recoverable-errors-with-result.md
+1 −0 src/ch14-02-publishing-to-crates-io.md
+5 −5 src/ch15-05-interior-mutability.md
+1 −1 src/ch18-03-pattern-syntax.md
+4 −6 src/ch19-06-macros.md
2 changes: 1 addition & 1 deletion src/tools/rls
Submodule rls updated from 661052 to da98b4

0 comments on commit 642e063

Please sign in to comment.