Skip to content

Rollup of 5 pull requests #42522

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

Merged
merged 15 commits into from
Jun 8, 2017
Merged

Rollup of 5 pull requests #42522

merged 15 commits into from
Jun 8, 2017

Conversation

frewsxcv and others added 15 commits June 5, 2017 23:43
Fixes build with libressl

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
…ples, r=QuietMisdreavus

Add doc examples for `CString` methods.

None
Changing error message from `contains interior mutability` to `may contain interior mutability`

Fixes rust-lang#40313 . I have changed the message from `contains interior mutability` to `may contain interior mutability` for the following example
```
use std::cell::Cell;
use std::panic::catch_unwind;
fn main() {
    let mut x = Cell::new(22);
    catch_unwind(|| { x.set(23); });
}
```
which has been added as a ui test.

Also, the message [here](https://github.com/gaurikholkar/rust/blob/master/src/librustc_mir/transform/qualify_consts.rs#L666) and it's respective `compile-fail` test have been modified.

cc @nikomatsakis  @Mark-Simulacrum  @eddyb
…, r=eddyb

Replace some matches with try.

This patch just replaces `match`es with `?` in the compiler, which I came across when I'm reading the parser.
Update step_by docs to say iterator instead of range

None
@frewsxcv
Copy link
Member Author

frewsxcv commented Jun 8, 2017

@bors r+ p=10

@bors
Copy link
Collaborator

bors commented Jun 8, 2017

📌 Commit 13ae42f has been approved by frewsxcv

@rust-highfive
Copy link
Contributor

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @brson (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@bors
Copy link
Collaborator

bors commented Jun 8, 2017

⌛ Testing commit 13ae42f with merge e1fa8de...

bors added a commit that referenced this pull request Jun 8, 2017
Rollup of 5 pull requests

- Successful merges: #42470, #42490, #42497, #42510, #42512
- Failed merges:
@bors
Copy link
Collaborator

bors commented Jun 8, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: frewsxcv
Pushing e1fa8de to master...

@bors bors merged commit 13ae42f into rust-lang:master Jun 8, 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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants