syntax: Continue refactoring literals#60965
Merged
bors merged 6 commits intorust-lang:masterfrom May 23, 2019
Merged
Conversation
Contributor
Author
|
@bors delegate=matklad |
Collaborator
|
✌️ @matklad can now approve this pull request |
petrochenkov
added
the
S-waiting-on-author
Collaborator
|
☔ The latest upstream changes (presumably #60986) made this pull request unmergeable. Please resolve the merge conflicts. |
Contributor
Author
|
Updated / rebased. |
petrochenkov
added
S-waiting-on-review
Contributor
|
bors r+ |
Contributor
|
@bors r+ |
Collaborator
|
📌 Commit abaa85501359962e3f3fc4f215854e9d26064e9e has been approved by |
bors
added
S-waiting-on-bors
Collaborator
|
☔ The latest upstream changes (presumably #60740) made this pull request unmergeable. Please resolve the merge conflicts. |
bors
added
S-waiting-on-author
Contributor
Author
|
@bors r=matklad |
Collaborator
|
📌 Commit 90d15e7 has been approved by |
bors
added
S-waiting-on-bors
Collaborator
bors
added a commit
that referenced
this pull request
May 23, 2019
syntax: Continue refactoring literals A follow up to #60679. a2fd002: Similarly to `EscapeError`, literal parsing now produces a `LitError`. This way we can get rid of `diag: Option<(Span, &Handler)>` in interfaces while leaving attr/mod alone. d9516d1: Gathers all components of a literal token in a single struct.
Collaborator
|
☀️ Test successful - checks-travis, status-appveyor |
This was referenced May 23, 2019
Merged
phansch
added a commit
to phansch/rust-clippy
that referenced
this pull request
May 23, 2019
bors
added a commit
to rust-lang/rust-clippy
that referenced
this pull request
May 23, 2019
phansch
added a commit
to phansch/rust
that referenced
this pull request
May 23, 2019
Changes: ``` Rustup to rust-lang#60740 Lifetimes UI test cleanup tests: update needless_bool test stderr Rustup to rust-lang#60965 ```
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
May 25, 2019
Changes: ```` Rustup to rust-lang#61026 rustup rust-lang#60803 Rustup to rust-lang#59545 Rustup to rust-lang#60965 clippy: bump rustc_tools util version to 0.2 rustc_tools_util: fix typo in docs (readme) rustc_tool_utils: bump version to 0.2.0 update if_chain to 1.0.0 tests: update needless_bool test stderr cargo fmt Rustup to rust-lang#60740 Lifetimes UI test cleanup ````
bors
added a commit
that referenced
this pull request
Jun 7, 2019
syntax: Keep token span as a part of `Token` In the world with proc macros and edition hygiene `Token` without a span is not self-contained. In practice this means that tokens and spans are always stored and passed somewhere along with each other. This PR combines them into a single struct by doing the next renaming/replacement: - `Token` -> `TokenKind` - `TokenAndSpan` -> `Token` - `(Token, Span)` -> `Token` Some later commits (fb6e2fe and 1cdee86) remove duplicate spans in `token::Ident` and `token::Lifetime`. Those spans were supposed to be identical to token spans, but could easily go out of sync, as was noticed in #60965 (comment). The `(Token, Span)` -> `Token` change is a soft pre-requisite for this de-duplication since it allows to avoid some larger churn (passing spans to most of functions classifying identifiers).
Merged
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
A follow up to #60679.
a2fd002: Similarly to
EscapeError, literal parsing now produces aLitError.This way we can get rid of
diag: Option<(Span, &Handler)>in interfaces while leaving attr/mod alone.d9516d1: Gathers all components of a literal token in a single struct.