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

Update Miri #81043

Merged
merged 1 commit into from Jan 15, 2021
Merged

Update Miri #81043

merged 1 commit into from Jan 15, 2021

Conversation

ghost
Copy link

@ghost ghost commented Jan 15, 2021

Fixes #80907.

r? @RalfJung

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 15, 2021
@RalfJung
Copy link
Member

CI will fail with this, due to some further rustc changes -- I fixed the Miri side in rust-lang/miri#1673; once that landed, can you update Miri here to the latest master commit?

@ghost
Copy link
Author

ghost commented Jan 15, 2021

CI will fail with this, due to some further rustc changes -- I fixed the Miri side in rust-lang/miri#1673; once that landed, can you update Miri here to the latest master commit?

OK. Sorry for missing the "further rustc changes". Thanks for fixing!

@rust-log-analyzer
Copy link
Collaborator

The job x86_64-gnu-tools failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
  SCCACHE_BUCKET: rust-lang-ci-sccache2
  TOOLSTATE_REPO: https://github.com/rust-lang-nursery/rust-toolstate
  CACHE_DOMAIN: ci-caches.rust-lang.org
  EXTRA_VARIABLES: {
 "CI_ONLY_WHEN_SUBMODULES_CHANGED": 1
##[endgroup]
adding extra environment variable CI_ONLY_WHEN_SUBMODULES_CHANGED
linux builder detected, using docker to run the build
##[group]Run src/ci/scripts/should-skip-this.sh
---
test [ui] run-pass/concurrency/disable_data_race_detector.rs ... ok
test [ui] run-pass/concurrency/issue1643.rs ... ok
test [ui] run-pass/concurrency/concurrent_caller_location.rs ... ok
normalized stderr:
warning: use of deprecated function `std::sync::atomic::spin_loop_hint`: use hint::spin_loop instead
   |
   |
53 |     atomic::spin_loop_hint();
   |
   = note: `#[warn(deprecated)]` on by default




expected stderr:


diff of stderr:

+warning: use of deprecated function `std::sync::atomic::spin_loop_hint`: use hint::spin_loop instead
+   |
+   |
+53 |     atomic::spin_loop_hint();
+   |
+   = note: `#[warn(deprecated)]` on by default
+
+
+

The actual stderr differed from the expected stderr.
Actual stderr saved to /tmp/compiletesttcvzkx/concurrency/sync_singlethread.stderr
To update references, run this command from build directory:
tests/run-pass/update-references.sh '/tmp/compiletesttcvzkx' 'concurrency/sync_singlethread.rs'
error: 1 errors occurred comparing output.
status: exit code: 0
status: exit code: 0
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools-bin/miri" "tests/run-pass/concurrency/sync_singlethread.rs" "-L" "/tmp/compiletesttcvzkx" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-C" "prefer-dynamic" "-o" "/tmp/compiletesttcvzkx/concurrency/sync_singlethread.stage-id" "-A" "unused" "--edition" "2018" "-Astable-features" "--sysroot" "/home/user/.cache/miri/HOST" "-L" "/tmp/compiletesttcvzkx/concurrency/sync_singlethread.stage-id.aux"
------------------------------------------

------------------------------------------
stderr:
stderr:
------------------------------------------
{"message":"use of deprecated function `std::sync::atomic::spin_loop_hint`: use hint::spin_loop instead","code":{"code":"deprecated","explanation":null},"level":"warning","spans":[{"file_name":"tests/run-pass/concurrency/sync_singlethread.rs","byte_start":1171,"byte_end":1193,"line_start":53,"line_end":53,"column_start":5,"column_end":27,"is_primary":true,"text":[{"text":"    atomic::spin_loop_hint();","highlight_start":5,"highlight_end":27}],"label":null,"suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[{"message":"`#[warn(deprecated)]` on by default","code":null,"level":"note","spans":[],"children":[],"rendered":null}],"rendered":"warning: use of deprecated function `std::sync::atomic::spin_loop_hint`: use hint::spin_loop instead\n  --> tests/run-pass/concurrency/sync_singlethread.rs:53:5\n   |\n53 |     atomic::spin_loop_hint();\n   |     ^^^^^^^^^^^^^^^^^^^^^^\n   |\n   = note: `#[warn(deprecated)]` on by default\n\n"}
------------------------------------------

test [ui] run-pass/concurrency/sync_singlethread.rs ... FAILED
test [ui] run-pass/const-vec-of-fns.rs ... ok
---

failures:

failures:
   0: std::panicking::begin_panic
   1: compiletest_rs::run_tests
   2: compiletest::run_tests
   3: compiletest::main
note: Some details are omitted, run with `RUST_BACKTRACE=full` for a verbose backtrace.

test result: FAILED. 203 passed; 1 failed; 1 ignored; 0 measured; 0 filtered out

error: test failed, to rerun pass '--test compiletest'
---
Verifying status of rustfmt...
Verifying status of miri...
This PR updated 'src/tools/miri', verifying if status is 'test-pass'...

We detected that this PR updated 'miri', but its tests failed.

If you do intend to update 'miri', please check the error messages above and
commit another update.

If you do NOT intend to update 'miri', please ensure you did not accidentally
change the submodule at 'src/tools/miri'. You may ask your reviewer for the
proper steps.
{"miri":"test-fail","reference":"test-pass","book":"test-pass","cargo-miri":"test-fail","rust-by-example":"test-pass","rustbook":"test-fail","edition-guide":"test-pass","rustfmt":"test-pass","embedded-book":"test-pass","nomicon":"test-pass","rls":"test-pass"}failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test --stage 2 check-tools

Co-authored-by: Ralf Jung <post@ralfj.de>
@ghost
Copy link
Author

ghost commented Jan 15, 2021

PR CI passed 🚀

@RalfJung
Copy link
Member

Thanks. :-)
@bors r+ p=1

@bors
Copy link
Contributor

bors commented Jan 15, 2021

📌 Commit f3a6cad 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 Jan 15, 2021
@bors
Copy link
Contributor

bors commented Jan 15, 2021

⌛ Testing commit f3a6cad with merge bc39d4d...

@bors
Copy link
Contributor

bors commented Jan 15, 2021

☀️ Test successful - checks-actions
Approved by: RalfJung
Pushing bc39d4d to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 15, 2021
@bors bors merged commit bc39d4d into rust-lang:master Jan 15, 2021
@rustbot rustbot added this to the 1.51.0 milestone Jan 15, 2021
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #81043!

Tested on commit bc39d4d.
Direct link to PR: #81043

🎉 miri on windows: build-fail → test-pass (cc @oli-obk @eddyb @RalfJung).
🎉 miri on linux: build-fail → test-pass (cc @oli-obk @eddyb @RalfJung).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Jan 15, 2021
Tested on commit rust-lang/rust@bc39d4d.
Direct link to PR: <rust-lang/rust#81043>

🎉 miri on windows: build-fail → test-pass (cc @oli-obk @eddyb @RalfJung).
🎉 miri on linux: build-fail → test-pass (cc @oli-obk @eddyb @RalfJung).
@ghost ghost deleted the update-miri branch January 15, 2021 21:16
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#80905
5 participants