Skip to content

Remove guess_head_span - #99994

Merged
bors merged 1 commit into
rust-lang:masterfrom
TaKO8Ki:remove-guess-head-span
Aug 2, 2022
Merged

Remove guess_head_span#99994
bors merged 1 commit into
rust-lang:masterfrom
TaKO8Ki:remove-guess-head-span

Conversation

@TaKO8Ki

Copy link
Copy Markdown
Member

follow-up to #98519

@rustbotrustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jul 31, 2022
@rust-highfive

Copy link
Copy Markdown
Contributor

r? @fee1-dead

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 31, 2022
@TaKO8KiTaKO8Ki changed the title Replace a guess_head_span with opt_spanReplace guess_head_span with opt_spanJul 31, 2022
@rust-log-analyzer

This comment has been minimized.

@TaKO8KiTaKO8Ki closed this Aug 1, 2022
@TaKO8Ki
TaKO8Ki deleted the remove-guess-head-span branch August 1, 2022 02:13
@TaKO8Ki
TaKO8Ki restored the remove-guess-head-span branch August 1, 2022 02:22
@TaKO8KiTaKO8Ki reopened this Aug 1, 2022
@rust-log-analyzer

This comment has been minimized.

@TaKO8Ki
TaKO8Kiforce-pushed the remove-guess-head-span branch from 49ad972 to 9a1c662CompareAugust 1, 2022 03:04
@fee1-dead

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Aug 1, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit 9a1c6629e479ca5d7d2fd46c2b2d9a7519619608 has been approved by fee1-dead

It is now in the queue for this repository.

@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 Aug 1, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 1, 2022
…iaskrgr
Rollup of 8 pull requests
Successful merges:
- rust-lang#99340 (Fix ICE in Definitions::create_def)
- rust-lang#99629 (Improve `cannot move out of` error message)
- rust-lang#99864 (bootstrap: don't emit warn about duplicated deps with same/different features if some of sets actually empty)
- rust-lang#99911 (Remove some uses of `guess_head_span`)
- rust-lang#99976 (Make Rustdoc exit with correct error code when scraping examples from invalid files)
- rust-lang#100003 (Improve size assertions.)
- rust-lang#100012 (Avoid `Ty` to `String` conversions)
- rust-lang#100020 (better error when python is not found in x - issue rust-lang#99648)
Failed merges:
- rust-lang#99994 (Replace `guess_head_span` with `opt_span`)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors

bors commented Aug 1, 2022

Copy link
Copy Markdown
Collaborator

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

@borsbors 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 Aug 1, 2022
@TaKO8KiTaKO8Ki changed the title Replace guess_head_span with opt_spanRemove guess_head_spanAug 2, 2022
@TaKO8Ki
TaKO8Kiforce-pushed the remove-guess-head-span branch from 9a1c662 to a3c2d55CompareAugust 2, 2022 02:45
@TaKO8Ki

Copy link
Copy Markdown
MemberAuthor

@rustbot ready

@rustbotrustbot 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 Aug 2, 2022
@fee1-dead

Copy link
Copy Markdown
Member

@bors r+ rollup

@bors

bors commented Aug 2, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit a3c2d55 has been approved by fee1-dead

It is now in the queue for this repository.

@borsbors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 2, 2022
@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Aug 2, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 2, 2022
…iaskrgr
Rollup of 8 pull requests
Successful merges:
- rust-lang#99156 (`codegen_fulfill_obligation` expect erased regions)
- rust-lang#99293 (only run --all-targets in stage0 for Std)
- rust-lang#99779 (Fix item info pos and height)
- rust-lang#99994 (Remove `guess_head_span`)
- rust-lang#100011 (Use Parser's `restrictions` instead of `let_expr_allowed`)
- rust-lang#100017 (kmc-solid: Update `Socket::connect_timeout` to be in line with rust-lang#78802)
- rust-lang#100037 (Update rustc man page to match `rustc --help`)
- rust-lang#100042 (Update books)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 17f76a1 into rust-lang:masterAug 2, 2022
@rustbotrustbot added this to the 1.64.0 milestone Aug 2, 2022
@TaKO8Ki
TaKO8Ki deleted the remove-guess-head-span branch August 2, 2022 08:55
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@TaKO8Ki@rust-highfive@rust-log-analyzer@fee1-dead@bors@rustbot