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 9 pull requests #45755

Merged
merged 29 commits into from
Nov 4, 2017
Merged

Rollup of 9 pull requests #45755

merged 29 commits into from
Nov 4, 2017

Conversation

ratmice and others added 29 commits October 26, 2017 05:26
Include the license of libstd in the cargo metadata
Include the repository info for libstd in the Cargo metadata.
Include a description field for libstd in Cargo metadata.
`accomodate` -> `accommodate`
issue rust-lang#45357 don't build clippy stage 1

rust-lang#45357
Wasn't sure top_stage was the right thing, but seemed to go ahead building clippy stage 2.
Add a nicer error message for missing  in for loop, fixes rust-lang#40782.

As suggested by @estebank in issue rust-lang#40782, this works in the same way as rust-lang#42578: if the in keyword is missing, we continue parsing the expression and if this works correctly an adapted error message is produced. Otherwise we return the old error.

A specific test case has also been added.
This is my first PR on rust-lang/rust so any feedback is very welcome.
add Cargo metadata to libstd

Add license and repository metadata to libstd
Fix typo

`accomodate` -> `accommodate`
…tput, r=alexcrichton

improve compiletest output for errors from mir-opt tests

improvement:
1. Report filename against general cannot open error
2. Report current MIR block
Fix libstd compile error for windows-gnu targets without `backtrace`

This is basically an addition to rust-lang#44979. Compiling `libstd` still fails when targeting `windows-gnu` with `panic = "abort"` because the items in the `...c::gnu` module are not used. They are only referenced from `backtrace_gnu.rs`, which is indirectly feature gated behind `backtrace` [here](https://github.com/rust-lang/rust/blob/9f3b09116b742b2606dc5f36f9145e0c89e4010b/src/libstd/sys/windows/mod.rs#L23).
…steveklabnik

Add tests for methods listing in rust docs

r? @rust-lang/docs
@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

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

@kennytm
Copy link
Member Author

kennytm commented Nov 4, 2017

@bors r+ p=9

@bors
Copy link
Contributor

bors commented Nov 4, 2017

📌 Commit e3b25a5 has been approved by kennytm

@kennytm kennytm added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Nov 4, 2017
@bors
Copy link
Contributor

bors commented Nov 4, 2017

⌛ Testing commit e3b25a5 with merge 9acc333...

bors added a commit that referenced this pull request Nov 4, 2017
Rollup of 9 pull requests

- Successful merges: #45548, #45610, #45639, #45669, #45681, #45718, #45722, #45739, #45746
- Failed merges:
@bors
Copy link
Contributor

bors commented Nov 4, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: kennytm
Pushing 9acc333 to master...

@bors bors merged commit e3b25a5 into rust-lang:master Nov 4, 2017
@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 S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.