Skip to content

Rollup of 4 pull requests - #50033

Merged
bors merged 13 commits into
rust-lang:masterfrom
GuillaumeGomez:rollup
Apr 17, 2018
Merged

Rollup of 4 pull requests#50033
bors merged 13 commits into
rust-lang:masterfrom
GuillaumeGomez:rollup

Conversation

@GuillaumeGomez

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

zestererand others added 13 commits April 5, 2018 18:12
`String::replace_range` was previously called `String::splice`, so this
note was necessary to differentiate it from the `Vec` method. Now that
it's renamed, this note no longer seems necessary.
Removed 'proc' from the reserved keywords list
Remove 'proc' from the reserved keywords list.
'proc' is a very useful identifier name for a lot of things. It's especially useful when dealing with processes, operating system internals, and kernel development.
…umeGomez
Remove no longer necessary comparison to Vec::splice.
`String::replace_range` was previously called `String::splice`, so this
note was necessary to differentiate it from the `Vec` method. Now that
it's renamed, this note no longer seems necessary.
…laumeGomez
rustdoc: Don't include private paths in all.html
For example the `std` [`all.html`](https://doc.rust-lang.org/nightly/std/all.html) includes references to the `coresimd` module which is a private implementation detail.
r? @GuillaumeGomez
@rust-highfive

Copy link
Copy Markdown
Contributor

Some changes occurred in HTML/CSS.

cc @GuillaumeGomez

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @steveklabnik

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

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 17, 2018
@GuillaumeGomez

Copy link
Copy Markdown
MemberAuthor

Some important changes in rustdoc (which includes a fix) so I'd like to get it in quickly.

@bors: r+ p=4

@bors

bors commented Apr 17, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 92d29c1 has been approved by GuillaumeGomez

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 17, 2018
@bors

bors commented Apr 17, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 92d29c1 with merge 9379bcd...

bors added a commit that referenced this pull request Apr 17, 2018
Rollup of 4 pull requests
Successful merges:
- #49699 (Removed 'proc' from the reserved keywords list)
- #49966 (Multiple query search)
- #50013 (Remove no longer necessary comparison to Vec::splice.)
- #50032 (rustdoc: Don't include private paths in all.html)
Failed merges:
@bors

bors commented Apr 17, 2018

Copy link
Copy Markdown
Collaborator

☀️ Test successful - status-appveyor, status-travis
Approved by: GuillaumeGomez
Pushing 9379bcd to master...

@bors
bors merged commit 92d29c1 into rust-lang:masterApr 17, 2018
@GuillaumeGomez
GuillaumeGomez deleted the rollup branch April 17, 2018 21:16
@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

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.

8 participants

@GuillaumeGomez@rust-highfive@bors@steveklabnik@Centril@zesterer@ollie27@frewsxcv