Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Place::Local(x) is now Place::Base(PlaceBase::Local(x)) #647

Merged
merged 2 commits into from
Mar 2, 2019

Conversation

spastorino
Copy link
Member

We need to merge this after the beta cut for this rust-lang/rust#58631 to work.
/cc @oli-obk

@RalfJung RalfJung added the S-blocked-on-rust Status: Blocked on landing a Rust PR label Feb 26, 2019
@RalfJung
Copy link
Member

We cannot land this before the rustc PR merges, but you can just break Miri after the beta train left.

@spastorino
Copy link
Member Author

@RalfJung and how do we land the PR on rustc with the CI failing because this PR is not in 😄
I'm not sure how all this stuff works ;).

@RalfJung
Copy link
Member

Yeah cyclic dependencies are fun. ;)

After Thursday, your PR can land on rustc even if it breaks Miri. The "though shall not break a tool" is only in effect the week before the beta train leaves.

@spastorino
Copy link
Member Author

@RalfJung good to know :)

@spastorino
Copy link
Member Author

@oli-obk @RalfJung this is mergeable now, just force pushed again because there was a conflict.

@oli-obk
Copy link
Contributor

oli-obk commented Mar 1, 2019

Hm. looks like we need to wait for a nightly.

@RalfJung RalfJung added S-waiting-on-nightly and removed S-blocked-on-rust Status: Blocked on landing a Rust PR labels Mar 1, 2019
@RalfJung RalfJung merged commit e3527fd into rust-lang:master Mar 2, 2019
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.

3 participants