Skip to content

Rollup of 4 pull requests #79306

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 8 commits into from
Nov 22, 2020
Merged

Conversation

GuillaumeGomez
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

sasurau4 and others added 8 commits November 20, 2020 21:33
…l, r=jyn514

Remove FIXME comment in some incremental test suite

Helps with rust-lang#62277

I removed FIXME comment in some incremental tests with [rustc_partition_codegened](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_incremental/assert_module_sources/index.html). This seems using codegen process. So it uses intentionally `build-pass`
Fix typo in doc comment for report_too_many_hashes

"to big" -> "too big"
… r=jyn514

Prevent feature information to be hidden if it's on the impl directly

Fixes rust-lang#79279.

So when a `#[doc(cfg...)]` is used on a trait impl directly, it's not hidden by the toggle.

![Screenshot from 2020-11-22 14-40-11](https://user-images.githubusercontent.com/3050060/99905528-997fab00-2cd1-11eb-83be-ed06b0cb97df.png)

r? `@jyn514`
@rustbot rustbot added the rollup A PR which is a rollup label Nov 22, 2020
@GuillaumeGomez
Copy link
Member Author

@bors: r+ p=4

@bors
Copy link
Collaborator

bors commented Nov 22, 2020

📌 Commit 749fe40 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, 2020
@bors
Copy link
Collaborator

bors commented Nov 22, 2020

⌛ Testing commit 749fe40 with merge 52e3cf1...

@bors
Copy link
Collaborator

bors commented Nov 22, 2020

☀️ Test successful - checks-actions
Approved by: GuillaumeGomez
Pushing 52e3cf1 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 22, 2020
@bors bors merged commit 52e3cf1 into rust-lang:master Nov 22, 2020
@rustbot rustbot added this to the 1.50.0 milestone Nov 22, 2020
@GuillaumeGomez GuillaumeGomez deleted the rollup-4cnudfj branch November 22, 2020 19:36
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
merged-by-bors This PR was explicitly merged by bors. 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.

6 participants