Implement proposed API for proc_macro_span
#111571
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
S-waiting-on-review
This comment was marked as resolved.
This comment was marked as resolved.
jhpratt
commented
May 14, 2023
There was a problem hiding this comment.
This is something that needs addressing. I presume it has something to do with the ordering of spans, but beyond that I'm not sure what.
There was a problem hiding this comment.
@estebank Do you perhaps know what happened here? Both the old and the new diagnostic output seems a bit off here. Not sure what span it is trying to point at. (And also not sure why it changed in this PR.)
There was a problem hiding this comment.
It seems like the underlying Span coming out of the macro is absolutely malformed, very likely the end comes before the start, but this is the first time I see this behavior in the test suite (things might have changed in the handling in the last six months). I'd need to dig deeper.
There was a problem hiding this comment.
I beleive @dtolnay thought might be the result of error deduplication, when I asked him about it.
There was a problem hiding this comment.
If the erroneous output is at most tangentially related to this PR, should it be merged and a separate issue created for the bug?
There was a problem hiding this comment.
should it be merged and a separate issue created for the bug?
I think that's the best way forward. Can you open that issue?
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
3 tasks
m-ou-se
approved these changes
May 15, 2023
|
☔ The latest upstream changes (presumably #111710) made this pull request unmergeable. Please resolve the merge conflicts. |
m-ou-se
approved these changes
Jun 5, 2023
|
Implementation looks fine to me. r=me with that issue filed and conflict resolved. |
m-ou-se
added
S-waiting-on-author
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
|
cc @dtolnay — looks like merging |
|
💔 Test failed - checks-actions |
bors
added
S-waiting-on-review
TaKO8Ki
added a commit
to TaKO8Ki/rust
that referenced
this pull request
Jun 27, 2023
Implement proposed API for `proc_macro_span` As proposed in [rust-lang#54725 (comment)](rust-lang#54725 (comment)). I have omitted the byte-level API as it's already available as [`Span::byte_range`](https://doc.rust-lang.org/nightly/proc_macro/struct.Span.html#method.byte_range). `@rustbot` label +A-proc-macros r? `@m-ou-se`
|
Not sure what to make of that error. |
|
@bors retry |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 28, 2023
Rollup of 6 pull requests Successful merges: - rust-lang#111571 (Implement proposed API for `proc_macro_span`) - rust-lang#112236 (Simplify computation of killed borrows) - rust-lang#112867 (More `ImplSource` nits) - rust-lang#113019 (add note for non-exhaustive matches with guards) - rust-lang#113094 (Fix invalid HTML DIV tag used in HEAD) - rust-lang#113111 (add myself to review for t-types stuff) r? `@ghost` `@rustbot` modify labels: rollup
martin-t
added a commit
to martin-t/cvars
that referenced
this pull request
Jun 30, 2023
Should fix CI fail after rust-lang/rust#111571
MingweiSamuel
added a commit
to hydro-project/proc-macro2
that referenced
this pull request
Jun 30, 2023
MingweiSamuel
added a commit
to hydro-project/proc-macro2
that referenced
this pull request
Jun 30, 2023
udoprog
pushed a commit
to udoprog/proc-macro2
that referenced
this pull request
Aug 21, 2023
kodiakhq bot
referenced
this pull request
in X-oss-byte/Nextjs
Sep 22, 2023
[](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [proc-macro2](https://togithub.com/dtolnay/proc-macro2) | workspace.dependencies | patch | `1.0.51` -> `1.0.67` | --- ### Release Notes <details> <summary>dtolnay/proc-macro2 (proc-macro2)</summary> ### [`v1.0.67`](https://togithub.com/dtolnay/proc-macro2/releases/tag/1.0.67) [Compare Source](https://togithub.com/dtolnay/proc-macro2/compare/1.0.66...1.0.67) - Special handling for the `(/*ERROR*/)` placeholder that rustc uses for macros that fail to expand ([#​405](https://togithub.com/dtolnay/proc-macro2/issues/405)) ### [`v1.0.66`](https://togithub.com/dtolnay/proc-macro2/releases/tag/1.0.66) [Compare Source](https://togithub.com/dtolnay/proc-macro2/compare/1.0.65...1.0.66) - Raise required compiler from Rust 1.31 to 1.56 ### [`v1.0.65`](https://togithub.com/dtolnay/proc-macro2/releases/tag/1.0.65) [Compare Source](https://togithub.com/dtolnay/proc-macro2/compare/1.0.64...1.0.65) - Documentation improvements ### [`v1.0.64`](https://togithub.com/dtolnay/proc-macro2/releases/tag/1.0.64) [Compare Source](https://togithub.com/dtolnay/proc-macro2/compare/1.0.63...1.0.64) - Fix parsing of bare `\r` in between tokens ([#​399](https://togithub.com/dtolnay/proc-macro2/issues/399)) ### [`v1.0.63`](https://togithub.com/dtolnay/proc-macro2/releases/tag/1.0.63) [Compare Source](https://togithub.com/dtolnay/proc-macro2/compare/1.0.62...1.0.63) - Parse `c"…"` c-string literals (tracking issue: [https://github.com/rust-lang/rust/issues/105723](https://togithub.com/rust-lang/rust/issues/105723)) ### [`v1.0.62`](https://togithub.com/dtolnay/proc-macro2/releases/tag/1.0.62) [Compare Source](https://togithub.com/dtolnay/proc-macro2/compare/1.0.61...1.0.62) *yanked* ### [`v1.0.61`](https://togithub.com/dtolnay/proc-macro2/releases/tag/1.0.61) [Compare Source](https://togithub.com/dtolnay/proc-macro2/compare/1.0.60...1.0.61) - Stricter parsing of whitespace in cooked string literals and between tokens ([#​392](https://togithub.com/dtolnay/proc-macro2/issues/392), [#​393](https://togithub.com/dtolnay/proc-macro2/issues/393)) ### [`v1.0.60`](https://togithub.com/dtolnay/proc-macro2/releases/tag/1.0.60) [Compare Source](https://togithub.com/dtolnay/proc-macro2/compare/1.0.59...1.0.60) - Eliminate uses of unstable proc_macro::Span::before/after ([#​391](https://togithub.com/dtolnay/proc-macro2/issues/391)) ### [`v1.0.59`](https://togithub.com/dtolnay/proc-macro2/releases/tag/1.0.59) [Compare Source](https://togithub.com/dtolnay/proc-macro2/compare/1.0.58...1.0.59) - Enable proc_macro support on wasm targets ([#​388](https://togithub.com/dtolnay/proc-macro2/issues/388)) ### [`v1.0.58`](https://togithub.com/dtolnay/proc-macro2/releases/tag/1.0.58) [Compare Source](https://togithub.com/dtolnay/proc-macro2/compare/1.0.57...1.0.58) - Make rustc version detection more robust by compiling against modernest stable features ([#​384](https://togithub.com/dtolnay/proc-macro2/issues/384)) ### [`v1.0.57`](https://togithub.com/dtolnay/proc-macro2/releases/tag/1.0.57) [Compare Source](https://togithub.com/dtolnay/proc-macro2/compare/1.0.56...1.0.57) - Disable nightly-only `start()`/`end()` implementation on `Span` while the upstream API is iterated on ([#​383](https://togithub.com/dtolnay/proc-macro2/issues/383), [https://github.com/rust-lang/rust/pull/111571](https://togithub.com/rust-lang/rust/pull/111571)) ### [`v1.0.56`](https://togithub.com/dtolnay/proc-macro2/releases/tag/1.0.56) [Compare Source](https://togithub.com/dtolnay/proc-macro2/compare/1.0.55...1.0.56) - Circumvent clippy::octal_escapes lint inside generated string and byte-string literals ([#​363](https://togithub.com/dtolnay/proc-macro2/issues/363), [#​380](https://togithub.com/dtolnay/proc-macro2/issues/380)) - Provide RefUnwindSafe impls for compilers older than 1.58 ([#​382](https://togithub.com/dtolnay/proc-macro2/issues/382)) ### [`v1.0.55`](https://togithub.com/dtolnay/proc-macro2/releases/tag/1.0.55) [Compare Source](https://togithub.com/dtolnay/proc-macro2/compare/1.0.54...1.0.55) - Set a meaningful `Span` for literals produced via the `FromStr` impl of `Literal` ([#​378](https://togithub.com/dtolnay/proc-macro2/issues/378)) - Implement `Literal::subspan` in non-macro contexts when "span-locations" feature is enabled ([#​379](https://togithub.com/dtolnay/proc-macro2/issues/379)) ### [`v1.0.54`](https://togithub.com/dtolnay/proc-macro2/releases/tag/1.0.54) [Compare Source](https://togithub.com/dtolnay/proc-macro2/compare/1.0.53...1.0.54) - Performance improvement to "span-locations" feature ([#​373](https://togithub.com/dtolnay/proc-macro2/issues/373)) - Fix unbounded memory usage when calling proc-macro2's parser from a fuzzer ([#​374](https://togithub.com/dtolnay/proc-macro2/issues/374)) ### [`v1.0.53`](https://togithub.com/dtolnay/proc-macro2/releases/tag/1.0.53) [Compare Source](https://togithub.com/dtolnay/proc-macro2/compare/1.0.52...1.0.53) - Add support for Rust 1.66's `source_text()` method ([#​350](https://togithub.com/dtolnay/proc-macro2/issues/350)) ### [`v1.0.52`](https://togithub.com/dtolnay/proc-macro2/releases/tag/1.0.52) [Compare Source](https://togithub.com/dtolnay/proc-macro2/compare/1.0.51...1.0.52) - Add [`Group::delim_span`](https://docs.rs/proc-macro2/1.0.52/proc_macro2/struct.Group.html#method.delim_span) ([#​366](https://togithub.com/dtolnay/proc-macro2/issues/366)) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/sammyfilly/Nextjs).
](https://renovatebot.com){kind=link}
MingweiSamuel
added a commit
to hydro-project/proc-macro2
that referenced
this pull request
Mar 26, 2024
MingweiSamuel
added a commit
to hydro-project/proc-macro2
that referenced
this pull request
Mar 26, 2024
MingweiSamuel
added a commit
to hydro-project/proc-macro2
that referenced
this pull request
Mar 26, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As proposed in #54725 (comment). I have omitted the byte-level API as it's already available as
Span::byte_range.@rustbot label +A-proc-macros
r? @m-ou-se