Rollup of 12 pull requests #34200
Merged
Rollup of 12 pull requests #34200
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
Member
sanxiyn
commented
Jun 10, 2016
sanxiyn
commented
- Successful merges: run rustfmt on map.rs in libcollections/btree folder #34088, Remove a gotcha from book/error-handling.md #34129, Test case for borrowk ICE #25579 #34136, docs: simplify wording #34145, run rustfmt on libflate folder #34146, run rustfmt on librustc_bitflags folder #34148, Updated README to account for changes in MSYS2 #34159, Fixed two little Game Of Thrones References #34160, docs: Improve char::to_{lower,upper}case examples #34165, Fix BTreeMap example typo #34175, fix indentation in README #34184, doc: intro should be 1 sentence #34185
- Failed merges:
The book's "Error handling with Box<Error>" section talks about Box<Error>. In the actual example Box<Error + Send + Sync> is used instead so that the corresponding From impls could be used to convert a plain string to an error type. Rust 1.7 added support for conversion from &str/String to Box<Error>, so this gotcha and later references to it can now be removed.
One of the newest versions of MSYS2 now only has one .cmd file which replaces the old bat files. It has to be used to launch the mingw32/64 shell.
Fixed: conflicting spelling of "Jon Snow" Fixed: It's call "Night's Watch"
Collect the results to a String to make it clear that it will not always return only one char and add examples showing that.
The whole example is made around movies reviews, but that one line says "review some books".
Also, do not repeat name of type
run rustfmt on map.rs in libcollections/btree folder
…veklabnik Remove a gotcha from book/error-handling.md The book's "Error handling with `Box<Error>`" section talks about `Box<Error>`. In the actual example `Box<Error + Send + Sync>` is used instead so that the corresponding From impls could be used to convert a plain string to an error type. Rust 1.7 added support for conversion from `&str`/`String` to `Box<Error>`, so this gotcha and later references to it can now be removed. r? @steveklabnik
…=nikomatsakis Test case for borrowk ICE rust-lang#25579 r? @nikomatsakis Fixes rust-lang#25579
docs: simplify wording It took me more then a moment to decipher "with no non-`'static`" thing :) "`'static` type" should say the same thing more clearly. r? @steveklabnik
…agisa run rustfmt on libflate folder
…agisa run rustfmt on librustc_bitflags folder
Updated README to account for changes in MSYS2 One of the newest versions of MSYS2 now only has one .cmd file which replaces the old bat files. It has to be used to launch the mingw32/64 shell.
…umeGomez Fixed two little Game Of Thrones References Fixed: conflicting spelling of "Jon Snow" Fixed: It's call "Night's Watch"
docs: Improve char::to_{lower,upper}case examples
Collect the results to a String to make it clear that it will not always
return only one char and add examples showing that.
r? @steveklabnik
Fix BTreeMap example typo The whole example is made around movies reviews, but that one line says "review some books".
fix indentation in README
…klabnik doc: intro should be 1 sentence Also, do not repeat name of type
|
r? @aturon (rust_highfive has picked a reviewer for you, use r? to override) |
|
@bors r+ p=1 |
|
📌 Commit 107d423 has been approved by |
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.