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 9 pull requests #78162

Merged
merged 21 commits into from
Oct 20, 2020
Merged

Rollup of 9 pull requests #78162

merged 21 commits into from
Oct 20, 2020

Conversation

GuillaumeGomez
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

bugadani and others added 21 commits October 17, 2020 13:18
Interning can skip any inhabited ZST type in general.
Now refers to `wrapping_*`, not `checked_*` for wrapping intrinsics.
These parameters don't get modified.
…, r=oli-obk

Optimize const value interning for ZST types

Interning can skip any inhabited ZST type in general.

Fixes rust-lang#68010

r? @oli-obk
we can test std and core panic macros together

r? @oli-obk
Move orphan module-name/mod.rs files into module-name.rs files
Wrapping intrinsics doc links update.

The links in the wrapping intrinsics docs now refer to the `wrapping_*` functions, not the `checked_*` functions.
Add some MIR-related regression tests

Closes rust-lang#68841
Closes rust-lang#75053
Closes rust-lang#76375
Closes rust-lang#77911

I think they're fixed by rust-lang#77306.
Don't update `entries` in `TypedArena` if T does not need drop

As far as I can tell, `entries` is only used when dropping `TypedArenaChunk`s and their contents. It is already ignored there, if T is not `mem::needs_drop`, this PR just skips updating it's value.

You can see `TypedArenaChunk` ignoring the entry count in L71. The reasoning is similar to what you can find in `DroplessArena`.

r? @oli-obk
…ievink

Drop unneeded `mut`

These parameters don't get modified.

Note that `trailing_comment` is pub and gets exported from `rustc_ast_pretty`. Is that considered to be a stable API? If yes, and you want to reserve the right to modify `self` in `trailing_comment` in the future, that hunk would need to be dropped.
…r=jyn514

Remove unused type from librustdoc

r? @jyn514
@GuillaumeGomez
Copy link
Member Author

@bors: r+ p=9

@bors
Copy link
Contributor

bors commented Oct 20, 2020

📌 Commit 1df5346 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 Oct 20, 2020
@camelid camelid added the rollup A PR which is a rollup label Oct 20, 2020
@bors
Copy link
Contributor

bors commented Oct 20, 2020

⌛ Testing commit 1df5346 with merge 31530e5...

@bors
Copy link
Contributor

bors commented Oct 20, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: GuillaumeGomez
Pushing 31530e5 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 20, 2020
@bors bors merged commit 31530e5 into rust-lang:master Oct 20, 2020
@rustbot rustbot added this to the 1.49.0 milestone Oct 20, 2020
@GuillaumeGomez GuillaumeGomez deleted the rollup-6a4qiqu branch October 21, 2020 08:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in 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.

None yet