Skip to content

Rollup of 5 pull requests - #96548

Merged
bors merged 11 commits into
rust-lang:masterfrom
Dylan-DPC:rollup-m3xkqxg
Apr 29, 2022
Merged

bors merged 11 commits into
rust-lang:masterfrom
Dylan-DPC:rollup-m3xkqxg

Conversation

@Dylan-DPC

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

alexcrichton and others added 11 commits April 27, 2022 07:29
Looks like this changed in a recent LLVM update but wasm64 isn't built
on CI so it wasn't caught until now.

Closes rust-lang#96463
This reverts commit 9aed829.

Fixes rust-lang#96435 , a regression
in crates doing `use std::ffi::*;` and `use std::os::raw::*;`.

We can re-add this re-export once the `core::ffi` types
are stable, and thus the `std::os::raw` types can become re-exports as
well, which will avoid the conflict. (Type aliases to the same type
still conflict, but re-exports of the same type don't.)
…out, r=wesleywiser

Update data layout string for wasm64-unknown-unknown

Looks like this changed in a recent LLVM update but wasm64 isn't built
on CI so it wasn't caught until now.

Closes rust-lang#96463
…e, r=joshtriplett

HashMap doc: Don't use monospace font for 'Entry Api'
…rt, r=yaahc

Revert "Re-export core::ffi types from std::ffi"

This reverts commit 9aed829.

Fixes rust-lang#96435 , a regression
in crates doing `use std::ffi::*;` and `use std::os::raw::*;`.

We can re-add this re-export once the `core::ffi` types
are stable, and thus the `std::os::raw` types can become re-exports as
well, which will avoid the conflict. (Type aliases to the same type
still conflict, but re-exports of the same type don't.)
…ntal_permitted, r=jackh726

Revert diagnostic duplication and accidental stabilization

fixes rust-lang#96460

this is an accidental stabilization that we should put into the beta. I believe it is low-risk, because it was literally what we had before rust-lang#94081

The effect on tests is massive, but mostly deduplication of diagnostics and some minor span changes.
Add `@feat.00` symbol to symbols.o for COFF

Fix rust-lang#96498

This is based on top of rust-lang#96444.

r? ``@petrochenkov``
@rustbot rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Apr 29, 2022
@Dylan-DPC

Copy link
Copy Markdown
Member Author

@bors r+ rollup=never p=5

@bors

bors commented Apr 29, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit 48199e0 has been approved by Dylan-DPC

@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 Apr 29, 2022
@bors

bors commented Apr 29, 2022

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 48199e0 with merge 87937d3...

@bors

bors commented Apr 29, 2022

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: Dylan-DPC
Pushing 87937d3 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 29, 2022
@bors
bors merged commit 87937d3 into rust-lang:master Apr 29, 2022
@rustbot rustbot added this to the 1.62.0 milestone Apr 29, 2022
@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (87937d3): comparison url.

Summary:

  • Primary benchmarks: no relevant changes found
  • Secondary benchmarks: 🎉 relevant improvements found
Regressions 😿
(primary)
Regressions 😿
(secondary)
Improvements 🎉
(primary)
Improvements 🎉
(secondary)
All 😿 🎉
(primary)
count1 0 0 0 2 0
mean2 N/A N/A N/A -0.3% N/A
max N/A N/A N/A -0.4% N/A

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

Footnotes

  1. number of relevant changes ↩

  2. the arithmetic mean of the percent change ↩

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. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants