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

rustup for error reform #1219

Merged
merged 6 commits into from
Mar 19, 2020
Merged

rustup for error reform #1219

merged 6 commits into from
Mar 19, 2020

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Mar 9, 2020

This is the Miri side of rust-lang/rust#69839.

@RalfJung RalfJung added the S-blocked-on-rust Status: Blocked on landing a Rust PR label Mar 9, 2020
@RalfJung RalfJung changed the title rustup for error refor rustup for error reform Mar 9, 2020
@RalfJung RalfJung force-pushed the error-cleanup branch 2 times, most recently from 243b4f8 to d6d5365 Compare March 9, 2020 18:55
@bors
Copy link
Collaborator

bors commented Mar 15, 2020

☔ The latest upstream changes (presumably #1227) made this pull request unmergeable. Please resolve the merge conflicts.

@@ -1,9 +1,9 @@
fn main() {
fn f() {}
fn f() {} //~ ERROR calling a function with more arguments than it expected
Copy link
Member Author

Choose a reason for hiding this comment

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

Interestingly, the span moved here. Might have to do with switching to a try block?

Copy link
Member Author

Choose a reason for hiding this comment

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

Ah it probably does, throw_*! macros internally use return so try no longer catches them oops

@RalfJung
Copy link
Member Author

@bors r+

@bors
Copy link
Collaborator

bors commented Mar 19, 2020

📌 Commit 49051e0 has been approved by RalfJung

@bors
Copy link
Collaborator

bors commented Mar 19, 2020

⌛ Testing commit 49051e0 with merge 0ff05c4...

@bors
Copy link
Collaborator

bors commented Mar 19, 2020

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

@bors bors merged commit 0ff05c4 into rust-lang:master Mar 19, 2020
@RalfJung RalfJung deleted the error-cleanup branch March 19, 2020 09:07
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.

2 participants