Skip to content

Merge repeated definitions - #66252

Merged
bors merged 8 commits into
rust-lang:masterfrom
cjgillot:trees
Nov 11, 2019
Merged

Merge repeated definitions#66252
bors merged 8 commits into
rust-lang:masterfrom
cjgillot:trees

Conversation

@cjgillot

@cjgillotcjgillot commented Nov 9, 2019

Copy link
Copy Markdown
Contributor

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.

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

bors commented Nov 10, 2019

Copy link
Copy Markdown
Collaborator

☔ 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
Comment threadsrc/librustc_mir/borrow_check/nll/type_check/mod.rs Outdated
oli-obk
oli-obk reviewed Nov 10, 2019
View reviewed changes
Comment threadsrc/librustc/ty/print/pretty.rs Outdated
oli-obk
oli-obk reviewed Nov 10, 2019
View reviewed changes
Comment threadsrc/librustc/hir/mod.rs Outdated
@cjgillot

cjgillot commented Nov 10, 2019

Copy link
Copy Markdown
ContributorAuthor

Rebased with your comments.

@oli-obk

oli-obk commented Nov 10, 2019

Copy link
Copy Markdown
Contributor

@bors r+ Thanks!

@bors

bors commented Nov 10, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 76128f8 has been approved by oli-obk

@borsbors 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

davidtwco commented Nov 10, 2019

Copy link
Copy Markdown
Member

r? @oli-obk

@bors

bors commented Nov 11, 2019

Copy link
Copy Markdown
Collaborator

⌛ 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

bors commented Nov 11, 2019

Copy link
Copy Markdown
Collaborator

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

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

rust-highfive commented Nov 11, 2019

Copy link
Copy Markdown
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 byrust-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
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@oli-obkoli-obkoli-obk left review comments

Assignees

@oli-obkoli-obk

Labels

merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: 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