Skip to content

Rollup of 7 pull requests #50275

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 31 commits into from
Apr 27, 2018
Merged

Rollup of 7 pull requests #50275

merged 31 commits into from
Apr 27, 2018

Conversation

kennytm
Copy link
Member

@kennytm kennytm commented Apr 27, 2018

Successful merges:

Failed merges:

steveklabnik and others added 25 commits April 9, 2018 14:04
Because they traverse data structures and build up strings, which is
wasted effort if those strings aren't printed.

The patch also removes some now-unnecessary log_enabled! tests at call
sites.
…dreavus

Add "the Rustc book"

This PR introduces a new book into the documentation, "The rustc book". We already have books for Cargo, and for Rustdoc, rustc should have some too. This book is focused on *users* of rustc, and provides a nice place to write documentation for users.

I haven't put content here, but plan on scaffolding it out very soon, and wanted this PR open for a few discussions first. One of those is "what exactly should said TOC be?" I plan on having a proposed one up tomorrow, but figured I'd let people know to start thinking about it now.

The big one is that we also will want to put https://github.com/rust-lang-nursery/rustc-guide in-tree as well, and the naming is... tough. I'm proposing:

* doc.rust-lang.org/rustc is "The Rustc book", to mirror the other tools' books.
* doc.rust-lang.org/rustc-contribution is "The Rustc contribution guide", and contains that book

@nikomatsakis et al, any thoughts on this? I'm not attached to it in particular, but had to put something together to get this discussion going. I think mirroring the other tools is a good idea for this work, but am not sure where exactly that leaves yours.

Fixes rust-docs/team#11
@rust-highfive
Copy link
Contributor

Some changes occurred in HTML/CSS.

cc @GuillaumeGomez

@rust-highfive
Copy link
Contributor

r? @steveklabnik

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 27, 2018
@kennytm
Copy link
Member Author

kennytm commented Apr 27, 2018

@bors r+ p=8

@bors bors 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 27, 2018
@bors
Copy link
Collaborator

bors commented Apr 27, 2018

⌛ Testing commit 63f6fb91d003f5e75d0d3de009c636eda0cf66c8 with merge 51b578908674da7ab11aaa70b3f5c2f298cebe28...

@bors
Copy link
Collaborator

bors commented Apr 27, 2018

💔 Test failed - status-appveyor

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 27, 2018
kennytm added 6 commits April 27, 2018 16:23
…er-to-2018-04-24, r=alexcrichton

Bump bootstrap compiler to 2018-04-24

r? @alexcrichton
Fix ICE with erroneous `impl Trait` in a trait impl

Fixes rust-lang#49841.
…=QuietMisdreavus

Add setting to go to item if there is only one result

Fixes rust-lang#50216.

r? @QuietMisdreavus
…Simulacrum

Make dump_{alloc,allocs,local}() no-ops when tracing is disabled.

Because they traverse data structures and build up strings, which is
wasted effort if those strings aren't printed.

The patch also removes some now-unnecessary log_enabled! tests at call
sites.

This is a big win for the Debug and Opt runs of coercions, tuple-stress, html5ever, and encoding.
```
coercions-opt
        avg: -7.8%      min: -14.8%     max: 0.1%
coercions
        avg: -8.0%      min: -12.8%     max: 0.1%
tuple-stress
        avg: -7.2%      min: -10.8%     max: -0.7%
tuple-stress-opt
        avg: -6.9%      min: -10.7%     max: 0.6%
html5ever
        avg: -4.6%      min: -7.3%      max: -0.3%
encoding
        avg: -2.4%      min: -4.5%      max: 0.1%
html5ever-opt
        avg: -2.7%      min: -4.2%      max: -0.2%
encoding-opt
        avg: -1.4%      min: -2.4%      max: 0.0%
```
…woerister

Rename InternedString to LocalInternedString and introduce a new thread-safe InternedString

This is an allocation-free alternative to rust-lang#46972.
@kennytm kennytm changed the title Rollup of 8 pull requests Rollup of 7 pull requests Apr 27, 2018
@kennytm
Copy link
Member Author

kennytm commented Apr 27, 2018

@bors r+

Removed #49891 (already testing)
Removed #50252 (I suspect the compile segfault during stage1-std on Windows is caused by this)
Added #49894 (it is the next one in queue)

@bors
Copy link
Collaborator

bors commented Apr 27, 2018

📌 Commit 44b5359 has been approved by kennytm

@bors bors 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 27, 2018
@bors
Copy link
Collaborator

bors commented Apr 27, 2018

⌛ Testing commit 44b5359 with merge ada45fd...

bors added a commit that referenced this pull request Apr 27, 2018
Rollup of 7 pull requests

Successful merges:

 - #49707 (Add "the Rustc book")
 - #50222 (Bump bootstrap compiler to 2018-04-24)
 - #50227 (Fix ICE with erroneous `impl Trait` in a trait impl)
 - #50229 (Add setting to go to item if there is only one result)
 - #50231 (Add more doc aliases)
 - #50246 (Make dump_{alloc,allocs,local}() no-ops when tracing is disabled.)
 - #49894 (Rename InternedString to LocalInternedString and introduce a new thread-safe InternedString)

Failed merges:
@bors
Copy link
Collaborator

bors commented Apr 27, 2018

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

# for free to join this conversation on GitHub. Already have an account? # 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.

10 participants