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

Remove TokenKind::InvalidPrefix #133201

Merged
merged 3 commits into from
Nov 20, 2024

Conversation

nnethercote
Copy link
Contributor

It's not needed. Best reviewed one commit at a time.

r? @estebank

- Rename it as `invalid_ident_or_prefix`, which matches the possible
  outputs (`InvalidIdent` or `InvalidPrefix`).
- Use the local wrapper for `is_xid_continue`, for consistency.
- Make it clear what `\u{200d}` means.
- Improve wording.
- Use backticks consistently for examples.
It was added in rust-lang#123752 to handle some cases involving emoji, but it
isn't necessary because it's always treated the same as
`TokenKind::InvalidIdent`. This commit removes it, which makes things a
little simpler.
@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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Nov 19, 2024
@rustbot
Copy link
Collaborator

rustbot commented Nov 19, 2024

rust-analyzer is developed in its own repository. If possible, consider making this change to rust-lang/rust-analyzer instead.

cc @rust-lang/rust-analyzer

@compiler-errors
Copy link
Member

r? compiler-errors @bors r+ rollup

@bors
Copy link
Contributor

bors commented Nov 19, 2024

📌 Commit e9a0c3c has been approved by compiler-errors

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 Nov 19, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 19, 2024
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#123947 (Add vec_deque::Iter::as_slices and friends)
 - rust-lang#125405 (Add std::thread::add_spawn_hook.)
 - rust-lang#133175 (ci: use free runner in dist-i686-msvc)
 - rust-lang#133183 (Mention std::fs::remove_dir_all in std::fs::remove_dir)
 - rust-lang#133188 (Add `visit` methods to ast nodes that already have `walk`s on ast visitors)
 - rust-lang#133201 (Remove `TokenKind::InvalidPrefix`)
 - rust-lang#133207 (Default-enable `llvm_tools_enabled` when no `config.toml` is present)
 - rust-lang#133213 (Correct the tier listing of `wasm32-wasip2`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 841243f into rust-lang:master Nov 20, 2024
6 checks passed
@rustbot rustbot added this to the 1.84.0 milestone Nov 20, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Nov 20, 2024
Rollup merge of rust-lang#133201 - nnethercote:rm-TokenKind-InvalidPrefix, r=compiler-errors

Remove `TokenKind::InvalidPrefix`

It's not needed. Best reviewed one commit at a time.

r? `@estebank`
@nnethercote nnethercote deleted the rm-TokenKind-InvalidPrefix branch November 20, 2024 04:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants