Rename `EvalResult` to `InterpResult` #59654

kenta7777 · 2019-04-03T00:53:50Z

This PR renames all uses of EvalResult in librustc/mir and librustc_mir to InterpResult.
This PR is related to #54395 .

rust-highfive · 2019-04-03T00:54:01Z

r? @pnkfelix

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

kenta7777 · 2019-04-03T00:54:53Z

r? @oli-obk

rust-highfive · 2019-04-03T01:10:24Z

The job x86_64-gnu-llvm-6.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

travis_time:end:31847898:start=1554252909711977026,finish=1554252910579471079,duration=867494053
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
Setting environment variables from .travis.yml
---

[00:03:56] travis_fold:start:tidy
travis_time:start:tidy
tidy check
[00:03:57] tidy error: /checkout/src/librustc_mir/interpret/memory.rs:358: line longer than 100 chars
[00:03:58] some tidy checks failed
[00:03:58] 
[00:03:58] 
[00:03:58] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout/src" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "--no-vendor" "--quiet"
[00:03:58] 
[00:03:58] 
[00:03:58] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
[00:03:58] Build completed unsuccessfully in 0:00:43
[00:03:58] Build completed unsuccessfully in 0:00:43
[00:03:58] make: *** [tidy] Error 1
[00:03:58] Makefile:67: recipe for target 'tidy' failed
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:019a4e64
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Wed Apr  3 00:59:20 UTC 2019
---
travis_time:end:0cfbcaa0:start=1554253160930269845,finish=1554253160934628849,duration=4359004
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:012b17e3
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:1aab993c
travis_time:start:1aab993c
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:1e029a54
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

rust-highfive · 2019-04-03T05:13:50Z

The job x86_64-gnu-llvm-6.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

travis_time:end:05ab85f8:start=1554267526710282076,finish=1554267529192875701,duration=2482593625
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
Setting environment variables from .travis.yml
---

[00:04:01] travis_fold:start:tidy
travis_time:start:tidy
tidy check
[00:04:01] tidy error: /checkout/src/librustc_mir/interpret/memory.rs:359: trailing whitespace
[00:04:03] some tidy checks failed
[00:04:03] 
[00:04:03] 
[00:04:03] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout/src" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "--no-vendor" "--quiet"
[00:04:03] 
[00:04:03] 
[00:04:03] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
[00:04:03] Build completed unsuccessfully in 0:00:46
[00:04:03] Build completed unsuccessfully in 0:00:46
[00:04:03] Makefile:67: recipe for target 'tidy' failed
[00:04:03] make: *** [tidy] Error 1
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:094257be
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Wed Apr  3 05:03:03 UTC 2019
---
travis_time:end:0dc9824c:start=1554267784395699860,finish=1554267784400874584,duration=5174724
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:1c5f23c0
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:090023c7
travis_time:start:090023c7
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:2bd6afd0
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

bors · 2019-04-03T08:43:40Z

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

oli-obk · 2019-04-03T16:05:40Z

The changes lgtm. Please rebase and squash the commits.

fix tidy error remove unnecessary whitespace

kenta7777 · 2019-04-05T07:42:18Z

I rebased my commits. Please review.

oli-obk · 2019-04-05T07:55:26Z

@bors r+

bors · 2019-04-05T07:55:27Z

📌 Commit b7b7985 has been approved by oli-obk

bors · 2019-04-05T08:03:00Z

⌛ Testing commit b7b7985 with merge 1d5e0e01139cf71e7c789c52c4446223c232bc3d...

bors · 2019-04-05T09:30:08Z

💔 Test failed - checks-travis

rust-highfive · 2019-04-05T09:30:10Z

The job x86_64-gnu-tools of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

[01:24:28] 
[01:24:34] error[E0412]: cannot find type `EvalResult` in this scope
[01:24:34]   --> src/tools/miri/src/fn_call.rs:17:10
[01:24:34]    |
[01:24:34] 17 |     ) -> EvalResult<'tcx, Option<&'mir mir::Mir<'tcx>>> {
[01:24:34] help: possible candidate is found in another module, you can import it into scope
[01:24:34]    |
[01:24:34] 1  | use rustc::middle::stability::EvalResult;
[01:24:34]    |
---
[01:24:34] 
[01:24:34] error[E0412]: cannot find type `EvalResult` in this scope
[01:24:34]    --> src/tools/miri/src/fn_call.rs:759:62
[01:24:34]     |
[01:24:34] 759 |     fn write_null(&mut self, dest: PlaceTy<'tcx, Borrow>) -> EvalResult<'tcx> {
[01:24:34] help: possible candidate is found in another module, you can import it into scope
[01:24:34]     |
[01:24:34] 1   | use rustc::middle::stability::EvalResult;
[01:24:34]     |
---
[01:24:34] 
[01:24:34] error[E0412]: cannot find type `EvalResult` in this scope
[01:24:34]   --> src/tools/miri/src/helpers.rs:12:46
[01:24:34]    |
[01:24:34] 12 |     fn resolve_path(&self, path: &[&str]) -> EvalResult<'tcx, ty::Instance<'tcx>> {
[01:24:34] help: possible candidate is found in another module, you can import it into scope
[01:24:34]    |
[01:24:34] 1  | use rustc::middle::stability::EvalResult;
[01:24:34]    |
[01:24:34]    |
[01:24:34] 
[01:24:34] error[E0412]: cannot find type `EvalResult` in this scope
[01:24:34]   --> src/tools/miri/src/helpers.rs:52:64
[01:24:34]    |
[01:24:34] 52 |         mut action: impl FnMut(Pointer<Borrow>, Size, bool) -> EvalResult<'tcx>,
[01:24:34] help: possible candidate is found in another module, you can import it into scope
[01:24:34]    |
[01:24:34] 1  | use rustc::middle::stability::EvalResult;
[01:24:34]    |
---
[01:24:34] 
[01:24:34] error[E0412]: cannot find type `EvalResult` in this scope
[01:24:34]    --> src/tools/miri/src/helpers.rs:123:55
[01:24:34]     |
[01:24:34] 123 |             where F: FnMut(MPlaceTy<'tcx, Borrow>) -> EvalResult<'tcx>
[01:24:34] help: possible candidate is found in another module, you can import it into scope
[01:24:34]     |
[01:24:34] 1   | use rustc::middle::stability::EvalResult;
[01:24:34]     |
[01:24:34]     |
[01:24:34] 
[01:24:34] error[E0412]: cannot find type `EvalResult` in this scope
[01:24:34]    --> src/tools/miri/src/helpers.rs:134:49
[01:24:34]     |
[01:24:34] 134 |             F: FnMut(MPlaceTy<'tcx, Borrow>) -> EvalResult<'tcx>
[01:24:34] help: possible candidate is found in another module, you can import it into scope
[01:24:34]     |
[01:24:34] 1   | use rustc::middle::stability::EvalResult;
[01:24:34]     |
[01:24:34]     |
[01:24:34] 
[01:24:34] error[E0412]: cannot find type `EvalResult` in this scope
[01:24:34]    --> src/tools/miri/src/helpers.rs:144:69
[01:24:34]     |
[01:24:34] 144 |             fn visit_value(&mut self, v: MPlaceTy<'tcx, Borrow>) -> EvalResult<'tcx>
[01:24:34] help: possible candidate is found in another module, you can import it into scope
[01:24:34]     |
[01:24:34] 1   | use rustc::middle::stability::EvalResult;
[01:24:34]     |
[01:24:34]     |
[01:24:34] 
[01:24:34] error[E0412]: cannot find type `EvalResult` in this scope
[01:24:34]    --> src/tools/miri/src/helpers.rs:167:44
[01:24:34]     |
[01:24:34] 167 |                 fields: impl Iterator<Item=EvalResult<'tcx, MPlaceTy<'tcx, Borrow>>>,
[01:24:34] help: possible candidate is found in another module, you can import it into scope
[01:24:34]     |
[01:24:34] 1   | use rustc::middle::stability::EvalResult;
[01:24:34]     |
---
[01:24:34] 
[01:24:34] error[E0412]: cannot find type `EvalResult` in this scope
[01:24:34]    --> src/tools/miri/src/helpers.rs:177:59
[01:24:34]     |
[01:24:34] 177 |                         let mut places = fields.collect::<EvalResult<'tcx, Vec<MPlaceTy<'tcx, Borrow>>>>()?;
[01:24:34] help: possible candidate is found in another module, you can import it into scope
[01:24:34]     |
[01:24:34] 1   | use rustc::middle::stability::EvalResult;
[01:24:34]     |
[01:24:34]     |
[01:24:34] 
[01:24:34] error[E0412]: cannot find type `EvalResult` in this scope
[01:24:34]    --> src/tools/miri/src/helpers.rs:189:69
[01:24:34]     |
[01:24:34] 189 |             fn visit_union(&mut self, v: MPlaceTy<'tcx, Borrow>) -> EvalResult<'tcx>
[01:24:34] help: possible candidate is found in another module, you can import it into scope
[01:24:34]     |
[01:24:34] 1   | use rustc::middle::stability::EvalResult;
[01:24:34]     |
[01:24:34]     |
[01:24:34] 
[01:24:34] error[E0412]: cannot find type `EvalResult` in this scope
[01:24:34]    --> src/tools/miri/src/helpers.rs:203:74
[01:24:34]     |
[01:24:34] 203 |             fn visit_primitive(&mut self, _v: MPlaceTy<'tcx, Borrow>) -> EvalResult<'tcx>
[01:24:34] help: possible candidate is found in another module, you can import it into scope
[01:24:34]     |
[01:24:34] 1   | use rustc::middle::stability::EvalResult;
[01:24:34]     |
---
[01:24:34] 
[01:24:34] error[E0412]: cannot find type `EvalResult` in this scope
[01:24:34]    --> src/tools/miri/src/lib.rs:391:10
[01:24:34]     |
[01:24:34] 391 |     ) -> EvalResult<'tcx, Option<&'mir mir::Mir<'tcx>>> {
[01:24:34] help: possible candidate is found in another module, you can import it into scope
[01:24:34]     |
[01:24:34] 24  | use rustc::middle::stability::EvalResult;
[01:24:34]     |
---
travis_time:end:232453d8:start=1554456564515610212,finish=1554456564521742200,duration=6131988
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:020ee609
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:0064d250
travis_time:start:0064d250
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:25dfdb8e
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

kennytm · 2019-04-05T14:51:13Z

@bors r-

This has broken miri which is disallowed on the week before beta release.

bors · 2019-04-11T18:49:12Z

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

kenta7777 · 2019-04-13T03:35:23Z

Sorry for being late.
As with the change, Should I rename some codes in miri?

oli-obk · 2019-04-17T08:52:46Z

As with the change, Should I rename some codes in miri?

That would be great, yes.

rust-highfive · 2019-04-21T03:44:45Z

The job x86_64-gnu-llvm-6.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

travis_time:end:0a9c67a6:start=1555817296937802560,finish=1555817381632706981,duration=84694904421
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
$ export AWS_ACCESS_KEY_ID=AKIA46X5W6CZEJZ6XT55
---
[00:12:23]    Compiling rustc_allocator v0.0.0 (/checkout/src/librustc_allocator)
[00:12:23] error: expected expression, found `>>`
[00:12:23]    --> src/librustc_mir/interpret/place.rs:549:1
[00:12:23]     |
[00:12:23] 549 | >>>>>>> parent of b62d9789da... rename EvalResult to InterpResult
[00:12:23]     | ^^ expected expression
[00:12:25] error[E0412]: cannot find type `InterpResult` in this scope
[00:12:25]    --> src/librustc_mir/interpret/place.rs:548:10
[00:12:25]     |
[00:12:25]     |
[00:12:25] 548 |     ) -> InterpResult<'tcx, PlaceTy<'tcx, M::PointerTag>> {
[00:12:25] 
[00:12:27] error[E0107]: wrong number of lifetime arguments: expected 0, found 1
[00:12:27]    --> src/librustc_mir/interpret/place.rs:547:41
[00:12:27]     |
[00:12:27]     |
[00:12:27] 547 |         proj_elem: &mir::ProjectionElem<'tcx, mir::Local, Ty<'tcx>>,
[00:12:27] 
[00:12:27] error: aborting due to 3 previous errors
[00:12:27] 
[00:12:27] Some errors occurred: E0107, E0412.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

rust-highfive · 2019-04-21T23:26:19Z

The job x86_64-gnu-llvm-6.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

travis_time:end:029bbf80:start=1555888092248178090,finish=1555888176561016345,duration=84312838255
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
$ export AWS_ACCESS_KEY_ID=AKIA46X5W6CZEJZ6XT55
---
[00:13:14]    Compiling rustc_traits v0.0.0 (/checkout/src/librustc_traits)
[00:13:16] error[E0432]: unresolved import `super::InterpResult`
[00:13:16]   --> src/librustc_mir/interpret/place.rs:16:44
[00:13:16]    |
[00:13:16] 16 |     GlobalId, AllocId, Allocation, Scalar, InterpResult, Pointer, PointerArithmetic,
[00:13:16]    |                                            ^^^^^^^^^^^^ no `InterpResult` in `interpret`
[00:13:23] error[E0412]: cannot find type `EvalResult` in this scope
[00:13:23]    --> src/librustc_mir/interpret/place.rs:134:28
[00:13:23]     |
[00:13:23]     |
[00:13:23] 134 |     pub fn to_ptr(self) -> EvalResult<'tcx, Pointer<Tag>> {
[00:13:23] help: possible candidates are found in other modules, you can import them into scope
[00:13:23]     |
[00:13:23] 5   | use rustc::middle::stability::EvalResult;
[00:13:23]     |
---
[00:13:23] 
[00:13:23] error[E0412]: cannot find type `EvalResult` in this scope
[00:13:23]    --> src/librustc_mir/interpret/place.rs:207:57
[00:13:23]     |
[00:13:23] 207 |     pub(super) fn len(self, cx: &impl HasDataLayout) -> EvalResult<'tcx, u64> {
[00:13:23] help: possible candidates are found in other modules, you can import them into scope
[00:13:23]     |
[00:13:23] 5   | use rustc::middle::stability::EvalResult;
[00:13:23]     |
[00:13:23]     |
[00:13:23] 5   | use rustc::mir::interpret::EvalResult;
[00:13:23]     |
[00:13:23] 
[00:13:23] error[E0412]: cannot find type `EvalResult` in this scope
[00:13:23]    --> src/librustc_mir/interpret/place.rs:226:35
[00:13:23]     |
[00:13:23] 226 |     pub(super) fn vtable(self) -> EvalResult<'tcx, Pointer<Tag>> {
[00:13:23] help: possible candidates are found in other modules, you can import them into scope
[00:13:23]     |
[00:13:23] 5   | use rustc::middle::stability::EvalResult;
[00:13:23]     |
[00:13:23]     |
[00:13:23] 5   | use rustc::mir::interpret::EvalResult;
[00:13:23]     |
[00:13:23] 
[00:13:23] error[E0412]: cannot find type `EvalResult` in this scope
[00:13:23]    --> src/librustc_mir/interpret/place.rs:281:28
[00:13:23]     |
[00:13:23] 281 |     pub fn to_ptr(self) -> EvalResult<'tcx, Pointer<Tag>> {
[00:13:23] help: possible candidates are found in other modules, you can import them into scope
[00:13:23]     |
[00:13:23] 5   | use rustc::middle::stability::EvalResult;
[00:13:23]     |
[00:13:23]     |
[00:13:23] 5   | use rustc::mir::interpret::EvalResult;
[00:13:23]     |
[00:13:23] 
[00:13:23] error[E0412]: cannot find type `EvalResult` in this scope
[00:13:23]    --> src/librustc_mir/interpret/place.rs:310:10
[00:13:23]     |
[00:13:23] 310 |     ) -> EvalResult<'tcx, MPlaceTy<'tcx, M::PointerTag>> {
[00:13:23] help: possible candidates are found in other modules, you can import them into scope
[00:13:23]     |
[00:13:23] 5   | use rustc::middle::stability::EvalResult;
[00:13:23]     |
[00:13:23]     |
[00:13:23] 5   | use rustc::mir::interpret::EvalResult;
[00:13:23]     |
[00:13:23] 
[00:13:24] error[E0412]: cannot find type `EvalResult` in this scope
[00:13:24]    --> src/librustc_mir/interpret/place.rs:333:10
[00:13:24]     |
[00:13:24] 333 |     ) -> EvalResult<'tcx, MPlaceTy<'tcx, M::PointerTag>> {
[00:13:24] help: possible candidates are found in other modules, you can import them into scope
[00:13:24]     |
[00:13:24] 5   | use rustc::middle::stability::EvalResult;
[00:13:24]     |
[00:13:24]     |
[00:13:24] 5   | use rustc::mir::interpret::EvalResult;
[00:13:24]     |
[00:13:24] 
[00:13:24] error[E0412]: cannot find type `EvalResult` in this scope
[00:13:24]    --> src/librustc_mir/interpret/place.rs:357:10
[00:13:24]     |
[00:13:24] 357 |     ) -> EvalResult<'tcx, MPlaceTy<'tcx, M::PointerTag>> {
[00:13:24] help: possible candidates are found in other modules, you can import them into scope
[00:13:24]     |
[00:13:24] 5   | use rustc::middle::stability::EvalResult;
[00:13:24]     |
[00:13:24]     |
[00:13:24] 5   | use rustc::mir::interpret::EvalResult;
[00:13:24]     |
[00:13:24] 
[00:13:24] error[E0412]: cannot find type `EvalResult` in this scope
[00:13:24]    --> src/librustc_mir/interpret/place.rs:413:9
[00:13:24]     |
[00:13:24] 413 |         EvalResult<'tcx, impl Iterator<Item=EvalResult<'tcx, MPlaceTy<'tcx, Tag>>> + 'a>
[00:13:24] help: possible candidates are found in other modules, you can import them into scope
[00:13:24]     |
[00:13:24] 5   | use rustc::middle::stability::EvalResult;
[00:13:24]     |
[00:13:24]     |
[00:13:24] 5   | use rustc::mir::interpret::EvalResult;
[00:13:24]     |
[00:13:24] 
[00:13:24] error[E0412]: cannot find type `EvalResult` in this scope
[00:13:24]    --> src/librustc_mir/interpret/place.rs:413:45
[00:13:24]     |
[00:13:24] 413 |         EvalResult<'tcx, impl Iterator<Item=EvalResult<'tcx, MPlaceTy<'tcx, Tag>>> + 'a>
[00:13:24] help: possible candidates are found in other modules, you can import them into scope
[00:13:24]     |
[00:13:24] 5   | use rustc::middle::stability::EvalResult;
[00:13:24]     |
[00:13:24]     |
[00:13:24] 5   | use rustc::mir::interpret::EvalResult;
[00:13:24]     |
[00:13:24] 
[00:13:24] error[E0412]: cannot find type `EvalResult` in this scope
[00:13:24]    --> src/librustc_mir/interpret/place.rs:430:10
[00:13:24]     |
[00:13:24] 430 |     ) -> EvalResult<'tcx, MPlaceTy<'tcx, M::PointerTag>> {
[00:13:24] help: possible candidates are found in other modules, you can import them into scope
[00:13:24]     |
[00:13:24] 5   | use rustc::middle::stability::EvalResult;
[00:13:24]     |
[00:13:24]     |
[00:13:24] 5   | use rustc::mir::interpret::EvalResult;
[00:13:24]     |
[00:13:24] 
[00:13:24] error[E0412]: cannot find type `EvalResult` in this scope
[00:13:24]    --> src/librustc_mir/interpret/place.rs:464:10
[00:13:24]     |
[00:13:24] 464 |     ) -> EvalResult<'tcx, MPlaceTy<'tcx, M::PointerTag>> {
[00:13:24] help: possible candidates are found in other modules, you can import them into scope
[00:13:24]     |
[00:13:24] 5   | use rustc::middle::stability::EvalResult;
[00:13:24]     |
[00:13:24]     |
[00:13:24] 5   | use rustc::mir::interpret::EvalResult;
[00:13:24]     |
[00:13:24] 
[00:13:24] error[E0412]: cannot find type `EvalResult` in this scope
[00:13:24]    --> src/librustc_mir/interpret/place.rs:475:10
[00:13:24]     |
[00:13:24] 475 |     ) -> EvalResult<'tcx, MPlaceTy<'tcx, M::PointerTag>> {
[00:13:24] help: possible candidates are found in other modules, you can import them into scope
[00:13:24]     |
[00:13:24] 5   | use rustc::middle::stability::EvalResult;
[00:13:24]     |
[00:13:24]     |
[00:13:24] 5   | use rustc::mir::interpret::EvalResult;
[00:13:24]     |
[00:13:24] 
[00:13:24] error[E0412]: cannot find type `EvalResult` in this scope
[00:13:24]    --> src/librustc_mir/interpret/place.rs:520:10
[00:13:24]     |
[00:13:24] 520 |     ) -> EvalResult<'tcx, PlaceTy<'tcx, M::PointerTag>> {
[00:13:24] help: possible candidates are found in other modules, you can import them into scope
[00:13:24]     |
[00:13:24] 5   | use rustc::middle::stability::EvalResult;
[00:13:24]     |
[00:13:24]     |
[00:13:24] 5   | use rustc::mir::interpret::EvalResult;
[00:13:24]     |
[00:13:24] 
[00:13:24] error[E0412]: cannot find type `EvalResult` in this scope
[00:13:24]    --> src/librustc_mir/interpret/place.rs:531:10
[00:13:24]     |
[00:13:24] 531 |     ) -> EvalResult<'tcx, PlaceTy<'tcx, M::PointerTag>> {
[00:13:24] help: possible candidates are found in other modules, you can import them into scope
[00:13:24]     |
[00:13:24] 5   | use rustc::middle::stability::EvalResult;
[00:13:24]     |
[00:13:24]     |
[00:13:24] 5   | use rustc::mir::interpret::EvalResult;
[00:13:24]     |
[00:13:24] 
[00:13:24] error[E0412]: cannot find type `EvalResult` in this scope
[00:13:24]    --> src/librustc_mir/interpret/place.rs:568:10
[00:13:24]     |
[00:13:24] 568 |     ) -> EvalResult<'tcx, MPlaceTy<'tcx, M::PointerTag>> {
[00:13:24] help: possible candidates are found in other modules, you can import them into scope
[00:13:24]     |
[00:13:24] 5   | use rustc::middle::stability::EvalResult;
[00:13:24]     |
[00:13:24]     |
[00:13:24] 5   | use rustc::mir::interpret::EvalResult;
[00:13:24]     |
[00:13:24] 
[00:13:24] error[E0412]: cannot find type `EvalResult` in this scope
[00:13:24]    --> src/librustc_mir/interpret/place.rs:613:10
[00:13:24]     |
[00:13:24] 613 |     ) -> EvalResult<'tcx, PlaceTy<'tcx, M::PointerTag>> {
[00:13:24] help: possible candidates are found in other modules, you can import them into scope
[00:13:24]     |
[00:13:24] 5   | use rustc::middle::stability::EvalResult;
[00:13:24]     |
---
[00:13:24] 
[00:13:24] error[E0412]: cannot find type `EvalResult` in this scope
[00:13:24]    --> src/librustc_mir/interpret/place.rs:906:10
[00:13:24]     |
[00:13:24] 906 |     ) -> EvalResult<'tcx, (MPlaceTy<'tcx, M::PointerTag>, Option<Size>)> {
[00:13:24] help: possible candidates are found in other modules, you can import them into scope
[00:13:24]     |
[00:13:24] 5   | use rustc::middle::stability::EvalResult;
[00:13:24]     |
[00:13:24]     |
[00:13:24] 5   | use rustc::mir::interpret::EvalResult;
[00:13:24]     |
[00:13:24] 
[00:13:24] error[E0412]: cannot find type `EvalResult` in this scope
[00:13:24]    --> src/librustc_mir/interpret/place.rs:959:10
[00:13:24]     |
[00:13:24] 959 |     ) -> EvalResult<'tcx, MPlaceTy<'tcx, M::PointerTag>> {
[00:13:24] help: possible candidates are found in other modules, you can import them into scope
[00:13:24]     |
[00:13:24] 5   | use rustc::middle::stability::EvalResult;
[00:13:24]     |
---
[00:13:24] 
[00:13:24] error[E0412]: cannot find type `EvalResult` in this scope
[00:13:24]     --> src/librustc_mir/interpret/place.rs:1034:10
[00:13:24]      |
[00:13:24] 1034 |     ) -> EvalResult<'tcx, MPlaceTy<'tcx, M::PointerTag>> {
[00:13:24] help: possible candidates are found in other modules, you can import them into scope
[00:13:24]      |
[00:13:24] 5    | use rustc::middle::stability::EvalResult;
[00:13:24]      |
[00:13:24]      |
[00:13:24] 5    | use rustc::mir::interpret::EvalResult;
[00:13:24]      |
[00:13:24] 
[00:13:24] error[E0412]: cannot find type `EvalResult` in this scope
[00:13:24]     --> src/librustc_mir/interpret/place.rs:1047:8
[00:13:24]      |
[00:13:24] 1047 |     -> EvalResult<'tcx, (ty::Instance<'tcx>, MPlaceTy<'tcx, M::PointerTag>)> {
[00:13:24] help: possible candidates are found in other modules, you can import them into scope
[00:13:24]      |
[00:13:24] 5    | use rustc::middle::stability::EvalResult;
[00:13:24]      |
[00:13:24]      |
[00:13:24] 5    | use rustc::mir::interpret::EvalResult;
[00:13:24]      |
[00:13:24] 
[00:13:26] error[E0107]: wrong number of lifetime arguments: expected 0, found 1
[00:13:26]    --> src/librustc_mir/interpret/place.rs:547:41
[00:13:26]     |
[00:13:26] 547 |         proj_elem: &mir::ProjectionElem<'tcx, mir::Local, Ty<'tcx>>,
[00:13:26] 
[00:13:26] error: aborting due to 32 previous errors
[00:13:26] 
[00:13:26] Some errors occurred: E0107, E0412, E0432.
---
travis_fold:end:after_failure.1
travis_fold:start:after_failure.2
travis_time:start:004fdf72
$ ls -lat $HOME/Library/Logs/DiagnosticReports/
ls: cannot access '/home/travis/Library/Logs/Dsuch file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:17642aea
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

oli-obk · 2019-05-28T06:19:06Z

@kenta7777 please rebase and fix the import failures (they are happening because of changes from other PRs)

RalfJung · 2019-05-28T08:51:49Z

FWIW this also blocks fixing rust-lang/miri#417, which is an issue that people run into all the time (so I'd like to work on it soon-ish).

kenta7777 · 2019-05-30T05:31:15Z

Sorry for the delay in fixing. I'll work on this in a few days.

RalfJung · 2019-06-07T17:07:49Z

I have taken over this PR to unblock other work; closing in favor of #61625.

rust-highfive assigned pnkfelix Apr 3, 2019

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

rust-highfive assigned oli-obk and unassigned pnkfelix Apr 3, 2019

kenta7777 added 2 commits April 4, 2019 18:17

rename EvalResult to InterpResult

b62d978

fix tidy error remove unnecessary whitespace

resolve conflict

b7b7985

kenta7777 force-pushed the rename-evalresult-to-interpresult branch from 4e1cf69 to b7b7985 Compare April 4, 2019 09:53

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 5, 2019

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 5, 2019

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 5, 2019

kenta7777 force-pushed the rename-evalresult-to-interpresult branch from 2fee6e3 to b7b7985 Compare April 20, 2019 03:09

resolve conflict

d759f42

removes conflict message and specifies InterpResult in the scope.

d80eeb7

pvdrz mentioned this pull request May 28, 2019

implement intptrcast model rust-lang/miri#224

Closed

10 tasks

RalfJung closed this Jun 7, 2019

kenta7777 deleted the rename-evalresult-to-interpresult branch June 9, 2019 09:33

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rename `EvalResult` to `InterpResult` #59654

Rename `EvalResult` to `InterpResult` #59654

kenta7777 commented Apr 3, 2019

rust-highfive commented Apr 3, 2019

kenta7777 commented Apr 3, 2019

rust-highfive commented Apr 3, 2019

rust-highfive commented Apr 3, 2019

bors commented Apr 3, 2019

oli-obk commented Apr 3, 2019

kenta7777 commented Apr 5, 2019

oli-obk commented Apr 5, 2019

bors commented Apr 5, 2019

bors commented Apr 5, 2019

bors commented Apr 5, 2019

rust-highfive commented Apr 5, 2019

kennytm commented Apr 5, 2019

bors commented Apr 11, 2019

kenta7777 commented Apr 13, 2019

oli-obk commented Apr 17, 2019

rust-highfive commented Apr 21, 2019

rust-highfive commented Apr 21, 2019

oli-obk commented May 28, 2019

RalfJung commented May 28, 2019

kenta7777 commented May 30, 2019

RalfJung commented Jun 7, 2019

Rename EvalResult to InterpResult #59654

Rename EvalResult to InterpResult #59654

Conversation

kenta7777 commented Apr 3, 2019

rust-highfive commented Apr 3, 2019

kenta7777 commented Apr 3, 2019

rust-highfive commented Apr 3, 2019

rust-highfive commented Apr 3, 2019

bors commented Apr 3, 2019

oli-obk commented Apr 3, 2019

kenta7777 commented Apr 5, 2019

oli-obk commented Apr 5, 2019

bors commented Apr 5, 2019

bors commented Apr 5, 2019

bors commented Apr 5, 2019

rust-highfive commented Apr 5, 2019

kennytm commented Apr 5, 2019

bors commented Apr 11, 2019

kenta7777 commented Apr 13, 2019

oli-obk commented Apr 17, 2019

rust-highfive commented Apr 21, 2019

rust-highfive commented Apr 21, 2019

oli-obk commented May 28, 2019

RalfJung commented May 28, 2019

kenta7777 commented May 30, 2019

RalfJung commented Jun 7, 2019

Rename `EvalResult` to `InterpResult` #59654

Rename `EvalResult` to `InterpResult` #59654