Skip to content

Conversation

RalfJung
Copy link
Member

This is a part of #85376 that can be easily split out.
r? @oli-obk

@rust-highfive
Copy link
Contributor

Some changes occured to the CTFE / Miri engine

cc @rust-lang/miri

Some changes occured to the CTFE / Miri engine

cc @rust-lang/miri

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 17, 2021
@oli-obk
Copy link
Contributor

oli-obk commented May 17, 2021

@bors r+

@bors
Copy link
Collaborator

bors commented May 17, 2021

📌 Commit 5d71c67 has been approved by oli-obk

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 17, 2021
@RalfJung RalfJung mentioned this pull request May 17, 2021
RalfJung added a commit to RalfJung/rust that referenced this pull request May 17, 2021
remove size field from Allocation

This is a part of rust-lang#85376 that can be easily split out.
r? `@oli-obk`
bors added a commit to rust-lang-ci/rust that referenced this pull request May 17, 2021
Rollup of 8 pull requests

Successful merges:

 - rust-lang#85087 (`eval_fn_call`: check the ABI of `body.source`)
 - rust-lang#85302 (Expand WASI abbreviation in docs)
 - rust-lang#85355 (More tests for issue-85255)
 - rust-lang#85367 (Fix invalid input:disabled CSS selector)
 - rust-lang#85374 (mark internal inplace_iteration traits as hidden)
 - rust-lang#85408 (remove size field from Allocation)
 - rust-lang#85409 (Simplify `cfg(any(unix, target_os="redox"))` in example to just `cfg(unix)`)
 - rust-lang#85412 (remove some functions that were only used by Miri)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit af1ac55 into rust-lang:master May 17, 2021
@rustbot rustbot added this to the 1.54.0 milestone May 17, 2021
@RalfJung RalfJung deleted the alloc-size branch May 18, 2021 08:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

5 participants