Skip to content

Merge repeated definitions #66252

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

Jump to bottom
Merged
merged 8 commits into from
Nov 11, 2019
Merged

Merge repeated definitions #66252

merged 8 commits into from
Nov 11, 2019

Conversation

cjgillot
Copy link
Contributor

@cjgillot cjgillot commented Nov 9, 2019

Step forward on #66149

I may need further context to understand the need for a separate crate.

Also, please tell me if you think of other definitions to merge.

@JohnTitor JohnTitor added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 10, 2019
@bors
Copy link
Collaborator

bors commented Nov 10, 2019

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

oli-obk
oli-obk reviewed Nov 10, 2019
View reviewed changes
oli-obk
oli-obk reviewed Nov 10, 2019
View reviewed changes
oli-obk
oli-obk reviewed Nov 10, 2019
View reviewed changes
@cjgillot
Copy link
Contributor Author

Rebased with your comments.

@oli-obk
Copy link
Contributor

oli-obk commented Nov 10, 2019

@bors r+ Thanks!

@bors
Copy link
Collaborator

bors commented Nov 10, 2019

📌 Commit 76128f8 has been approved by oli-obk

@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 Nov 10, 2019
@davidtwco
Copy link
Member

r? @oli-obk

@rust-highfive rust-highfive assigned oli-obk and unassigned davidtwco Nov 10, 2019
@bors
Copy link
Collaborator

bors commented Nov 11, 2019

⌛ Testing commit 76128f8 with merge 56237d7...

bors added a commit that referenced this pull request Nov 11, 2019
@bors
Auto merge of #66252 - cjgillot:trees, r=oli-obk
56237d7 
Merge repeated definitions

Step forward on #66149

I may need further context to understand the need for a separate crate.

Also, please tell me if you think of other definitions to merge.
@bors
Copy link
Collaborator

bors commented Nov 11, 2019

☀️ Test successful - checks-azure
Approved by: oli-obk
Pushing 56237d7 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 11, 2019
@bors bors merged commit 76128f8 into rust-lang:master Nov 11, 2019
This was referenced Nov 11, 2019
Closed
Closed
@rust-highfive
Copy link
Contributor

📣 Toolstate changed by #66252!

Tested on commit 56237d7.
Direct link to PR: #66252

💔 clippy-driver on windows: test-pass → build-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq, @rust-lang/infra).
💔 clippy-driver on linux: test-pass → build-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq, @rust-lang/infra).
💔 miri on windows: test-pass → build-fail (cc @oli-obk @eddyb @RalfJung, @rust-lang/infra).
💔 miri on linux: test-pass → build-fail (cc @oli-obk @eddyb @RalfJung, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Nov 11, 2019
@rust-highfive
📣 Toolstate changed by rust-lang/rust#66252!
926ae67 
Tested on commit rust-lang/rust@56237d7.
Direct link to PR: <rust-lang/rust#66252>

💔 clippy-driver on windows: test-pass → build-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq, @rust-lang/infra).
💔 clippy-driver on linux: test-pass → build-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq, @rust-lang/infra).
💔 miri on windows: test-pass → build-fail (cc @oli-obk @eddyb @RalfJung, @rust-lang/infra).
💔 miri on linux: test-pass → build-fail (cc @oli-obk @eddyb @RalfJung, @rust-lang/infra).
This was referenced Nov 11, 2019
Closed
Merged
Merged
@cjgillot cjgillot deleted the trees branch November 22, 2019 19:39
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@oli-obk oli-obk oli-obk left review comments

Assignees

@oli-obk oli-obk

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
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@cjgillot @bors @oli-obk @davidtwco @rust-highfive @JohnTitor