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 7 pull requests #36651

Merged
merged 15 commits into from
Sep 22, 2016
Merged

Rollup of 7 pull requests #36651

merged 15 commits into from
Sep 22, 2016

Conversation

mikhail-m1 and others added 15 commits September 16, 2016 21:44
A long time ago non-panicking `unwrap` methods were renamed to `into_inner` in this Pull Request: rust-lang#19149

Looks like this doc comment was not updated however.
…rner

Updated E0560 to new error format

Added a small bit of code to add a label for E0560.

Also renamed src/test/compile-fail/E560.rs file to E0560.rs (not sure why it was named E560).
Updated all test cases which check this error.

Closes rust-lang#36199
…_fix, r=bluss

fixed the safety header/wording in option.rs

Fixes rust-lang#36581

screenshot of the rendered documentation: http://imgur.com/14kLVrA

r? @steveklabnik
…pasel422

Minor correction in `sort_by_key` doc comment

The parameter to `sort_by_key` is named `f`, not `key`.
Fix outdated Doc Comment on BufReader::seek

A long time ago non-panicking `unwrap` methods were renamed to `into_inner` in this Pull Request: rust-lang#19149

Looks like this doc comment was not updated however.
@sophiajt
Copy link
Contributor Author

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Sep 22, 2016

📌 Commit c1e3938 has been approved by jonathandturner

@rust-highfive
Copy link
Collaborator

r? @brson

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

@bors
Copy link
Contributor

bors commented Sep 22, 2016

⌛ Testing commit c1e3938 with merge 4c04e36...

bors added a commit that referenced this pull request Sep 22, 2016
Rollup of 7 pull requests

- Successful merges: #36330, #36423, #36539, #36571, #36589, #36600, #36632
- Failed merges:
@bors bors merged commit c1e3938 into rust-lang:master Sep 22, 2016
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 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.