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 11 pull requests #56155

Merged
merged 35 commits into from
Nov 22, 2018
Merged

Rollup of 11 pull requests #56155

merged 35 commits into from
Nov 22, 2018

Conversation

GuillaumeGomez
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

petertodd and others added 30 commits October 29, 2018 14:44
Without this change the generated documentation looks like this:

    fn deref(&self) -> &<ManuallyDrop<T> as Deref>::Target

Returning the actual type directly makes the generated docs more clear:

    fn deref(&self) -> &T
Previous version does not show that or_insert does not insert the
passed value, as the passed value was the same value as what was
already in the map.
This fixes the VecDeque pretty-printer to handle cases where
head < tail.
Closes rust-lang#55944
…t-lint, r=QuietMisdreavus

lint if a private item has doctests

Fixes rust-lang#55333.

r? @QuietMisdreavus
…f, r=TimNN

Return &T / &mut T in ManuallyDrop Deref(Mut) impl

Without this change the generated documentation looks like this:

    fn deref(&self) -> &<ManuallyDrop<T> as Deref>::Target

Returning the actual type directly makes the generated docs more clear:

    fn deref(&self) -> &T

Basically, compare how the impl for `Box<T>` and `ManuallyDrop<T>` looks in this screenshot:

![rust docs for ManuallyDrop as Deref](https://user-images.githubusercontent.com/7042/47673083-fc9dc280-db89-11e8-89b0-c6bde663feef.png)
Clarifying documentation for collections::hash_map::Entry::or_insert

Previous version does not show that or_insert does not insert the passed value, as the passed value was the same value as what was already in the map.
…tsakis

Fix VecDeque pretty-printer

This fixes the VecDeque pretty-printer to handle cases where
head < tail.
Closes rust-lang#55944
Suggest on closure args count mismatching with pipe span

Closes rust-lang#55891
r? @estebank
fix rust-lang#55972: Erroneous self arguments on bare functions emit subpar compilation error

rust-lang#55972

r? @estebank
Update any.rs documentation using keyword dyn

This will fix rust-lang#56062.
…crichton

Add SGX target to rustc

This adds the `x86_64-fortanix-unknown-sgx` target specification to the Rust compiler. See rust-lang#56066 for more details about this target.
…hton

Fix error message for `-C panic=xxx`.

Fixes rust-lang/cargo#6334
core/benches/num: Add `from_str/from_str_radix()` benchmarks

This was extracted from rust-lang#55973

/cc @alexcrichton
@GuillaumeGomez
Copy link
Member Author

@bors: r+ p=11

@bors
Copy link
Contributor

bors commented Nov 22, 2018

📌 Commit 61d7b3e has been approved by GuillaumeGomez

@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 Nov 22, 2018
@bors
Copy link
Contributor

bors commented Nov 22, 2018

⌛ Testing commit 61d7b3e with merge 93fa2d7...

bors added a commit that referenced this pull request Nov 22, 2018
Rollup of 11 pull requests

Successful merges:

 - #55367 (lint if a private item has doctests)
 - #55485 (Return &T / &mut T in ManuallyDrop Deref(Mut) impl)
 - #55784 (Clarifying documentation for collections::hash_map::Entry::or_insert)
 - #55961 (Fix VecDeque pretty-printer)
 - #55980 (Suggest on closure args count mismatching with pipe span)
 - #56002 (fix #55972: Erroneous self arguments on bare functions emit subpar compilation error)
 - #56063 (Update any.rs documentation using keyword dyn)
 - #56067 (Add SGX target to rustc)
 - #56078 (Fix error message for `-C panic=xxx`.)
 - #56106 (Remove some incorrect doc comments)
 - #56126 (core/benches/num: Add `from_str/from_str_radix()` benchmarks)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Nov 22, 2018

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

@bors bors merged commit 61d7b3e into rust-lang:master Nov 22, 2018
@GuillaumeGomez GuillaumeGomez deleted the rollup branch November 22, 2018 20:33
@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
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.

Erroneous self arguments on bare functions emit subpar compilation error