Skip to content

Conversation

dwrensha
Copy link
Contributor

Fixes breakage from rust-lang/rust#41917 and rust-lang/rust#42162.

Copy link
Contributor

@oli-obk oli-obk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks

@@ -788,11 +788,15 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> {
self.write_value(val, dest, dest_ty)?;
}

Box(ty) => {
NullaryOp(mir::NullOp::Box, ty) => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just gotta love Rustaceans... "NullaryOp", because! consistency!

@oli-obk
Copy link
Contributor

oli-obk commented May 30, 2017

Did you really mean rust-lang/rust#41917 ? That impacts miri, but not in the way you changed the code. rust-lang/rust#41917 should allow us to erase most of our drop code.

@oli-obk
Copy link
Contributor

oli-obk commented May 30, 2017

oh nevermind, the breakage really is from there. I'll remove that hacky stuff I wrote in a separate PR

@oli-obk oli-obk merged commit 53412ab into rust-lang:master May 30, 2017
@dwrensha dwrensha deleted the rustup branch May 30, 2017 14:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants