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.

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

Fix the miri submodule #51225

Merged
merged 6 commits into from
Jun 1, 2018
Merged

Fix the miri submodule #51225

merged 6 commits into from
Jun 1, 2018

Conversation

oli-obk
Copy link
Contributor

@oli-obk oli-obk commented May 30, 2018

cc @bjorn3

r? @eddyb

@rust-highfive
Copy link
Collaborator

warning Warning 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 May 30, 2018
eddyb
eddyb reviewed May 30, 2018
View reviewed changes
src/librustc_mir/interpret/memory.rs Outdated
@@ -844,7 +844,7 @@ impl<'a, 'mir, 'tcx, M: Machine<'mir, 'tcx>> Memory<'a, 'mir, 'tcx, M> {
}

// Forget all the relocations.
alloc.relocations.remove_range(first ..= last);
alloc.relocations.remove_range(first .. last);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This shouldn't have spaces around ...

@eddyb
Copy link
Member

eddyb commented May 30, 2018

r=me with nit fixed

@oli-obk
Copy link
Contributor Author

oli-obk commented May 30, 2018

@bors r=eddyb

@bors
Copy link
Contributor

bors commented May 30, 2018

📌 Commit 9af6a22 has been approved by eddyb

@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 May 30, 2018
@bors
Copy link
Contributor

bors commented May 31, 2018

🔒 Merge conflict

@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 May 31, 2018
@oli-obk
Copy link
Contributor Author

oli-obk commented May 31, 2018

@bors r=eddyb

@bors
Copy link
Contributor

bors commented May 31, 2018

📌 Commit 0639451 has been approved by eddyb

@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 May 31, 2018
@bors
Copy link
Contributor

bors commented May 31, 2018

⌛ Testing commit 0639451 with merge 82ea6202061350da966d299e12ca3f36f95862dc...

@bors
Copy link
Contributor

bors commented May 31, 2018

💔 Test failed - status-travis

@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 May 31, 2018
@oli-obk
Copy link
Contributor Author

oli-obk commented May 31, 2018

Spurious?

[01:31:13] test collections::hash::map::test_map::test_lots_of_insertions ... ok
[01:31:44] test process::tests::test_process_output_fail_to_start ... test process::tests::test_process_output_fail_to_start has been running for over 60 seconds


No output has been received in the last 30m0s, this potentially indicates a stalled build or something wrong with the build itself.
Check the details on how to adjust your build configuration on: https://docs.travis-ci.com/user/common-build-problems/#Build-times-out-because-no-output-was-received

@bors retry

@bors bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 31, 2018
@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 May 31, 2018
@bors
Copy link
Contributor

bors commented Jun 1, 2018

⌛ Testing commit 0639451 with merge 1dcda69...

bors added a commit that referenced this pull request Jun 1, 2018
@bors
Auto merge of #51225 - oli-obk:miri_oob_ptr, r=eddyb
1dcda69 
Fix the miri submodule

cc @bjorn3

r? @eddyb
@bors
Copy link
Contributor

bors commented Jun 1, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: eddyb
Pushing 1dcda69 to master...

@bors bors merged commit 0639451 into rust-lang:master Jun 1, 2018
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #51225!

Tested on commit 1dcda69.
Direct link to PR: #51225

🎉 miri on windows: build-fail → test-pass.
🎉 miri on linux: build-fail → test-pass.

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Jun 1, 2018
@rust-highfive
📣 Toolstate changed by rust-lang/rust#51225!
a9a4249 
Tested on commit rust-lang/rust@1dcda69.
Direct link to PR: <rust-lang/rust#51225>

🎉 miri on windows: build-fail → test-pass.
🎉 miri on linux: build-fail → test-pass.
@Thinkofname Thinkofname mentioned this pull request Jun 2, 2018
Closed
@oli-obk oli-obk deleted the miri_oob_ptr branch June 15, 2020 15:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eddyb eddyb eddyb left review comments

Assignees

@eddyb eddyb

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@oli-obk @rust-highfive @eddyb @bors