Rollup of 4 pull requests #60920
Merged
Rollup of 4 pull requests #60920
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
type_id now takes an argument that can't be named outside of the std::error module, which prevents any implementations from overriding it. It's a pretty grody solution, and there's no way we can stabilize the method with this API, but it avoids the soudness issue! Closes rust-lang#60784
Co-Authored-By: Mazdak Farrokhzad <[email protected]>
Update books ## nomicon 1 commits in fb29b147be4d9a1f8e24aba753a7e1de537abf61..c656171b749b7307f21371dd0d3278efee5573b8 2019-04-22 19:10:29 -0400 to 2019-04-25 15:31:26 -0400 - Lifetimes: Updates to incorporate NLL (rust-lang/nomicon#101) ## reference 5 commits in 2a2de9c..862b669 2019-04-22 10:25:52 -0700 to 2019-05-04 23:41:35 -0700 - Typo (rust-lang/reference#606) - Added missing ? to Generics from InherentImpl and TraitImpl (rust-lang/reference#604) - Add missing ( to ExternalFunctionItem (rust-lang/reference#603) - Remove unneeded | from AssignmentExpression (rust-lang/reference#601) - Remove unneeded ( from TypePathSegment (rust-lang/reference#602) ## book 6 commits in db919bc6bb9071566e9c4f05053672133eaac33e..29fe982990e43b9367be0ff47abc82fb2123fd03 2019-04-15 20:11:03 -0400 to 2019-05-15 17:48:40 -0400 - Ignore a non-compiling test listing and add code to fix a test listing - Remove nostarch snapshots I've checked in layout - Reword error messages to maybe not need to wrap lines in print - This example doesn't compile but wasn't marked as such - Update install instructions for VS 2019 (rust-lang/book#1923) - Switch IRC to Discord ## rust-by-example 9 commits in 1ff0f8e018838a710ebc0cc1a7bf74ebe73ad9f1..811c697b232c611ed754d279ed20643a0c4096f6 2019-04-15 08:15:32 -0300 to 2019-04-28 18:56:42 -0300 - Fix typo in dsl.md (rust-lang/rust-by-example#1187) - File read lines (rust-lang/rust-by-example#1186) - For rust-lang/rust-by-example#1184 closes rust-lang/rust-by-example#1184 (rust-lang/rust-by-example#1185) - Link to Reference for macro_rules designators (rust-lang/rust-by-example#1182) - Improve section Meta/Docs (rust-lang/rust-by-example#1183) - Small improvements to various files (rust-lang/rust-by-example#1173) - 19.2 Vectors Error in Code Example (rust-lang/rust-by-example#1178) - For rust-lang/rust-by-example#1175 (rust-lang/rust-by-example#1176) - For rust-lang/rust-by-example#1179 (rust-lang/rust-by-example#1180) ## rustc-guide 12 commits in 99e1b1d53656be08654df399fc200584aebb50e4..3cb727b62b953d59b4360d39aa68b6dc8f157655 2019-04-20 09:57:54 -0500 to 2019-05-07 09:53:32 -0500 - Fix typo, 'which' repeated twice - [canonicalization] fix result canonicalization example (rust-lang/rustc-dev-guide#304) - Rename to RUSTC_LOG - Added mention of universal ctags - Fix link in walkthrough - Remove IRC from discussion chats - Bring the updating LLVM guide up to date - use nightly rust for ci - Fixed broken chalk links - Add documentation for two-phase borrows - Explain new powers of the `treat-err-as-bug` flag - Update lowering-module test case ## edition-guide 3 commits in c413d42a207bd082f801ec0137c31b71e4bfed4c..581c6cccfaf995394ea9dcac362dc8e731c18558 2019-04-22 01:14:56 +0200 to 2019-05-06 12:47:44 -0700 - Fix typo in controlling-panics-with-std-panic.md (rust-lang/edition-guide#158) - Fix links for book editions. (rust-lang/edition-guide#149) - Update now that NLL is enabled in 2015. (rust-lang/edition-guide#157) ## embedded-book 3 commits in de3d55f521e657863df45260ebbca1b10527f662..9858872bd1b7dbba5ec27dc30d34eba00acd7ef9 2019-04-22 12:58:28 +0000 to 2019-05-02 18:56:54 +0000 - Update linux.md (rust-embedded/book#167) - Clarify list of available targets for installation (rust-embedded/book#165) - minor grammar fix (rust-embedded/book#188)
…Mark-Simulacrum Allow claiming issues with triagebot Not sure if this was intentionally left out, but it can probably be enabled now that rust-lang/triagebot#3 is fixed (assuming that the deployed commit is recent enough). People have tried to use it already (rust-lang#60622 (comment)). r? @Mark-Simulacrum
Handle more string addition cases with appropriate suggestions
…crichton Prevent Error::type_id overrides type_id now takes an argument that can't be named outside of the std::error module, which prevents any implementations from overriding it. It's a pretty grody solution, and there's no way we can stabilize the method with this API, but it avoids the soudness issue! Closes rust-lang#60784 r? @alexcrichton
|
@bors r+ p=2 |
|
📌 Commit f48f37b has been approved by |
bors
added
the
S-waiting-on-bors
|
☀️ Test successful - checks-travis, status-appveyor |
|
📣 Toolstate changed by #60920! Tested on commit 73a3a90. 🎉 book on windows: test-fail → test-pass (cc @carols10cents @steveklabnik, @rust-lang/infra). |
rust-highfive
added a commit
to rust-lang-nursery/rust-toolstate
that referenced
this pull request
May 17, 2019
Tested on commit rust-lang/rust@73a3a90. Direct link to PR: <rust-lang/rust#60920> 🎉 book on windows: test-fail → test-pass (cc @carols10cents @steveklabnik, @rust-lang/infra). 🎉 book on linux: test-fail → test-pass (cc @carols10cents @steveklabnik, @rust-lang/infra).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Successful merges:
Failed merges:
r? @ghost