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

saleemjaffer · 2019-07-25T11:30:26Z

Implements this

rust-highfive · 2019-07-25T11:30:30Z

r? @matthewjasper

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

saleemjaffer · 2019-07-25T11:30:43Z

r? @RalfJung @oli-obk

src/librustc/mir/interpret/error.rs

oli-obk

Just some nits then this lgtm.

src/librustc_mir/interpret/cast.rs

src/librustc_mir/interpret/eval_context.rs

src/librustc_mir/interpret/memory.rs

RalfJung · 2019-07-31T16:56:26Z

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

RalfJung

Thanks a lot!

r=me with these nits fixed.

src/librustc/mir/interpret/mod.rs

src/librustc_mir/interpret/eval_context.rs

src/librustc_mir/transform/const_prop.rs

src/librustc/mir/interpret/mod.rs

src/librustc_mir/transform/const_prop.rs

RalfJung · 2019-08-01T06:26:39Z

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.

src/librustc_mir/transform/const_prop.rs

saleemjaffer · 2019-08-01T06:45:21Z

@bors r= RalfJung

bors · 2019-08-01T06:45:22Z

@saleemjaffer: 🔑 Insufficient privileges: Not in reviewers

saleemjaffer · 2019-08-01T06:46:14Z

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

RalfJung · 2019-08-01T07:14:42Z

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 · 2019-08-01T07:14:43Z

📌 Commit 00d32e8 has been approved by RalfJung

… r=RalfJung Changing the structure of `mir::interpret::InterpError` Implements [this](rust-lang/const-eval#4 (comment))

@ghost

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

RalfJung · 2019-08-02T15:40:36Z

@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 :)

RalfJung · 2019-08-03T08:03:07Z

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

Thanks for the PR!

@oli-obk

A bit of Miri error cleanup Some cleanup after rust-lang#62969. r? @oli-obk Cc @saleemjaffer

rust-highfive assigned matthewjasper Jul 25, 2019

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

rust-highfive assigned RalfJung and unassigned matthewjasper Jul 25, 2019

saleemjaffer mentioned this pull request Jul 25, 2019

Making enums more specific in src/librustc/mir/interpret/error.rs rust-lang/const-eval#4

Closed

4 tasks

This comment has been minimized.

Sign in to view

RalfJung reviewed Jul 25, 2019

View reviewed changes

src/librustc/mir/interpret/error.rs Outdated Show resolved Hide resolved

RalfJung reviewed Jul 25, 2019

View reviewed changes

src/librustc/mir/interpret/error.rs Outdated Show resolved Hide resolved

This comment has been minimized.

Sign in to view

RalfJung reviewed Jul 26, 2019

View reviewed changes

src/librustc/mir/interpret/error.rs Outdated Show resolved Hide resolved

RalfJung reviewed Jul 26, 2019

View reviewed changes

src/librustc/mir/interpret/error.rs Outdated Show resolved Hide resolved

RalfJung reviewed Jul 26, 2019

View reviewed changes

src/librustc/mir/interpret/error.rs Outdated Show resolved Hide resolved

RalfJung reviewed Jul 26, 2019

View reviewed changes

src/librustc/mir/interpret/error.rs Outdated Show resolved Hide resolved

This comment has been minimized.

Sign in to view

saleemjaffer force-pushed the declutter_interperror branch 2 times, most recently from 642786d to 8705fc9 Compare July 26, 2019 10:17

saleemjaffer commented Jul 26, 2019

View reviewed changes

src/librustc/mir/interpret/error.rs Outdated Show resolved Hide resolved

This comment has been minimized.

Sign in to view

RalfJung reviewed Jul 26, 2019

View reviewed changes

src/librustc/mir/interpret/error.rs Show resolved Hide resolved

RalfJung reviewed Jul 26, 2019

View reviewed changes

src/librustc/mir/interpret/error.rs Show resolved Hide resolved

This comment has been minimized.

Sign in to view

RalfJung reviewed Jul 26, 2019

View reviewed changes

src/librustc/mir/interpret/error.rs Outdated Show resolved Hide resolved

RalfJung reviewed Jul 26, 2019

View reviewed changes

src/librustc/mir/interpret/error.rs Outdated Show resolved Hide resolved

This comment has been minimized.

Sign in to view

RalfJung reviewed Jul 26, 2019

View reviewed changes

src/librustc/mir/interpret/error.rs Show resolved Hide resolved

RalfJung reviewed Jul 26, 2019

View reviewed changes

src/librustc/mir/interpret/error.rs Outdated Show resolved Hide resolved

RalfJung reviewed Jul 26, 2019

View reviewed changes

src/librustc/mir/interpret/error.rs Show resolved Hide resolved

This comment has been minimized.

Sign in to view

oli-obk requested changes Jul 31, 2019

View reviewed changes

src/librustc_mir/interpret/cast.rs Outdated Show resolved Hide resolved

src/librustc_mir/interpret/eval_context.rs Outdated Show resolved Hide resolved

src/librustc_mir/interpret/memory.rs Outdated Show resolved Hide resolved

code review fixes

a1e59d1

oli-obk approved these changes Jul 31, 2019

View reviewed changes

code review fixes

c17d11f

RalfJung approved these changes Jul 31, 2019

View reviewed changes

src/librustc/mir/interpret/mod.rs Outdated Show resolved Hide resolved

src/librustc/mir/interpret/mod.rs Show resolved Hide resolved

src/librustc_mir/interpret/eval_context.rs Outdated Show resolved Hide resolved

src/librustc_mir/transform/const_prop.rs Outdated Show resolved Hide resolved

saleemjaffer changed the title ~~[WIP] Changing the structure of mir::interpret::InterpError~~ Changing the structure of mir::interpret::InterpError Aug 1, 2019

code review fixes

0c4513e

RalfJung reviewed Aug 1, 2019

View reviewed changes

src/librustc/mir/interpret/mod.rs Outdated Show resolved Hide resolved

RalfJung reviewed Aug 1, 2019

View reviewed changes

src/librustc_mir/transform/const_prop.rs Outdated Show resolved Hide resolved

code review fixes

00d32e8

saleemjaffer commented Aug 1, 2019

View reviewed changes

src/librustc_mir/transform/const_prop.rs Show resolved Hide resolved

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 Aug 1, 2019

Centril mentioned this pull request Aug 1, 2019

Rollup of 3 pull requests #63200

Closed

Centril added a commit to Centril/rust that referenced this pull request Aug 2, 2019

Rollup merge of rust-lang#62969 - saleemjaffer:declutter_interperror,…

51dc78e

… r=RalfJung Changing the structure of `mir::interpret::InterpError` Implements [this](rust-lang/const-eval#4 (comment))

Centril mentioned this pull request Aug 2, 2019

Rollup of 7 pull requests #63214

Merged

bors merged commit 00d32e8 into rust-lang:master Aug 2, 2019

RalfJung mentioned this pull request Aug 2, 2019

A bit of Miri error cleanup #63229

Merged

Centril added a commit to Centril/rust that referenced this pull request Aug 3, 2019

Rollup merge of rust-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

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

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

Uh oh!

Conversation

saleemjaffer commented Jul 25, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rust-highfive commented Jul 25, 2019

Uh oh!

saleemjaffer commented Jul 25, 2019

Uh oh!

This comment has been minimized.

Uh oh!

Uh oh!

This comment has been minimized.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

This comment has been minimized.

Uh oh!

This comment has been minimized.

Uh oh!

Uh oh!

This comment has been minimized.

Uh oh!

Uh oh!

This comment has been minimized.

Uh oh!

Uh oh!

Uh oh!

This comment has been minimized.

oli-obk left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

RalfJung commented Jul 31, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

RalfJung left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

RalfJung commented Aug 1, 2019

Uh oh!

Uh oh!

saleemjaffer commented Aug 1, 2019

Uh oh!

bors commented Aug 1, 2019

Uh oh!

saleemjaffer commented Aug 1, 2019

Uh oh!

RalfJung commented Aug 1, 2019

Uh oh!

bors commented Aug 1, 2019

Uh oh!

RalfJung commented Aug 2, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

RalfJung commented Aug 3, 2019

Uh oh!

Uh oh!

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

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

saleemjaffer commented Jul 25, 2019 •

edited

Loading

RalfJung commented Jul 31, 2019 •

edited

Loading

RalfJung commented Aug 2, 2019 •

edited

Loading