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

rustc_span: More consistent span combination operations #119624

Merged
merged 5 commits into from
Jan 6, 2024

Conversation

petrochenkov
Copy link
Contributor

Also add more tests for using tt in addition to ident, and some other minor tweaks, see individual commits.

This is a part of #119412 that doesn't yet add side tables for metavariable spans.

The lint is not yet reported due to span issues, but will be reported later.
In the past it did create a fresh expansion, but now, after surviving a number of refactorings, it does not.
Now it's just a thin wrapper around `apply_mark`.
Generally, `tt` and `ident` should behave identically, modulo the latter accepting only a subset of token trees.
@rustbot
Copy link
Collaborator

rustbot commented Jan 5, 2024

r? @compiler-errors

(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. T-libs Relevant to the library 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 Jan 5, 2024
Copy link
Member

@compiler-errors compiler-errors left a comment

Choose a reason for hiding this comment

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

this is great, thanks for making all the commits readable

@compiler-errors
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jan 6, 2024

📌 Commit 508d1ff 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 Jan 6, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 6, 2024
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#118194 (rustdoc: search for tuples and unit by type with `()`)
 - rust-lang#118781 (merge core_panic feature into panic_internals)
 - rust-lang#119486 (pass allow-{dirty,staged} to clippy)
 - rust-lang#119591 (rustc_mir_transform: Make DestinationPropagation stable for queries)
 - rust-lang#119595 (Fixed ambiguity in hint.rs)
 - rust-lang#119624 (rustc_span: More consistent span combination operations)
 - rust-lang#119653 (compiler: update Fuchsia sanitizer support.)
 - rust-lang#119655 (Remove ignore-stage1 that was added when changing error count msg)
 - rust-lang#119661 (Strip lld-wrapper binaries)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 1d6ab69 into rust-lang:master Jan 6, 2024
11 checks passed
@rustbot rustbot added this to the 1.77.0 milestone Jan 6, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jan 6, 2024
Rollup merge of rust-lang#119624 - petrochenkov:dialoc4, r=compiler-errors

rustc_span: More consistent span combination operations

Also add more tests for using `tt` in addition to `ident`, and some other minor tweaks, see individual commits.

This is a part of rust-lang#119412 that doesn't yet add side tables for metavariable spans.
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-libs Relevant to the library 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.

4 participants