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

Update panic machinery to match #[track_caller] changes. #1137

Merged
merged 3 commits into from
Jan 6, 2020

Conversation

anp
Copy link
Member

@anp anp commented Jan 1, 2020

This gets miri's tests passing again with rust-lang/rust#67137, I don't think it will pass CI until that has merged.

@RalfJung RalfJung added the S-blocked-on-rust Status: Blocked on landing a Rust PR label Jan 2, 2020
@RalfJung
Copy link
Member

RalfJung commented Jan 2, 2020

This looks right, thanks a lot. :)

@anp anp force-pushed the track-caller-update branch from 38ebe42 to 0a3f460 Compare January 5, 2020 00:29
@anp
Copy link
Member Author

anp commented Jan 5, 2020

Rebased now that rust-lang/rust#67137 has landed. Anything else I need to do to unbreak miri?

@JohnTitor
Copy link
Member

@anp you need to import rustc_span since some items were moved to there and update rust-version file.
See also: JohnTitor@6281e46

@anp
Copy link
Member Author

anp commented Jan 5, 2020

Thanks! Cherry-picked your commit, hopefully CI is happy.

@JohnTitor
Copy link
Member

Ugh, I didn't test on travis, this should make check suite green: JohnTitor@7edf4f4

@RalfJung
Copy link
Member

RalfJung commented Jan 6, 2020

Awesome. :)

@bors r+

@bors
Copy link
Contributor

bors commented Jan 6, 2020

📌 Commit 3607daf has been approved by RalfJung

@bors
Copy link
Contributor

bors commented Jan 6, 2020

⌛ Testing commit 3607daf with merge 50a5e20...

bors added a commit that referenced this pull request Jan 6, 2020
Update panic machinery to match #[track_caller] changes.

This gets miri's tests passing again with rust-lang/rust#67137, I don't think it will pass CI until that has merged.
@bors
Copy link
Contributor

bors commented Jan 6, 2020

☀️ Test successful - checks-travis, status-appveyor
Approved by: RalfJung
Pushing 50a5e20 to master...

@bors bors merged commit 3607daf into rust-lang:master Jan 6, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-blocked-on-rust Status: Blocked on landing a Rust PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants