Skip to content

Changing the structure of mir::interpret::InterpError - #62969

Merged
bors merged 25 commits into
rust-lang:masterfrom
saleemjaffer:declutter_interperror
Aug 2, 2019
Merged

Changing the structure of mir::interpret::InterpError#62969
bors merged 25 commits into
rust-lang:masterfrom
saleemjaffer:declutter_interperror

Conversation

@saleemjaffer

@saleemjaffersaleemjaffer commented Jul 25, 2019•
edited
Loading

Copy link
Copy Markdown
Contributor

Implements this

@rust-highfive

rust-highfive commented Jul 25, 2019

Copy link
Copy Markdown
Contributor

r? @matthewjasper

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 25, 2019
@saleemjaffer

saleemjaffer commented Jul 25, 2019

Copy link
Copy Markdown
ContributorAuthor

r? @RalfJung@oli-obk

@saleemjaffersaleemjaffer mentioned this pull request Jul 25, 2019
Closed
4 tasks
@rust-highfive

This comment has been minimized.

Sign in to view
RalfJung
RalfJung reviewed Jul 25, 2019
View reviewed changes
Comment threadsrc/librustc/mir/interpret/error.rs Outdated
RalfJung
RalfJung reviewed Jul 25, 2019
View reviewed changes
Comment threadsrc/librustc/mir/interpret/error.rs Outdated
@rust-highfive

This comment has been minimized.

Sign in to view
RalfJung
RalfJung reviewed Jul 26, 2019
View reviewed changes
Comment threadsrc/librustc/mir/interpret/error.rs Outdated
RalfJung
RalfJung reviewed Jul 26, 2019
View reviewed changes
Comment threadsrc/librustc/mir/interpret/error.rs Outdated
RalfJung
RalfJung reviewed Jul 26, 2019
View reviewed changes
Comment threadsrc/librustc/mir/interpret/error.rs Outdated
RalfJung
RalfJung reviewed Jul 26, 2019
View reviewed changes
Comment threadsrc/librustc/mir/interpret/error.rs Outdated
@rust-highfive

This comment has been minimized.

Sign in to view
@saleemjaffer
saleemjafferforce-pushed the declutter_interperror branch 2 times, most recently from 642786d to 8705fc9CompareJuly 26, 2019 10:17
saleemjaffer
saleemjaffer commented Jul 26, 2019
View reviewed changes
Comment threadsrc/librustc/mir/interpret/error.rs Outdated
@rust-highfive

This comment has been minimized.

Sign in to view
RalfJung
RalfJung reviewed Jul 26, 2019
View reviewed changes
Comment threadsrc/librustc/mir/interpret/error.rs Outdated
RalfJung
RalfJung reviewed Jul 26, 2019
View reviewed changes
Comment threadsrc/librustc/mir/interpret/error.rs Outdated
@rust-highfive

This comment has been minimized.

Sign in to view
RalfJung
RalfJung reviewed Jul 26, 2019
View reviewed changes
Comment threadsrc/librustc/mir/interpret/error.rs Outdated
RalfJung
RalfJung reviewed Jul 26, 2019
View reviewed changes
Comment threadsrc/librustc/mir/interpret/error.rs Outdated
@rust-highfive

This comment has been minimized.

Sign in to view
RalfJung
RalfJung reviewed Jul 26, 2019
View reviewed changes
Comment threadsrc/librustc/mir/interpret/error.rs Outdated
RalfJung
RalfJung reviewed Jul 26, 2019
View reviewed changes
Comment threadsrc/librustc/mir/interpret/error.rs Outdated
RalfJung
RalfJung reviewed Jul 26, 2019
View reviewed changes
Comment threadsrc/librustc/mir/interpret/error.rs Outdated
@bors

This comment has been minimized.

Sign in to view
oli-obk
oli-obk requested changes Jul 31, 2019
View reviewed changes

@oli-obkoli-obk left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Just some nits then this lgtm.

Comment threadsrc/librustc_mir/interpret/cast.rs Outdated
Comment threadsrc/librustc_mir/interpret/eval_context.rs Outdated
Comment threadsrc/librustc_mir/interpret/memory.rs Outdated
@RalfJung

RalfJung commented Jul 31, 2019•
edited
Loading

Copy link
Copy Markdown
Member

@saleemjaffer if you think this is ready for reviews, please remove the "WIP". ;)

RalfJung
RalfJung approved these changes Jul 31, 2019
View reviewed changes

@RalfJungRalfJung left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks a lot!

r=me with these nits fixed.

Comment threadsrc/librustc/mir/interpret/mod.rs Outdated
Comment threadsrc/librustc/mir/interpret/mod.rs
Comment threadsrc/librustc_mir/interpret/eval_context.rs Outdated
Comment threadsrc/librustc_mir/transform/const_prop.rs Outdated
@saleemjaffersaleemjaffer changed the title [WIP] Changing the structure of mir::interpret::InterpErrorChanging the structure of mir::interpret::InterpErrorAug 1, 2019
RalfJung
RalfJung reviewed Aug 1, 2019
View reviewed changes
Comment threadsrc/librustc/mir/interpret/mod.rs Outdated
RalfJung
RalfJung reviewed Aug 1, 2019
View reviewed changes
Comment threadsrc/librustc_mir/transform/const_prop.rs Outdated
@RalfJung

RalfJung commented Aug 1, 2019

Copy link
Copy Markdown
Member

r=me

;-)
This convention means that as far as I am concerned, this PR is good to go with the nits fixed -- so anyone with bors powers could then do at-bors r=RalfJung.

saleemjaffer
saleemjaffer commented Aug 1, 2019
View reviewed changes
Comment threadsrc/librustc_mir/transform/const_prop.rs
@saleemjaffer

saleemjaffer commented Aug 1, 2019

Copy link
Copy Markdown
ContributorAuthor

@bors r= RalfJung

@bors

bors commented Aug 1, 2019

Copy link
Copy Markdown
Collaborator

@saleemjaffer: 🔑 Insufficient privileges: Not in reviewers

@saleemjaffer

saleemjaffer commented Aug 1, 2019

Copy link
Copy Markdown
ContributorAuthor

@RalfJung I do not have bors privileges XD. So I cannot do this.

@RalfJung

RalfJung commented Aug 1, 2019

Copy link
Copy Markdown
Member

That's okay. :) I use r=me either way, so I don't have to figure out in advance if someone has bors powers.^^

@bors r+

@bors

bors commented Aug 1, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 00d32e8 has been approved by RalfJung

@borsbors 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 Aug 1, 2019
@CentrilCentril mentioned this pull request Aug 1, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Aug 2, 2019
@Centril
Rollup merge ofrust-lang#62969- saleemjaffer:declutter_interperror,…
51dc78e
… r=RalfJung
Changing the structure of `mir::interpret::InterpError`
Implements [this](rust-lang/const-eval#4 (comment))
@CentrilCentril mentioned this pull request Aug 2, 2019
Merged
bors added a commit that referenced this pull request Aug 2, 2019
@bors
Auto merge of#63214- Centril:rollup-hdb7dnx, r=Centril
1df512f
Rollup of 7 pull requests
Successful merges:
- #62663 (More questionmarks in doctests)
- #62969 (Changing the structure of `mir::interpret::InterpError`)
- #63153 (Remove redundant method with const variable resolution)
- #63189 (Doc improvements)
- #63198 (Allow trailing comma in macro 2.0 declarations.)
- #63202 (Fix ICE in #63135)
- #63203 (Make is_mutable use PlaceRef instead of it's fields)
Failed merges:
r? @ghost
@bors
bors merged commit 00d32e8 into rust-lang:masterAug 2, 2019
@RalfJung

RalfJung commented Aug 2, 2019•
edited
Loading

Copy link
Copy Markdown
Member

@saleemjaffer yay, it landed. :)

However, as expected, this also broke Miri. Do you want to try and fix that?
You need to clone Miri from https://github.com/rust-lang/miri/ and install the latest (later-than-nightly) rustc with https://github.com/kennytm/rustup-toolchain-install-master. In the Miri src directory:

  • rustup-toolchain-install-master -c rust-src
  • rustup override set <hash> (the hash is shown by the previous step)
  • edit the rust-version file to also just contain that hash
  • run ./miri test; this will fail because the err! macro is gone -- fix those errors, similar to what you did in rustc
  • make a PR :)

@RalfJungRalfJung mentioned this pull request Aug 2, 2019
Merged
@RalfJung

RalfJung commented Aug 3, 2019

Copy link
Copy Markdown
Member

Never mind, I'll do it because this blocks other work.

Thanks for the PR!

Centril added a commit to Centril/rust that referenced this pull request Aug 3, 2019
@Centril
Rollup merge ofrust-lang#63229- RalfJung:miri-error, r=oli-obk
42dfdc5
A bit of Miri error cleanup
Some cleanup after rust-lang#62969.
r? @oli-obk
Cc @saleemjaffer
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@RalfJungRalfJungRalfJung approved these changes
@oli-obkoli-obkoli-obk approved these changes
+1 more reviewer
@tesujitesujitesuji left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@RalfJungRalfJung

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@saleemjaffer@rust-highfive@bors@RalfJung@oli-obk@tesuji@matthewjasper