-
Notifications
You must be signed in to change notification settings - Fork 13.2k
New issue
Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? # to your account
Restore creating the channel-rust-$channel-date.txt files #40225
Conversation
@bors: r+ |
📌 Commit b601b75 has been approved by |
… r=alexcrichton Restore creating the channel-rust-$channel-date.txt files I have **not** run this (because I don't know how to 😇), but it *does* compile. r? @alexcrichton
☔ The latest upstream changes (presumably #39917) made this pull request unmergeable. Please resolve the merge conflicts. |
b601b75
to
cac4bf3
Compare
@alexcrichton I've rebased to address #39917; note that there's now an extra commit to deal with what appears to be variables that weren't fully renamed. |
@bors: r+ Thanks! |
📌 Commit cac4bf3 has been approved by |
… r=alexcrichton Restore creating the channel-rust-$channel-date.txt files I have **not** run this (because I don't know how to 😇), but it *does* compile. r? @alexcrichton
🔒 Merge conflict |
cac4bf3
to
3e2390f
Compare
Merge conflict (that I didn't see locally) fixed. |
@bors: r+ |
📌 Commit 3e2390f has been approved by |
… r=alexcrichton Restore creating the channel-rust-$channel-date.txt files I have **not** run this (because I don't know how to 😇), but it *does* compile. r? @alexcrichton
… r=alexcrichton Restore creating the channel-rust-$channel-date.txt files I have **not** run this (because I don't know how to 😇), but it *does* compile. r? @alexcrichton
⌛ Testing commit 3e2390f with merge ab212f1... |
@bors: retry (need another PR to land) |
⌛ Testing commit 3e2390f with merge 059c757... |
💔 Test failed - status-travis |
Cargo problem:
|
@arielb1 that seems unrelated to my change. Do you know if there's something I need to address? |
@bors: retry
|
… r=alexcrichton Restore creating the channel-rust-$channel-date.txt files I have **not** run this (because I don't know how to 😇), but it *does* compile. r? @alexcrichton
… r=alexcrichton Restore creating the channel-rust-$channel-date.txt files I have **not** run this (because I don't know how to 😇), but it *does* compile. r? @alexcrichton
… r=alexcrichton Restore creating the channel-rust-$channel-date.txt files I have **not** run this (because I don't know how to 😇), but it *does* compile. r? @alexcrichton
… r=alexcrichton Restore creating the channel-rust-$channel-date.txt files I have **not** run this (because I don't know how to 😇), but it *does* compile. r? @alexcrichton
… r=alexcrichton Restore creating the channel-rust-$channel-date.txt files I have **not** run this (because I don't know how to 😇), but it *does* compile. r? @alexcrichton
… r=alexcrichton Restore creating the channel-rust-$channel-date.txt files I have **not** run this (because I don't know how to 😇), but it *does* compile. r? @alexcrichton
Rollup of 38 pull requests - Successful merges: #39202, #39820, #39918, #39921, #40092, #40146, #40199, #40225, #40239, #40257, #40259, #40261, #40277, #40278, #40287, #40297, #40311, #40315, #40319, #40324, #40336, #40340, #40344, #40345, #40367, #40369, #40372, #40373, #40379, #40385, #40386, #40389, #40400, #40404, #40410, #40422, #40423, #40424 - Failed merges: #40220, #40329, #40426
Rollup of 38 pull requests - Successful merges: #39202, #39820, #39918, #39921, #40092, #40146, #40199, #40225, #40239, #40257, #40259, #40261, #40277, #40278, #40287, #40297, #40311, #40315, #40319, #40324, #40336, #40340, #40344, #40345, #40367, #40369, #40372, #40373, #40379, #40385, #40386, #40389, #40400, #40404, #40410, #40422, #40423, #40424 - Failed merges: #40220, #40329, #40426
I have not run this (because I don't know how to 😇), but it does compile.
r? @alexcrichton