Skip to content

Rollup of 7 pull requests - #73259

Merged
bors merged 15 commits into
rust-lang:masterfrom
Dylan-DPC-zz:rollup-m6nw1n0
Jun 12, 2020
Merged

Rollup of 7 pull requests#73259
bors merged 15 commits into
rust-lang:masterfrom
Dylan-DPC-zz:rollup-m6nw1n0

Conversation

@Dylan-DPC-zz

Copy link
Copy Markdown

Successful merges:

Failed merges:

r? @ghost

alexcrichtonand others added 15 commits June 5, 2020 10:14
This commit removes the `#[cfg]` guards in `atomic::fence` on wasm
targets. Since these guards were originally added the upstream wasm
specification for threads gained an `atomic.fence` instruction, so LLVM
no longer panics on these intrinsics.
Although there aren't a ton of tests in-repo for this right now I've
tested locally and all of these fences generate `atomic.fence`
instructions in wasm.
Closesrust-lang#72997
Given a code
```rust
fn foo(x: u8, y: u32) -> bool {
x > y
}
fn main() {}
```
it could be more helpful to provide a suggestion to do "u32::from(x)"
rather than "y.try_into().unwrap()", since the latter may panic.
We do this by passing the LHS of a binary expression up the stack into
the coercion checker.
Closesrust-lang#73145
Minor refactoring
Minor refactoring
Update src/librustc_error_codes/error_codes/E0724.md
Co-authored-by: David Wood <Q0KPU0H1YOEPHRY1R2SN5B5RL@david.davidtw.co>
Update src/librustc_error_codes/error_codes/E0724.md
Co-authored-by: David Wood <Q0KPU0H1YOEPHRY1R2SN5B5RL@david.davidtw.co>
Update src/librustc_error_codes/error_codes/E0724.md
Co-authored-by: David Wood <Q0KPU0H1YOEPHRY1R2SN5B5RL@david.davidtw.co>
Minor refactoring
Now there are instructions on how to convert back and forth on both
structs, not just one.
Fix #[thread_local] statics as asm! sym operands
The `asm!` RFC specifies that `#[thread_local]` statics may be used as `sym` operands for inline assembly.
This also fixes a regression in the handling of `#[thread_local]` during monomorphization which caused link-time errors with multiple codegen units, most likely introduced by rust-lang#71192.
r? @oli-obk
…ark-Simulacrum
std: Enable atomic.fence emission on wasm32
This commit removes the `#[cfg]` guards in `atomic::fence` on wasm
targets. Since these guards were originally added the upstream wasm
specification for threads gained an `atomic.fence` instruction, so LLVM
no longer panics on these intrinsics.
Although there aren't a ton of tests in-repo for this right now I've
tested locally and all of these fences generate `atomic.fence`
instructions in wasm.
Closesrust-lang#65687Closesrust-lang#72997
…r-code-e0724, r=davidtwco
Add long error explanation for E0724
Add long explanation for the E0724 error code
Part of rust-lang#61137
Provide suggestion to convert numeric op LHS rather than unwrapping RHS
Given a code
```rust
fn foo(x: u8, y: u32) -> bool {
x > y
}
fn main() {}
```
it could be more helpful to provide a suggestion to do "u32::from(x)"
rather than "y.try_into().unwrap()", since the latter may panic.
We do this by passing the LHS of a binary expression up the stack into
the coercion checker.
Closesrust-lang#73145
Add various Zulip notifications for prioritization
Adapts `triagebot.toml` for rust-lang/triagebot#616 and adds various Zulip notifications for the Prioritization WG workflow.
We should also add indications about the procedure for handling those events, cc @rust-lang/wg-prioritization.
r? @spastorino
This should be merged as soon as possible after rust-lang/triagebot#616 is merged, cc @Mark-Simulacrum
Add comment about LocalDefId -> DefId
Now there are instructions on how to convert back and forth on both
structs, not just one.
See also rust-lang#73076
r? @lcnr
@Dylan-DPC-zz

Copy link
Copy Markdown
Author

@bors r+ rollup=never p=7

@bors

bors commented Jun 11, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 85a48d0 has been approved by Dylan-DPC

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 11, 2020
@bors

bors commented Jun 11, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 85a48d0 with merge 14027f3...

@bors

bors commented Jun 12, 2020

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-azure
Approved by: Dylan-DPC
Pushing 14027f3 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Jun 12, 2020
@bors
bors merged commit 14027f3 into rust-lang:masterJun 12, 2020
@cuvipercuviper added this to the 1.46 milestone May 2, 2024
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.S-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.

10 participants

@Dylan-DPC-zz@bors@cuviper@alexcrichton@Amanieu@mati865@ayazhafiz@LeSeulArtichaut@jyn514@Dylan-DPC