Skip to content

Update miri #63141

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

Merged
merged 1 commit into from
Jul 31, 2019
Merged

Update miri #63141

merged 1 commit into from
Jul 31, 2019

Conversation

JohnTitor
Copy link
Member

Fixes #63024

r? @RalfJung

@JohnTitor
Copy link
Member Author

Ah, highfive doesn't seem to be here.

@JohnTitor JohnTitor added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 30, 2019
@RalfJung
Copy link
Member

RalfJung commented Jul 30, 2019

highfive is here, they assigned me to this PR. :)

Since you did r? in the OP, there is no need for the bot to post a message.

EDIT: oh wait, you assigned me. never mind.^^

@RalfJung
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Jul 30, 2019

📌 Commit 526d45a has been approved by RalfJung

@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 Jul 30, 2019
@RalfJung
Copy link
Member

@bors p=1 (tool fix)

@bors
Copy link
Collaborator

bors commented Jul 31, 2019

⌛ Testing commit 526d45a with merge e7ad858...

bors added a commit that referenced this pull request Jul 31, 2019
@bors
Copy link
Collaborator

bors commented Jul 31, 2019

💔 Test failed - checks-azure

@rust-highfive
Copy link
Contributor

The job x86_64-gnu-tools of your PR failed (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.
2019-07-31T07:23:27.2422317Z normalized stderr:
2019-07-31T07:23:27.2422474Z error: incorrect use of `await`
2019-07-31T07:23:27.2424233Z   --> $DIR/async-fn.rs:14:13
2019-07-31T07:23:27.2424349Z    |
2019-07-31T07:23:27.2424412Z 14 |     let y = await!(async { *y + *z });
2019-07-31T07:23:27.2426363Z    |             ^^^^^^^^^^^^^^^^^^^^^^^^^ help: `await` is a postfix operation: `async { *y + *z }.await`
2019-07-31T07:23:27.2426516Z error[E0557]: feature has been removed
2019-07-31T07:23:27.2426875Z  --> $DIR/async-fn.rs:3:5
2019-07-31T07:23:27.2426961Z   |
2019-07-31T07:23:27.2427019Z 3 |     await_macro,
2019-07-31T07:23:27.2427019Z 3 |     await_macro,
2019-07-31T07:23:27.2427098Z   |     ^^^^^^^^^^^
2019-07-31T07:23:27.2427159Z   |
2019-07-31T07:23:27.2427908Z note: subsumed by `.await` syntax
2019-07-31T07:23:27.2428241Z  --> $DIR/async-fn.rs:3:5
2019-07-31T07:23:27.2428384Z 3 |     await_macro,
2019-07-31T07:23:27.2428462Z   |     ^^^^^^^^^^^
2019-07-31T07:23:27.2428520Z 
2019-07-31T07:23:27.2428596Z error: aborting due to 2 previous errors
---
2019-07-31T07:23:27.2430073Z 
2019-07-31T07:23:27.2430128Z +error: incorrect use of `await`
2019-07-31T07:23:27.2430392Z +  --> $DIR/async-fn.rs:14:13
2019-07-31T07:23:27.2431801Z +   |
2019-07-31T07:23:27.2433029Z +14 |     let y = await!(async { *y + *z });
2019-07-31T07:23:27.2434773Z +   |             ^^^^^^^^^^^^^^^^^^^^^^^^^ help: `await` is a postfix operation: `async { *y + *z }.await`
2019-07-31T07:23:27.2440905Z +error[E0557]: feature has been removed
2019-07-31T07:23:27.2444616Z + --> $DIR/async-fn.rs:3:5
2019-07-31T07:23:27.2447568Z +  |
2019-07-31T07:23:27.2453484Z +3 |     await_macro,
2019-07-31T07:23:27.2453484Z +3 |     await_macro,
2019-07-31T07:23:27.2453599Z +  |     ^^^^^^^^^^^
2019-07-31T07:23:27.2469674Z +  |
2019-07-31T07:23:27.2469785Z +note: subsumed by `.await` syntax
2019-07-31T07:23:27.2470223Z + --> $DIR/async-fn.rs:3:5
2019-07-31T07:23:27.2470314Z +  |
2019-07-31T07:23:27.2470393Z +3 |     await_macro,
2019-07-31T07:23:27.2470475Z +  |     ^^^^^^^^^^^
2019-07-31T07:23:27.2470615Z +error: aborting due to 2 previous errors
2019-07-31T07:23:27.2470682Z +
2019-07-31T07:23:27.2471387Z +For more information about this error, try `rustc --explain E0557`.
2019-07-31T07:23:27.2471494Z +
2019-07-31T07:23:27.2471494Z +
2019-07-31T07:23:27.2471550Z 
2019-07-31T07:23:27.2471619Z The actual stderr differed from the expected stderr.
2019-07-31T07:23:27.2471959Z Actual stderr saved to /tmp/compiletest6HSvn8/async-fn.stderr
2019-07-31T07:23:27.2472048Z To update references, run this command from build directory:
2019-07-31T07:23:27.2472361Z tests/run-pass/update-references.sh '/tmp/compiletest6HSvn8' 'async-fn.rs'
2019-07-31T07:23:27.2472497Z error: 1 errors occurred comparing output.
2019-07-31T07:23:27.2472566Z status: exit code: 1
2019-07-31T07:23:27.2472566Z status: exit code: 1
2019-07-31T07:23:27.2473308Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools-bin/miri" "tests/run-pass/async-fn.rs" "-L" "/tmp/compiletest6HSvn8" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-C" "prefer-dynamic" "-o" "/tmp/compiletest6HSvn8/async-fn.stage-id" "-Dwarnings" "-Dunused" "--edition" "2018" "--sysroot" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2" "-L" "/tmp/compiletest6HSvn8/async-fn.stage-id.aux" "-A" "unused"
2019-07-31T07:23:27.2473774Z ------------------------------------------
2019-07-31T07:23:27.2473823Z 
2019-07-31T07:23:27.2474078Z ------------------------------------------
2019-07-31T07:23:27.2474148Z stderr:
2019-07-31T07:23:27.2474148Z stderr:
2019-07-31T07:23:27.2474549Z ------------------------------------------
2019-07-31T07:23:27.2476297Z {"message":"incorrect use of `await`","code":null,"level":"error","spans":[{"file_name":"tests/run-pass/async-fn.rs","byte_start":306,"byte_end":331,"line_start":14,"line_end":14,"column_start":13,"column_end":38,"is_primary":true,"text":[{"text":"    let y = await!(async { *y + *z });","highlight_start":13,"highlight_end":38}],"label":null,"suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[{"message":"`await` is a postfix operation","code":null,"level":"help","spans":[{"file_name":"tests/run-pass/async-fn.rs","byte_start":306,"byte_end":331,"line_start":14,"line_end":14,"column_start":13,"column_end":38,"is_primary":true,"text":[{"text":"    let y = await!(async { *y + *z });","highlight_start":13,"highlight_end":38}],"label":null,"suggested_replacement":"async { *y + *z }.await","suggestion_applicability":"MachineApplicable","expansion":null}],"children":[],"rendered":null}],"rendered":"error: incorrect use of `await`\n  --> tests/run-pass/async-fn.rs:14:13\n   |\n14 |     let y = await!(async { *y + *z });\n   |             ^^^^^^^^^^^^^^^^^^^^^^^^^ help: `await` is a postfix operation: `async { *y + *z }.await`\n\n"}
2019-07-31T07:23:27.2478605Z {"message":"feature has been removed","code":{"code":"E0557","explanation":"\nA feature attribute named a feature that has been removed.\n\nErroneous code example:\n\n```compile_fail,E0557\n#![feature(managed_boxes)] // error: feature has been removed\n```\n\nDelete the offending feature attribute.\n"},"level":"error","spans":[{"file_name":"tests/run-pass/async-fn.rs","byte_start":33,"byte_end":44,"line_start":3,"line_end":3,"column_start":5,"column_end":16,"is_primary":true,"text":[{"text":"    await_macro,","highlight_start":5,"highlight_end":16}],"label":null,"suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[{"message":"subsumed by `.await` syntax","code":null,"level":"note","spans":[{"file_name":"tests/run-pass/async-fn.rs","byte_start":33,"byte_end":44,"line_start":3,"line_end":3,"column_start":5,"column_end":16,"is_primary":true,"text":[{"text":"    await_macro,","highlight_start":5,"highlight_end":16}],"label":null,"suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[],"rendered":null}],"rendered":"error[E0557]: feature has been removed\n --> tests/run-pass/async-fn.rs:3:5\n  |\n3 |     await_macro,\n  |     ^^^^^^^^^^^\n  |\nnote: subsumed by `.await` syntax\n --> tests/run-pass/async-fn.rs:3:5\n  |\n3 |     await_macro,\n  |     ^^^^^^^^^^^\n\n"}
2019-07-31T07:23:27.2479720Z {"message":"For more information about this error, try `rustc --explain E0557`.","code":null,"level":"","spans":[],"children":[],"rendered":"For more information about this error, try `rustc --explain E0557`.\n"}
2019-07-31T07:23:27.2479830Z 
2019-07-31T07:23:27.2480087Z ------------------------------------------
2019-07-31T07:23:27.2480163Z 
---
2019-07-31T07:23:52.8198580Z Verifying status of clippy-driver...
2019-07-31T07:23:52.8211846Z Verifying status of miri...
2019-07-31T07:23:52.8224932Z This PR updated 'src/tools/miri', verifying if status is 'test-pass'...
2019-07-31T07:23:52.8235332Z 
2019-07-31T07:23:52.8236649Z ⚠️ We detected that this PR updated 'miri', but its tests failed.
2019-07-31T07:23:52.8237337Z 
2019-07-31T07:23:52.8238026Z If you do intend to update 'miri', please check the error messages above and
2019-07-31T07:23:52.8238606Z commit another update.
2019-07-31T07:23:52.8239408Z 
2019-07-31T07:23:52.8239928Z If you do NOT intend to update 'miri', please ensure you did not accidentally
2019-07-31T07:23:52.8240536Z change the submodule at 'src/tools/miri'. You may ask your reviewer for the
2019-07-31T07:23:52.8241058Z proper steps.
2019-07-31T07:23:53.5598716Z ##[error]Bash exited with code '3'.
2019-07-31T07:23:53.5630763Z ##[section]Starting: Upload CPU usage statistics
2019-07-31T07:23:53.5638644Z ==============================================================================
2019-07-31T07:23:53.5638721Z Task         : Bash
2019-07-31T07:23:53.5638796Z Description  : Run a Bash script on macOS, Linux, or Windows

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 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 Jul 31, 2019
bors added a commit to rust-lang/miri that referenced this pull request Jul 31, 2019
Remove `await_macro`

`await_macro` is now unsupported so we should remove it.
Failed in rust-lang/rust#63141

r? @RalfJung
@JohnTitor
Copy link
Member Author

Add rust-lang/miri@af7570f so this should pass the tests.

@RalfJung
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Jul 31, 2019

📌 Commit 2fe27f5 has been approved by RalfJung

@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 Jul 31, 2019
@bors
Copy link
Collaborator

bors commented Jul 31, 2019

⌛ Testing commit 2fe27f5 with merge 2d3b64e...

bors added a commit that referenced this pull request Jul 31, 2019
@bors
Copy link
Collaborator

bors commented Jul 31, 2019

💥 Test timed out

@bors 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 Jul 31, 2019
@RalfJung
Copy link
Member

It finished less than 2min after the timeout. :/

@bors retry

@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 Jul 31, 2019
@bors
Copy link
Collaborator

bors commented Jul 31, 2019

⌛ Testing commit 2fe27f5 with merge e3976ff...

bors added a commit that referenced this pull request Jul 31, 2019
@bors
Copy link
Collaborator

bors commented Jul 31, 2019

☀️ Test successful - checks-azure
Approved by: RalfJung
Pushing e3976ff to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 31, 2019
@bors bors merged commit 2fe27f5 into rust-lang:master Jul 31, 2019
@rust-highfive
Copy link
Contributor

📣 Toolstate changed by #63141!

Tested on commit e3976ff.
Direct link to PR: #63141

🎉 miri on windows: build-fail → test-pass (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Jul 31, 2019
Tested on commit rust-lang/rust@e3976ff.
Direct link to PR: <rust-lang/rust#63141>

🎉 miri on windows: build-fail → test-pass (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).
@RalfJung
Copy link
Member

That's odd, it is still failing for Linux...?

All tools are out-of-sync between Windows and Linux though: https://rust-lang-nursery.github.io/rust-toolstate/. So this is likely not a Miri issue.

@JohnTitor JohnTitor deleted the update-miri branch August 1, 2019 02:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. 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.

miri no longer builds after rust-lang/rust#63015
4 participants