Skip to content

Rename def_span to guess_head_span #69866

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

Merged
merged 1 commit into from
Mar 26, 2020
Merged

Conversation

estebank
Copy link
Contributor

@estebank estebank commented Mar 9, 2020

r? @eddyb

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 9, 2020
@rust-highfive

This comment has been minimized.

@eddyb
Copy link
Member

eddyb commented Mar 10, 2020

@bors r+

@bors
Copy link
Collaborator

bors commented Mar 10, 2020

📌 Commit 0ca1ac33dafcd7b2cb580fe0f91c6f07b1ccc84e has been approved by eddyb

@bors
Copy link
Collaborator

bors commented Mar 10, 2020

🌲 The tree is currently closed for pull requests below priority 1000, this pull request will be tested once the tree is reopened

@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 Mar 10, 2020
@bors

This comment has been minimized.

@bors 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 Mar 10, 2020
@estebank
Copy link
Contributor Author

@bors r=eddyb

@bors
Copy link
Collaborator

bors commented Mar 10, 2020

📌 Commit 91611ca7d53cbd5303fbfc883160c53aeceac211 has been approved by eddyb

@bors
Copy link
Collaborator

bors commented Mar 10, 2020

🌲 The tree is currently closed for pull requests below priority 1000, this pull request will be tested once the tree is reopened

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 10, 2020
@bors
Copy link
Collaborator

bors commented Mar 12, 2020

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

@bors 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 Mar 12, 2020
Copy link
Member

@eddyb eddyb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me again only after resolving #69866 (comment)

@estebank
Copy link
Contributor Author

@bors r=eddyb

@bors
Copy link
Collaborator

bors commented Mar 23, 2020

📌 Commit 5c543507759767ea3ab533d415ae0d3b33e3d232 has been approved by eddyb

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 23, 2020
@rust-highfive

This comment has been minimized.

@eddyb
Copy link
Member

eddyb commented Mar 23, 2020

@bors r-

@bors 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 Mar 23, 2020
@estebank
Copy link
Contributor Author

This will conflict with #70227.

@bors

This comment has been minimized.

@estebank
Copy link
Contributor Author

rebased
@bors r=eddyb

@bors
Copy link
Collaborator

bors commented Mar 26, 2020

📌 Commit f18a6dc has been approved by eddyb

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 26, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 26, 2020
Rollup of 6 pull requests

Successful merges:

 - rust-lang#69866 (Rename `def_span` to `guess_head_span`)
 - rust-lang#69878 (Tweak chained operators diagnostic)
 - rust-lang#70375 (avoid catching InterpError)
 - rust-lang#70386 (typeck: minor pattern typing improvements)
 - rust-lang#70389 (borrowck: prefer "value" over "`_`" in diagnostics)
 - rust-lang#70395 (Update cargo.)

Failed merges:

r? @ghost
@bors
Copy link
Collaborator

bors commented Mar 26, 2020

⌛ Testing commit f18a6dc with merge a17dd36...

@bors bors merged commit b105ac4 into rust-lang:master Mar 26, 2020
@estebank estebank deleted the guess_head_span branch November 9, 2023 05:17
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants