Skip to content

Conversation

RalfJung
Copy link
Member

This incorporates rust-lang/miri#1474. Last time that change caused trouble but I fixed xargo since then and now it should work.

Cc @rust-lang/miri r? @ghost

@RalfJung
Copy link
Member Author

@bors r+ rollup=never

@bors
Copy link
Collaborator

bors commented Jul 11, 2020

📌 Commit 6bda2e8 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 Jul 11, 2020
@Manishearth
Copy link
Member

Does this need to be rollup=never or can it be (the recently added) rollup=iffy? iffy means that it's okay to roll up but there's a decent chance it will break the rollup. Enables it to be rolled up, with caution

@RalfJung
Copy link
Member Author

Sure, "iffy" sounds fine. @bors rollup=iffy

@Manishearth
Copy link
Member

@bors rollup=iffy

going to mark it as iffy for now and try and roll it up

@Manishearth
Copy link
Member

lol thanks

Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 11, 2020
update miri

This incorporates rust-lang/miri#1474. [Last time](rust-lang#74146) that change caused trouble but I fixed xargo since then and [now it should work](rust-lang#74146 (comment)).

Cc @rust-lang/miri r? @ghost
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 12, 2020
…arth

Rollup of 10 pull requests

Successful merges:

 - rust-lang#72920 (Stabilize `transmute` in constants and statics but not const fn)
 - rust-lang#73715 (debuginfo:  Mangle tuples to be natvis friendly, typedef basic types)
 - rust-lang#74066 (Optimize is_ascii for str and [u8].)
 - rust-lang#74116 (Fix cross compilation of LLVM to aarch64 Windows targets)
 - rust-lang#74167 (linker: illumos ld does not support --eh-frame-hdr)
 - rust-lang#74168 (Add a help to use `in_band_lifetimes` in nightly)
 - rust-lang#74197 (Reword incorrect `self` token suggestion)
 - rust-lang#74213 (Minor refactor for rustc_resolve diagnostics match)
 - rust-lang#74240 (Fix rust-lang#74081 and add the test case from rust-lang#74236)
 - rust-lang#74241 (update miri)

Failed merges:

r? @ghost
@bors bors merged commit 95c5fb8 into rust-lang:master Jul 12, 2020
@cuviper cuviper added this to the 1.46 milestone May 2, 2024
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.

4 participants