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

Liballoc intoiter refactor #73951

Merged
merged 3 commits into from
Sep 12, 2020
Merged

Liballoc intoiter refactor #73951

merged 3 commits into from
Sep 12, 2020

Conversation

pickfire
Copy link
Contributor

@pickfire pickfire commented Jul 2, 2020

No description provided.

@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 2, 2020
@Mark-Simulacrum Mark-Simulacrum 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-review Status: Awaiting review from the assignee but also interested parties. labels Jul 15, 2020
@pickfire pickfire force-pushed the liballoc-intoiter branch from 4b5d9df to 34c9173 Compare July 16, 2020 14:37
@Mark-Simulacrum
Copy link
Member

r=me with commits squashed into one

@pickfire
Copy link
Contributor Author

@Mark-Simulacrum what can I do?

@Mark-Simulacrum
Copy link
Member

You can squash the commits on this PR, for example by doing something like git rebase -i origin/master and choosing "fixup" in all but the first commit shown, presuming that origin is the name of your rust-lang/rust remote.

Once that's done I (or someone else) can approve this PR.

Let me know if more detailed instructions would be helpful.

@pickfire
Copy link
Contributor Author

You can squash the commits on this PR, for example by doing something like git rebase -i origin/master and choosing "fixup" in all but the first commit shown, presuming that origin is the name of your rust-lang/rust remote.

Ah, I know what is squash. But I don't know what is

r=me with commits squashed into one

I thought you want the bot to do something.

@pickfire pickfire force-pushed the liballoc-intoiter branch from 34c9173 to e000c41 Compare July 23, 2020 16:30
@bors
Copy link
Contributor

bors commented Jul 28, 2020

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

@Dylan-DPC-zz
Copy link

@pickfire if you can rebase again, we can get it merged

@JohnCSimon
Copy link
Member

@pickfire - ping from triage - this PR has sat idle for a few weeks, can you please post your status?

@pickfire
Copy link
Contributor Author

@JohnCSimon I rebased like @Dylan-DPC mentioned, waiting for someone to review and merge.

@Dylan-DPC-zz Dylan-DPC-zz added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 11, 2020
@Dylan-DPC-zz
Copy link

bors r=Mark-Simulacrum

@Dylan-DPC-zz
Copy link

@bors r=Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Sep 11, 2020

📌 Commit 5031523 has been approved by Mark-Simulacrum

@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 Sep 11, 2020
@tesuji
Copy link
Contributor

tesuji commented Sep 11, 2020

(Could someone edit the PR title to more concrete about what PR about ? )

@pickfire pickfire changed the title Liballoc intoiter Liballoc intoiter refactor Sep 11, 2020
@bors
Copy link
Contributor

bors commented Sep 11, 2020

⌛ Testing commit 5031523 with merge 12c10e3...

@bors bors mentioned this pull request Sep 12, 2020
Merged
@bors
Copy link
Contributor

bors commented Sep 12, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: Mark-Simulacrum
Pushing 12c10e3 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 12, 2020
@bors bors merged commit 12c10e3 into rust-lang:master Sep 12, 2020
@rustbot rustbot added this to the 1.48.0 milestone Sep 12, 2020
@pickfire pickfire deleted the liballoc-intoiter branch September 12, 2020 05:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mark-Simulacrum Mark-Simulacrum Mark-Simulacrum left review comments

Assignees

@Mark-Simulacrum Mark-Simulacrum

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.48.0
Development

Successfully merging this pull request may close these issues.
8 participants
@pickfire @rust-highfive @Mark-Simulacrum @bors @Dylan-DPC-zz @JohnCSimon @tesuji @rustbot