Skip to content

update Miri #99283

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
Jul 17, 2022
Merged

update Miri #99283

merged 2 commits into from
Jul 17, 2022

Conversation

RalfJung
Copy link
Member

Fixes #99224
r? @ghost

@rustbot
Copy link
Collaborator

rustbot commented Jul 15, 2022

The Miri submodule was changed

cc @rust-lang/miri

@RalfJung
Copy link
Member Author

@bors r+ p=1

@bors
Copy link
Collaborator

bors commented Jul 15, 2022

📌 Commit be7476c48b320157c0266c060a7f8f8dbea18da0 has been approved by RalfJung

It is now in the queue for this repository.

@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 Jul 15, 2022
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Collaborator

bors commented Jul 15, 2022

⌛ Testing commit be7476c48b320157c0266c060a7f8f8dbea18da0 with merge e433243ff3485ba848304fa673d765f89325ef5a...

@bors
Copy link
Collaborator

bors commented Jul 15, 2022

💔 Test failed - checks-actions

@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 15, 2022
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@RalfJung
Copy link
Member Author

Oh, is ./x.py not enough any more to update the lockfile?

@RalfJung
Copy link
Member Author

@oli-obk this adds some new crates to the compiler lockfile, is there any process we have to follow for that?

@oli-obk
Copy link
Contributor

oli-obk commented Jul 15, 2022

@oli-obk this adds some new crates to the compiler lockfile, is there any process we have to follow for that?

We either already have these in our list of allowed crates, or tidy will complain.

@RalfJung
Copy link
Member Author

Looks like it does complain:

tidy error: invalid license `MIT OR Zlib OR Apache-2.0` in `miniz_oxide 0.5.3 (registry+[https://github.com/rust-lang/crates.io-index)`](https://github.com/rust-lang/crates.io-index)%60)

@oli-obk
Copy link
Contributor

oli-obk commented Jul 15, 2022

🤦 ok, tidy isn't very smart... I guess we can just add that license string to the allowed set in

rust/src/tools/tidy/src/deps.rs

Line 22 in 81482e6

"Zlib OR Apache-2.0 OR MIT", // tinyvec

@RalfJung
Copy link
Member Author

@Mark-Simulacrum does this change to the tidy license check seem fine?

@RalfJung
Copy link
Member Author

I got some people to look at the license checker changes and it looks like this is fine. Going ahead with this PR then. :)

@bors r+

@bors
Copy link
Collaborator

bors commented Jul 16, 2022

📌 Commit d6f6f36e9d390a96352eaef260575a0c11e0a47a has been approved by RalfJung

It is now in the queue for this repository.

@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 16, 2022
@bors
Copy link
Collaborator

bors commented Jul 16, 2022

⌛ Testing commit d6f6f36e9d390a96352eaef260575a0c11e0a47a with merge 69aae2c9f94fcf256caab044c9347c7bad7d4723...

@bors
Copy link
Collaborator

bors commented Jul 16, 2022

💔 Test failed - checks-actions

@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 16, 2022
@rust-log-analyzer

This comment was marked as resolved.

Sign in to view
@RalfJung
Copy link
Member Author

@bors r+

@bors
Copy link
Collaborator

bors commented Jul 17, 2022

📌 Commit 9b49a79 has been approved by RalfJung

It is now in the queue for this repository.

@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 17, 2022
@bors
Copy link
Collaborator

bors commented Jul 17, 2022

⌛ Testing commit 9b49a79 with merge c2ecd3a...

@bors
Copy link
Collaborator

bors commented Jul 17, 2022

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 17, 2022
@bors bors merged commit c2ecd3a into rust-lang:master Jul 17, 2022
@rustbot rustbot added this to the 1.64.0 milestone Jul 17, 2022
@rust-highfive
Copy link
Contributor

📣 Toolstate changed by #99283!

Tested on commit c2ecd3a.
Direct link to PR: #99283

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

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Jul 17, 2022
@rust-highfive
📣 Toolstate changed by rust-lang/rust#99283!
d9072ab 
Tested on commit rust-lang/rust@c2ecd3a.
Direct link to PR: <rust-lang/rust#99283>

🎉 miri on windows: build-fail → test-pass (cc @oli-obk @RalfJung).
🎉 miri on linux: build-fail → test-pass (cc @oli-obk @RalfJung).
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (c2ecd3a): comparison url.

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results
  • Primary benchmarks: 🎉 relevant improvement found
  • Secondary benchmarks: 🎉 relevant improvement found
mean1 max count2
Regressions 😿
(primary)		 N/A N/A 0
Regressions 😿
(secondary)		 N/A N/A 0
Improvements 🎉
(primary)		 -1.1% -1.1% 1
Improvements 🎉
(secondary)		 -2.1% -2.1% 1
All 😿🎉 (primary) -1.1% -1.1% 1

Cycles

Results
  • Primary benchmarks: 😿 relevant regression found
  • Secondary benchmarks: no relevant changes found
mean1 max count2
Regressions 😿
(primary)		 2.6% 2.6% 1
Regressions 😿
(secondary)		 N/A N/A 0
Improvements 🎉
(primary)		 N/A N/A 0
Improvements 🎉
(secondary)		 N/A N/A 0
All 😿🎉 (primary) 2.6% 2.6% 1

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

Footnotes

  1. the arithmetic mean of the percent change ↩ ↩2

  2. number of relevant changes ↩ ↩2

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
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
Milestone
1.64.0
Development

Successfully merging this pull request may close these issues.

miri no longer builds after rust-lang/rust#97995
7 participants
@RalfJung @rustbot @bors @rust-log-analyzer @oli-obk @rust-highfive @rust-timer