Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 13 pull requests #34196

Closed
wants to merge 29 commits into from
Closed

Rollup of 13 pull requests #34196

wants to merge 29 commits into from

Conversation

srinivasreddy and others added 29 commits June 5, 2016 11:39
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".
…lloc, r=nagisa

run rustfmt on liballoc_jemalloc folder
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
Add explanations for E0503 and E0508.

(cannot use `..` because it was mutably borrowed, cannot move out of type `..`, a non-copy fixed-size array)

Part of rust-lang#32777.
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 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"
…meGomez

Fix markdown formatting error of E0277, E0310 and E0502.

Fix bad format we see in https://doc.rust-lang.org/nightly/error-index.html#E0277.
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".
@rust-highfive
Copy link
Collaborator

r? @aturon

(rust_highfive has picked a reviewer for you, use r? to override)

@sanxiyn
Copy link
Member Author

sanxiyn commented Jun 10, 2016

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Jun 10, 2016

📌 Commit 48a6112 has been approved by sanxiyn

@bors
Copy link
Contributor

bors commented Jun 10, 2016

⌛ Testing commit 48a6112 with merge f6369d8...

@bors
Copy link
Contributor

bors commented Jun 10, 2016

💔 Test failed - auto-linux-64-opt-rustbuild

@sanxiyn sanxiyn closed this Jun 10, 2016
@sanxiyn sanxiyn deleted the rollup branch June 10, 2016 12:06
@Centril Centril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup
Projects
None yet
Development

Successfully merging this pull request may close these issues.