Skip to content

Conversation

RalfJung
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

hyd-dev and others added 18 commits May 9, 2021 13:39
`eval_fn_call`: check the ABI of `body.source`

And stop checking `instance_ty.fn_sig(*self.tcx).abi()`, if the function is not an intrinsic.
Addresses rust-lang/miri#1776 (comment).
No idea how to test this without Miri...
Expand WASI abbreviation in docs

I was pretty sure this was related to something for WebAssembly but wasn't 100% sure so I checked but even on these top-level docs I couldn't find the abbreviation expanded. I'm normally used to Rust docs being detailed and explanatory and writing abbreviations like this out in full at least once so I thought it was worth the change. Feel free to close this if it's too much.
… r=varkor

More tests for issue-85255

Add more test for `pub(crate)`.

r? ``@varkor``
Fix invalid input:disabled CSS selector

For some reason, we used "search-focus" instead of "search-input"...

r? ``@jsha``
…onSapin

mark internal inplace_iteration traits as hidden

resolves rust-lang#85373

r? ``@SimonSapin``
remove size field from Allocation

This is a part of rust-lang#85376 that can be easily split out.
r? ``@oli-obk``
Simplify `cfg(any(unix, target_os="redox"))` in example to just `cfg(unix)`

Update example for `OsString` that handled `redox` seperately from `unix`: Redox has been completely integrated under `target_family="unix"`, so `cfg(unix)` implies `target_os="redox"`

https://github.com/rust-lang/rust/blob/35dbef235048f9a2939dc20effe083ca483c37ff/compiler/rustc_target/src/spec/redox_base.rs#L26
remove some functions that were only used by Miri

and Miri does not need them any more with rust-lang/miri#1805.

r? ``@oli-obk``
@rustbot rustbot added the rollup A PR which is a rollup label May 17, 2021
@RalfJung
Copy link
Member Author

@bors r+ p=5

@bors
Copy link
Collaborator

bors commented May 17, 2021

📌 Commit a28be5c has been approved by RalfJung

@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 May 17, 2021
@bors
Copy link
Collaborator

bors commented May 17, 2021

⌛ Testing commit a28be5c with merge 3e99439...

@bors
Copy link
Collaborator

bors commented May 17, 2021

☀️ Test successful - checks-actions
Approved by: RalfJung
Pushing 3e99439 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 17, 2021
@bors bors merged commit 3e99439 into rust-lang:master May 17, 2021
@rustbot rustbot added this to the 1.54.0 milestone May 17, 2021
@RalfJung RalfJung deleted the rollup-ueqcik4 branch May 18, 2021 07:25
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.

7 participants