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

Miri error messages: avoid try terminology #71206

Merged
merged 2 commits into from
Apr 17, 2020
Merged

Conversation

RalfJung
Copy link
Member

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 16, 2020
src/librustc_middle/mir/interpret/error.rs Outdated Show resolved Hide resolved
}
NoMirFor(did) => write!(f, "could not load MIR for {:?}", did),
NoMirFor(did) => write!(f, "cannot load MIR for {:?}", did),
Copy link
Contributor

Choose a reason for hiding this comment

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

while it's true that we can't, maybe it would be more helpful to the user if we told them that "no MIR exists for {:?}" or " there is no MIR Body associated with {:?}"

Copy link
Member Author

Choose a reason for hiding this comment

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

Since rlibs can have partial MIR I think we should not say "there is no MIR", just that we cannot get it... see my latest commit.

Copy link
Contributor

Choose a reason for hiding this comment

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

Oh right, good point

@oli-obk
Copy link
Contributor

oli-obk commented Apr 16, 2020

@bors r+

@bors
Copy link
Contributor

bors commented Apr 16, 2020

📌 Commit 250b27d has been approved by oli-obk

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 16, 2020
@RalfJung
Copy link
Member Author

@bors rollup

bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 17, 2020
Rollup of 7 pull requests

Successful merges:

 - rust-lang#70578 (Add long error explanation for E0657)
 - rust-lang#70910 (Hides default fns inside Fuse impl to avoid exposing it to any crate)
 - rust-lang#71164 (reword Miri validity errors: undefined -> uninitialized)
 - rust-lang#71182 (Add some regression tests)
 - rust-lang#71206 (Miri error messages: avoid try terminology)
 - rust-lang#71220 (Dogfood or_patterns in the standard library)
 - rust-lang#71225 (Fix typo in Default trait docs: Provides -> Provide)

Failed merges:

r? @ghost
@bors bors merged commit b2e4d48 into rust-lang:master Apr 17, 2020
@RalfJung RalfJung deleted the dont-try branch April 17, 2020 07:41
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