Skip to content

Rollup of 9 pull requests - #78162

Merged
bors merged 21 commits into
rust-lang:masterfrom
GuillaumeGomez:rollup-6a4qiqu
Oct 20, 2020
Merged

Rollup of 9 pull requests#78162
bors merged 21 commits into
rust-lang:masterfrom
GuillaumeGomez:rollup-6a4qiqu

Conversation

@GuillaumeGomez

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost

bugadaniand 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.
Fixesrust-lang#68010
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
Closesrust-lang#68841Closesrust-lang#75053Closesrust-lang#76375Closesrust-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.
@GuillaumeGomez

Copy link
Copy Markdown
MemberAuthor

@bors: r+ p=9

@bors

bors commented Oct 20, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 1df5346 has been approved by GuillaumeGomez

@borsbors 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
@camelidcamelid added the rollup A PR which is a rollup label Oct 20, 2020
@bors

bors commented Oct 20, 2020

Copy link
Copy Markdown
Collaborator

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

@bors

bors commented Oct 20, 2020

Copy link
Copy Markdown
Collaborator

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

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Oct 20, 2020
@bors
bors merged commit 31530e5 into rust-lang:masterOct 20, 2020
@rustbotrustbot 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 freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.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.

11 participants

@GuillaumeGomez@bors@camelid@rustbot@bugadani@wesleywiser@RalfJung@est31@mbartlett21@JohnTitor@LingMan