Skip to content

Rollup of 13 pull requests - #48955

Merged
bors merged 37 commits into
rust-lang:masterfrom
kennytm:rollup
Mar 13, 2018
Merged

Rollup of 13 pull requests#48955
bors merged 37 commits into
rust-lang:masterfrom
kennytm:rollup

Conversation

NovemberZuluand others added 30 commits February 14, 2018 09:19
Make UnsafeCell doc easier to follow
remove italic as per @GuillaumeGomez suggestion
Merge three rules into one following @cramertj
These change from release to release and are impossible to get right,
since they are generated by Make magic.
(Meanwhile, a couple of parse-fail tests are moved to UI tests so that
the reader can see the new output, and an existing UI test is given a
more evocative name.)
The code for several of the core traits doesn't use hygenic macros.
This isn't a problem, except for the Debug trait, which is the only
one that uses a variable, named "builder".
Variables can't share names with unit structs, so attempting to
[derive(Debug)] on any type while a unit struct with the name
"builder" was in scope would result in an error.
This commit just changes the name of the variable to
"__debug_trait_builder", because I couldn't figure out how to get a
list of all unit structs in-scope from within the derive expansion
function. If someone wants to have a unit struct with
the exact name "__debug_trait_builder", they'll just have to do it
without a [derive(Debug)].
Pulls in a redesigned `std::simd` module as well as a replacement for the
`is_target_feature_detected!` macro
rephrase UnsafeCell doc
As shown by discussions on users.rust-lang.org [[1]], [[2]], UnsafeCell doc is not totally clear. I tried to made the doc univocal regarding what is allowed and what is not. The edits are based on my understanding following [[1]].
[1]: https://users.rust-lang.org/t/unsafecell-behavior-details/1560
[2]: https://users.rust-lang.org/t/is-there-a-better-way-to-overload-index-indexmut-for-a-rc-refcell/15591/12
Update Feature Request instructions
As noted in rust-lang#48393 the contribution instructions for submitting a Feature Request are a little hasty, suggesting that the user immediately create an issue in the RFC repository. For users that want to submit a feature request, let's instead point them directly to the README file for the RFC repository, which contains detailed instructions on how to submit a Feature Request.
Update L4Re target specification
Due to the dynamically generated linker arguments of the L4Re build system, it is not a good idea to hard-code them in Rust. This PR undoes this step. It also adds an empty implementation to retrieve the number of CPUs.
…labnik
Propagating upstream code of conduct changes
[This repository's code of conduct](https://github.com/rust-lang/rust/blob/master/CODE_OF_CONDUCT.md) is out of sync with the [rust-www code of conduct](https://github.com/rust-lang/rust-www/blob/master/en-US/conduct.md) due changes from rust-lang/prev.rust-lang.org#1062. This PR propagates those changes and brings the files back into sync.
r? @steveklabnik
tidy: Add a check for stray `.stderr` and `.stdout` files in UI test directories
Update stdsimd module
Pulls in a redesigned `std::simd` module as well as a replacement for the
`is_target_feature_detected!` macro
…y, r=estebank
in which some labels and notes are upgraded to structured suggestions
(Meanwhile, a couple of parse-fail tests are moved to UI tests so that
the reader can see the new output, and an existing UI test is given a
more evocative name.)
r? @estebank
…etrochenkov
Fix hygene issue when deriving Debug
The code for several of the core traits doesn't use hygenic macros.
This isn't a problem, except for the Debug trait, which is the only
one that uses a variable, named "builder".
Variables can't share names with unit structs, so attempting to
[derive(Debug)] on any type while a unit struct with the name
"builder" was in scope would result in an error.
This commit just changes the name of the variable to
"__debug_trait_builder", because I couldn't figure out how to get a
list of all unit structs in-scope from within the derive expansion
function. If someone wants to have a unit struct with
the exact name "__debug_trait_builder", they'll just have to do it
without a [derive(Debug)].
I also checked the implementations of the other built-in derives to
ensure they didn't declare any variables.
@rust-highfive

Copy link
Copy Markdown
Contributor

r? @sfackler

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

@kennytm

Copy link
Copy Markdown
MemberAuthor

@bors r+ p=9

@bors

bors commented Mar 12, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 34d9ffe has been approved by kennytm

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

bors commented Mar 12, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 34d9ffe with merge 82b80d6859ed876fb54a9f66756bbf06fc769038...

@bors

bors commented Mar 12, 2018

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@borsbors 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 Mar 12, 2018
@alexcrichton

Copy link
Copy Markdown
Member

@bors: retry

#44159

@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 Mar 12, 2018
Clarify interfaction between File::set_len and file cursor
…g, r=QuietMisdreavus
Remember state of top-level collapse toggle widget
This change allows the big top-right expand/collapse toggle to remember its setting across navigation or page reloads. Prior to this change, there was this annoyance:
- browse to some docs
- Click the minus button to collapse them
- browse to other docs (or reload the page)
- Everything is expanded again
The solution is based on storing a simple boolean flag in localStorage. I think it's a good improvement, but it does introduce the following potentially surprising behavior:
- browse to some docs
- click the minus button to collapse them
- click to expand a particular item (not the main top-right big one)
- reload the page, everything is collapsed
Paired with @DebugSteven on this.
…, r=QuietMisdreavus
Remove auto trait implementation section when empty
Fixesrust-lang#48882.
@kennytmkennytm changed the title Rollup of 9 pull requestsRollup of 13 pull requestsMar 12, 2018
@kennytm

Copy link
Copy Markdown
MemberAuthor

@bors r+

Added #48480, #48631, #48898, #48954

@bors

bors commented Mar 12, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 99d0ac0 has been approved by kennytm

@bors

bors commented Mar 12, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 99d0ac0 with merge c7cbe14...

bors added a commit that referenced this pull request Mar 12, 2018
Rollup of 13 pull requests
- Successful merges: #48201, #48705, #48725, #48824, #48877, #48880, #48887, #48928, #48934, #48480, #48631, #48898, #48954
- Failed merges:
@bors

bors commented Mar 13, 2018

Copy link
Copy Markdown
Collaborator

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

@bors
bors merged commit 99d0ac0 into rust-lang:masterMar 13, 2018
@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.

16 participants

@kennytm@rust-highfive@bors@alexcrichton@Centril@sfackler@NovemberZulu@jethrogb@focusaurus@klnusbaum@davidalber@GuillaumeGomez@petrochenkov@humenda@zackmdavis@Phlosioneer