Skip to content

Rollup of 4 pull requests - #60054

Merged
bors merged 8 commits into
rust-lang:masterfrom
Centril:rollup-o40xxaa
Apr 18, 2019
Merged

Rollup of 4 pull requests#60054
bors merged 8 commits into
rust-lang:masterfrom
Centril:rollup-o40xxaa

Conversation

@Centril

Copy link
Copy Markdown
Contributor

Successful merges:

Failed merges:

r? @ghost

tesujiand others added 8 commits April 12, 2019 05:18
Re-export core::str::{EscapeDebug, EscapeDefault, EscapeUnicode} in std
cc rust-lang#59893
…c-fix, r=rkruppe
Remove collection-specific `with_capacity` documentation from `std::collections`
Fixesrust-lang#59931
The style of `std::collections` module doc is very much a beginner friendly guide, and documenting niche, collection-specific behaviour feels out of place, if not brittle.
The note about `VecDeque` is outdated (see issue), and while `Vec` probably won't change its guarantees any time soon, the users who are interested in its allocation properties will find that in its own documentation.
Resolve inconsistency in error messages between "parameter" and "variable".
The inconsistency was introduced in 104fe1c (rust-lang#33619), when a label saying `type variable` was added to an error with a message talking about `type parameters`.
Given that `parameter` is far more prevalent when referring to generics in the context of Rust, IMO it should be that in both the message and the label.
r? @nikomatsakis or @estebank
@Centril

Copy link
Copy Markdown
ContributorAuthor

@bors r+ p=4

@bors

bors commented Apr 17, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 42b3cf1 has been approved by Centril

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

bors commented Apr 17, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 42b3cf1 with merge 9387927...

bors added a commit that referenced this pull request Apr 17, 2019
Rollup of 4 pull requests
Successful merges:
- #59908 (Re-export core::str::{EscapeDebug, EscapeDefault, EscapeUnicode} in std)
- #59984 (Remove collection-specific `with_capacity` documentation from `std::collections`)
- #60036 (Remove nrc from toolstate pings)
- #60037 (Resolve inconsistency in error messages between "parameter" and "variable".)
Failed merges:
r? @ghost
@bors

bors commented Apr 18, 2019

Copy link
Copy Markdown
Collaborator

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

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Apr 18, 2019
@bors
bors merged commit 42b3cf1 into rust-lang:masterApr 18, 2019
@Centril
Centril deleted the rollup-o40xxaa branch April 18, 2019 11:45
@CentrilCentril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.rollupA PR which is a rollupS-waiting-on-borsStatus: 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.

5 participants

@Centril@bors@tesuji@gluyas@eddyb