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 #65758

Merged
merged 4 commits into from
Oct 26, 2019
Merged

update Miri #65758

merged 4 commits into from
Oct 26, 2019

Conversation

RalfJung
Copy link
Member

Fixes #65684

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

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

@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 Oct 24, 2019
@RalfJung
Copy link
Member Author

Self-r+ because this just updates a submodule; p=1 because it fixes toolstate.

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Oct 24, 2019

📌 Commit aff0b3a3273f4c5011ec8f0d1a4324601c44c1d7 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 Oct 24, 2019
@bors
Copy link
Contributor

bors commented Oct 24, 2019

⌛ Testing commit aff0b3a3273f4c5011ec8f0d1a4324601c44c1d7 with merge 219145fcee85fcc925c37bf7c529659b18d90f5d...

@rust-highfive

This comment has been minimized.

@rust-highfive

This comment has been minimized.

@bors
Copy link
Contributor

bors commented Oct 24, 2019

💔 Test failed - checks-azure

@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 Oct 24, 2019
@RalfJung
Copy link
Member Author

@oli-obk due to rust-lang/miri#1010, bootstrap now has to install xargo itself. I think that's good; it disentangles the two a bit -- bootstrap makes fewer assumptions about what cargo miri setup does.

Could you review the changes needed for that?

@oli-obk
Copy link
Contributor

oli-obk commented Oct 24, 2019

Heh, neat setup. I'm not sure about the install directory, but we can change it later

@bors r+

@bors
Copy link
Contributor

bors commented Oct 24, 2019

📌 Commit 0177bc413d4f69c094a3cb7ce1240f37d43bb8e5 has been approved by oli-obk

@bors
Copy link
Contributor

bors commented Oct 24, 2019

🌲 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 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 Oct 24, 2019
@RalfJung
Copy link
Member Author

The install directory is also left unchanged by this PR.

@rust-highfive

This comment has been minimized.

@RalfJung
Copy link
Member Author

Hm, looks like we can't call cargo install this way:

2019-10-24T16:05:49.9785583Z error: Found argument '--manifest-path' which wasn't expected, or isn't valid in this context 

@bors r-

@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 Oct 24, 2019
@RalfJung
Copy link
Member Author

This time I build-tested it... took an hour but now it's looking good. :)

@bors r=oli-obk

@bors
Copy link
Contributor

bors commented Oct 25, 2019

📌 Commit 1b355b6a2a30ea49f1442c0cd8a6ab3ab33fad97 has been approved by oli-obk

@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 Oct 25, 2019
@bors
Copy link
Contributor

bors commented Oct 25, 2019

⌛ Testing commit 1b355b6a2a30ea49f1442c0cd8a6ab3ab33fad97 with merge 2b6d1e0c06aba64a3de525692873dd80424c565c...

@rust-highfive

This comment has been minimized.

@bors

This comment has been minimized.

@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 Oct 25, 2019
@RalfJung
Copy link
Member Author

Some other PR landed in the mean time that broke Miri:

2019-10-25T20:33:57.8333743Z error[E0308]: mismatched types
2019-10-25T20:33:57.8335013Z --> src\tools\miri\src\helpers.rs:78:82
2019-10-25T20:33:57.8335166Z |
2019-10-25T20:33:57.8336103Z 78 | let place = mir::Place { base: mir::PlaceBase::Local(local), projection: Box::new([]) };
2019-10-25T20:33:57.8336416Z | ^^^^^^^^^^^^ expected reference, found struct `std::boxed::Box`
2019-10-25T20:33:57.8336985Z |
2019-10-25T20:33:57.8337152Z = note: expected type `&rustc::ty::List<rustc::mir::ProjectionElem<rustc::mir::Local, &rustc::ty::TyS<'_>>>`
2019-10-25T20:33:57.8337702Z found type `std::boxed::Box<[_; 0]>`

@RalfJung
Copy link
Member Author

Rebased and fixed Miri.

@bors r=oli-obk

@bors
Copy link
Contributor

bors commented Oct 26, 2019

📌 Commit 58da335 has been approved by oli-obk

@bors
Copy link
Contributor

bors commented Oct 26, 2019

🌲 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 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 Oct 26, 2019
@bors
Copy link
Contributor

bors commented Oct 26, 2019

⌛ Testing commit 58da335 with merge 8318ef2...

bors added a commit that referenced this pull request Oct 26, 2019
@bors
Copy link
Contributor

bors commented Oct 26, 2019

☀️ Test successful - checks-azure
Approved by: oli-obk
Pushing 8318ef2 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 26, 2019
@bors bors merged commit 58da335 into rust-lang:master Oct 26, 2019
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #65758!

Tested on commit 8318ef2.
Direct link to PR: #65758

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

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Oct 26, 2019
Tested on commit rust-lang/rust@8318ef2.
Direct link to PR: <rust-lang/rust#65758>

🎉 miri on windows: build-fail → test-pass (cc @oli-obk @eddyb @RalfJung, @rust-lang/infra).
🎉 miri on linux: build-fail → test-pass (cc @oli-obk @eddyb @RalfJung, @rust-lang/infra).
@RalfJung RalfJung deleted the miri branch October 27, 2019 07:17
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#65671
5 participants