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.

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

Simplify find_width_of_character_at_span. #111560

Merged
merged 1 commit into from
May 15, 2023

Conversation

m-ou-se
Copy link
Member

@m-ou-se m-ou-se commented May 14, 2023

This makes find_width_of_character_at_span simpler and more robust against bad spans.

Fixes (but does not close, per beta policy) #111485

@rustbot
Copy link
Collaborator

rustbot commented May 14, 2023

r? @cjgillot

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

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels May 14, 2023
@cjgillot
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented May 14, 2023

📌 Commit 6289c57 has been approved by cjgillot

It is now in the queue for this repository.

@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 May 14, 2023
@compiler-errors
Copy link
Member

I don't think regressions from beta to stable get fixed until beta backport. Nominating for that, and also edited the PR summary so it doesn't auto-close the attached issue.

@compiler-errors compiler-errors added the beta-nominated Nominated for backporting to the compiler in the beta channel. label May 14, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request May 15, 2023
…r=cjgillot

Simplify find_width_of_character_at_span.

This makes `find_width_of_character_at_span` simpler and more robust against bad spans.

Fixes (but does not close, per beta policy) rust-lang#111485
bors added a commit to rust-lang-ci/rust that referenced this pull request May 15, 2023
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#102673 (Update doc for `PhantomData` to match code example)
 - rust-lang#111531 (Fix ice caused by shorthand fields in NoFieldsForFnCall)
 - rust-lang#111547 (Start node has no immediate dominator)
 - rust-lang#111548 (add util function to TokenStream to eliminate some clones)
 - rust-lang#111560 (Simplify find_width_of_character_at_span.)
 - rust-lang#111569 (Appease lints)
 - rust-lang#111581 (Fix some misleading and copy-pasted `Pattern` examples)
 - rust-lang#111582 ((docs) Change "wanting" to "want")

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit ee914a4 into rust-lang:master May 15, 2023
@rustbot rustbot added this to the 1.71.0 milestone May 15, 2023
@m-ou-se m-ou-se deleted the span-char-boundary-stuff branch May 15, 2023 17:12
@apiraino
Copy link
Contributor

Beta backport approved as per compiler team on Zulip

@rustbot label +beta-accepted

@rustbot rustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label May 18, 2023
@cuviper cuviper mentioned this pull request May 20, 2023
@cuviper cuviper modified the milestones: 1.71.0, 1.70.0 May 20, 2023
@cuviper cuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label May 20, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request May 20, 2023
[beta] backport

- debuginfo: split method declaration and definition rust-lang#111167
- Encode VariantIdx so we can decode ADT variants in the right order rust-lang#111494
- Simplify find_width_of_character_at_span. rust-lang#111560

r? cuviper
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant 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.

7 participants