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

bump Miri #71173

Merged
merged 1 commit into from
Apr 16, 2020
Merged

bump Miri #71173

merged 1 commit into from
Apr 16, 2020

Conversation

RalfJung
Copy link
Member

Fixes #71110
r? @ghost Cc @rust-lang/miri

@RalfJung
Copy link
Member Author

Toolstate fix, submodule-only
@bors r+ p=1

@bors
Copy link
Contributor

bors commented Apr 15, 2020

📌 Commit ae4a01db7e7a40ec8a6283b32ba980fa493e7ff7 has been approved by RalfJung

@bors
Copy link
Contributor

bors commented Apr 15, 2020

🌲 The tree is currently closed for pull requests below priority 1000, this pull request will be tested once the tree is reopened

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 15, 2020
@RalfJung
Copy link
Member Author

PR CI says this regresses rustfmt builds?

error[E0464]: multiple matching crates for `getopts`
 --> /cargo/registry/src/github.com-1ecc6299db9ec823/rustc-ap-rustc_session-651.0.0/lib.rs:6:1
  |
6 | extern crate getopts;
  | ^^^^^^^^^^^^^^^^^^^^^
  |
  = note: candidates:
          crate `getopts`: /checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib/libgetopts-e81d628ddb13670c.rlib
          crate `getopts`: /checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib/libgetopts-1b0bb056d1f90b77.rlib

error[E0463]: can't find crate for `getopts`
 --> /cargo/registry/src/github.com-1ecc6299db9ec823/rustc-ap-rustc_session-651.0.0/lib.rs:6:1
  |
6 | extern crate getopts;
  | ^^^^^^^^^^^^^^^^^^^^^ can't find crate

@rust-lang/infra is that possible, or some kind of spurious issue?

@Dylan-DPC-zz
Copy link

@bors p=5

@bors
Copy link
Contributor

bors commented Apr 15, 2020

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

@bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 15, 2020
@RalfJung
Copy link
Member Author

@bors r+

@bors
Copy link
Contributor

bors commented Apr 15, 2020

📌 Commit 7fa2907 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 15, 2020
@bors
Copy link
Contributor

bors commented Apr 16, 2020

⌛ Testing commit 7fa2907 with merge 534a41a...

@bors
Copy link
Contributor

bors commented Apr 16, 2020

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 16, 2020
@bors bors merged commit 534a41a into rust-lang:master Apr 16, 2020
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #71173!

Tested on commit 534a41a.
Direct link to PR: #71173

🎉 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 Apr 16, 2020
Tested on commit rust-lang/rust@534a41a.
Direct link to PR: <rust-lang/rust#71173>

🎉 miri on windows: build-fail → test-pass (cc @oli-obk @eddyb @RalfJung).
🎉 miri on linux: build-fail → test-pass (cc @oli-obk @eddyb @RalfJung).
@RalfJung RalfJung deleted the miri branch April 16, 2020 11:10
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#71105
4 participants