Update new_debug_unreachable by JohnTitor · Pull Request #61767 · rust-lang/rust

JohnTitor · 2019-06-12T11:42:04Z

In latest master, smallvec has been updated. So we only update new_debug_unreachable to remove unmaintained dependencies.

rust-highfive · 2019-06-12T11:42:15Z

r? @nikomatsakis

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

nikomatsakis · 2019-06-14T11:25:11Z

@bors r+

bors · 2019-06-14T11:25:13Z

📌 Commit 0e9fff5 has been approved by nikomatsakis

…tsakis Updates smallvec and new_debug_unreachable The version `0.6.10` of smallvec has released that fixes an [ICE](rust-lang#61549). This is re-submission of rust-lang#58773. And this may let rust-lang#56440 re-start.

bors · 2019-06-16T17:48:19Z

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout update-smallvec(switch to your branch)
git fetch upstream master(retrieve the latest master)
git rebase upstream/master -p(rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self update-smallvec --force-with-lease(update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

warning: Cannot merge binary files: Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

bors · 2019-06-18T05:29:06Z

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

JohnTitor · 2019-06-18T05:53:36Z

@nikomatsakis If this is still reasonable, could you re-approve this PR? (see description)

JohnTitor · 2019-06-23T21:00:58Z

Ping @nikomatsakis

JohnTitor · 2019-06-25T19:14:08Z

niko seems busy.
@Centril Could you review this?

Centril · 2019-06-25T19:50:48Z

I would prefer not to :)

JohnTitor · 2019-06-25T20:09:30Z

Okay, sorry to bother you.

bors · 2019-06-25T23:42:19Z

⌛ Testing commit 85ea4a1 with merge a1f1bde9a64bcd7a8e02e294def434edbebf0984...

bors · 2019-06-26T01:56:06Z

💔 Test failed - checks-travis

rust-highfive · 2019-06-26T01:56:08Z

The job test-various of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

[01:40:30] test time::tests::system_time_elapsed ... ok
[01:40:30] test time::tests::system_time_math ... ok
[01:40:31] test thread::tests::test_park_timeout_unpark_called_other_thread ... ok
[01:40:38] test sync::mpsc::tests::stress_recv_timeout_two_threads ... ok
[01:41:28] test process::tests::uid_works ... test process::tests::uid_works 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
The build has been terminated

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

Centril · 2019-06-26T05:28:49Z

@bors retry No output has been received in the last 30m0s

…tsakis Update new_debug_unreachable In latest master, smallvec has been updated. So we only update new_debug_unreachable to remove unmaintained dependencies.

@ghost

Rollup of 8 pull requests Successful merges: - #60340 (Rename .cap() methods to .capacity()) - #61767 (Update new_debug_unreachable) - #62043 (Remove `FnBox`) - #62076 (Updated RELEASES.md for 1.36.0) - #62102 (call out explicitly that general read needs to be called with an initialized buffer) - #62104 (Inform the query system about properties of queries at compile time) - #62106 (Add more tests for async/await) - #62124 (refactor lexer to use idiomatic borrowing) Failed merges: r? @ghost

…tsakis Update new_debug_unreachable In latest master, smallvec has been updated. So we only update new_debug_unreachable to remove unmaintained dependencies.

bors · 2019-06-30T05:21:58Z

⌛ Testing commit 85ea4a1 with merge 3467e21...

Update new_debug_unreachable In latest master, smallvec has been updated. So we only update new_debug_unreachable to remove unmaintained dependencies.

bors · 2019-06-30T08:42:52Z

☀️ Test successful - checks-azure, checks-travis, status-appveyor
Approved by: nikomatsakis
Pushing 3467e21 to master...

rust-highfive assigned nikomatsakis Jun 12, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 12, 2019

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 Jun 14, 2019

Centril mentioned this pull request Jun 14, 2019
Rollup of 8 pull requests #61840
Closed

Centril mentioned this pull request Jun 14, 2019
Rollup of 8 pull requests #61841
Closed

Centril mentioned this pull request Jun 14, 2019
Rollup of 10 pull requests #61850
Closed

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 Jun 16, 2019

JohnTitor force-pushed the update-smallvec branch from 0e9fff5 to 6062320Compare June 17, 2019 22:25

JohnTitor force-pushed the update-smallvec branch from 6062320 to a9ce843Compare June 18, 2019 05:46

JohnTitor changed the title ~~Updates smallvec and new_debug_unreachable~~Update new_debug_unreachableJun 18, 2019

JohnTitor force-pushed the update-smallvec branch from a9ce843 to f9ad458Compare June 23, 2019 18:18

Update new_debug_unreachable
85ea4a1

JohnTitor force-pushed the update-smallvec branch from f9ad458 to 85ea4a1Compare June 25, 2019 14:10

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 Jun 26, 2019

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 Jun 26, 2019

Centril mentioned this pull request Jun 26, 2019
Rollup of 8 pull requests #62139
Closed

Centril mentioned this pull request Jun 26, 2019
Rollup of 8 pull requests #62148
Closed

Centril mentioned this pull request Jun 27, 2019
Rollup of 16 pull requests #62178
Closed

Centril mentioned this pull request Jun 29, 2019
Rollup of 5 pull requests #62242
Closed

bors added a commit that referenced this pull request Jun 30, 2019
Auto merge of#61767- JohnTitor:update-smallvec, r=nikomatsakis
3467e21
Update new_debug_unreachable In latest master, smallvec has been updated. So we only update new_debug_unreachable to remove unmaintained dependencies.

bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 30, 2019

bors merged commit 85ea4a1 into rust-lang:masterJun 30, 2019

bors mentioned this pull request Jun 30, 2019
Final nail in rand 0.4 coffin #62026
Merged

JohnTitor deleted the update-smallvec branch July 1, 2019 17:29

Uh oh!

Uh oh!

Conversation

JohnTitor commented Jun 12, 2019• edited by Mark-Simulacrum Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rust-highfive commented Jun 12, 2019

Uh oh!

nikomatsakis commented Jun 14, 2019

Uh oh!

bors commented Jun 14, 2019

Uh oh!

bors commented Jun 16, 2019

Uh oh!

bors commented Jun 18, 2019

Uh oh!

JohnTitor commented Jun 18, 2019

Uh oh!

JohnTitor commented Jun 23, 2019

Uh oh!

JohnTitor commented Jun 25, 2019

Uh oh!

Centril commented Jun 25, 2019

Uh oh!

JohnTitor commented Jun 25, 2019

Uh oh!

bors commented Jun 25, 2019

Uh oh!

bors commented Jun 26, 2019

Uh oh!

rust-highfive commented Jun 26, 2019

Uh oh!

Centril commented Jun 26, 2019

Uh oh!

bors commented Jun 30, 2019

Uh oh!

bors commented Jun 30, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

JohnTitor commented Jun 12, 2019•
edited by Mark-Simulacrum
Loading