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 #60377

Merged
merged 19 commits into from
Apr 29, 2019
Merged

Rollup of 9 pull requests #60377

merged 19 commits into from
Apr 29, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Apr 29, 2019

Successful merges:

Failed merges:

r? @ghost

mernen and others added 19 commits April 13, 2019 16:44
This renames `std::io::IoVec` to `std::io::IoSlice` and
`std::io::IoVecMut` to `std::io::IoSliceMut`, and stabilizes
`std::io::IoSlice`, `std::io::IoSliceMut`,
`std::io::Read::read_vectored`, and `std::io::Write::write_vectored`.

Closes rust-lang#58452
- Use the terms from the reference <https://doc.rust-lang.org/reference/items/implementations.html>
- Add code snippets to explain the terms
Fix equivalent string in escape_default docs

This newline should be escaped.
Option::flatten

This PR makes this possible.
```rust
assert_eq!(Some(6), Some(Some(6)).flatten());
assert_eq!(Some(6), Some(Some(6)).into());
```
hir: remove LoweredNodeId

It seems that we no longer need it, because nowadays we just want the `HirId` most of the time.
Stabilized vectored IO

This renames `std::io::IoVec` to `std::io::IoSlice` and
`std::io::IoVecMut` to `std::io::IoSliceMut`, and stabilizes
`std::io::IoSlice`, `std::io::IoSliceMut`,
`std::io::Read::read_vectored`, and `std::io::Write::write_vectored`.

Closes rust-lang#58452

r? @alexcrichton
Add test not to forget resolved ICE

closes rust-lang#55499

I added the example as a test.

r? @pnkfelix
Clarify the short explanation of E0207

After being greatly improved in rust-lang#33692, https://doc.rust-lang.org/error-index.html#E0207 uses terminology from the related RFC, which is different from the [reference](https://doc.rust-lang.org/reference/items/implementations.html), e.g. "self type" instead of "implementing type" and "trait reference" instead of "implemented trait".

It probably makes no difference to an experienced reader, but for a newbie like me it added to the confusion as you can't look up the definition of the terms being used and can't be sure you've guessed correctly...

I would also move the link to RFC to the top, as it seems to be the only doc that attempts to explain what the third criteria entails), but it seems to go against the accepted style.
resolve: Consider erroneous imports used to avoid duplicate diagnostics

Supersedes rust-lang#60295
Fixes rust-lang#48244
r? @estebank
…ntril

Add test case for labeled break in const assignment

Fixes rust-lang#51350.
@Centril
Copy link
Contributor Author

Centril commented Apr 29, 2019

@bors r+ p=9

@bors
Copy link
Contributor

bors commented Apr 29, 2019

📌 Commit 0494210 has been approved by Centril

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 29, 2019
@bors
Copy link
Contributor

bors commented Apr 29, 2019

⌛ Testing commit 0494210 with merge 00859e3...

bors added a commit that referenced this pull request Apr 29, 2019
Rollup of 9 pull requests

Successful merges:

 - #59946 (Fix equivalent string in escape_default docs)
 - #60256 (Option::flatten)
 - #60305 (hir: remove LoweredNodeId)
 - #60334 (Stabilized vectored IO)
 - #60353 (Add test not to forget resolved ICE)
 - #60356 (Stabilize str::as_mut_ptr)
 - #60358 (Clarify the short explanation of E0207)
 - #60359 (resolve: Consider erroneous imports used to avoid duplicate diagnostics)
 - #60360 (Add test case for labeled break in const assignment)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Apr 29, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: Centril
Pushing 00859e3 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 29, 2019
@bors bors mentioned this pull request Apr 29, 2019
@bors bors merged commit 0494210 into rust-lang:master Apr 29, 2019
@Centril Centril deleted the rollup-42fxe9u branch April 30, 2019 00:02
@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
merged-by-bors This PR was explicitly merged by bors. 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.

10 participants