syntax: Continue refactoring literals by petrochenkov · Pull Request #60965 · rust-lang/rust

petrochenkov · 2019-05-19T17:43:40Z

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.

petrochenkov · 2019-05-19T17:44:34Z

@bors delegate=matklad

bors · 2019-05-19T17:44:35Z

✌️ @matklad can now approve this pull request

matklad

Nice cleanup!

bors · 2019-05-21T00:45:36Z

☔ The latest upstream changes (presumably #60986) made this pull request unmergeable. Please resolve the merge conflicts.

petrochenkov · 2019-05-22T00:37:42Z

Updated / rebased.

matklad · 2019-05-22T07:36:39Z

bors r+

matklad · 2019-05-22T07:36:57Z

@bors r+

bors · 2019-05-22T07:36:59Z

📌 Commit abaa85501359962e3f3fc4f215854e9d26064e9e has been approved by matklad

bors · 2019-05-23T04:59:15Z

☔ The latest upstream changes (presumably #60740) made this pull request unmergeable. Please resolve the merge conflicts.

petrochenkov · 2019-05-23T10:08:23Z

@bors r=matklad

bors · 2019-05-23T10:08:24Z

📌 Commit 90d15e7 has been approved by matklad

bors · 2019-05-23T13:28:36Z

⌛ Testing commit 90d15e7 with merge 27cc0db...

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.

bors · 2019-05-23T16:15:50Z

☀️ Test successful - checks-travis, status-appveyor
Approved by: matklad
Pushing 27cc0db to master...

Rustup to rust-lang/rust#60965 rust-lang/rust#60965

Changes: ``` Rustup to rust-lang#60740 Lifetimes UI test cleanup tests: update needless_bool test stderr Rustup to rust-lang#60965 ```

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 ````

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).

rust-highfive assigned pnkfelix May 19, 2019

matklad reviewed May 19, 2019
View reviewed changes

Comment threadsrc/libsyntax/parse/literal.rs Outdated
Comment threadsrc/libsyntax/parse/literal.rs Outdated
Comment threadsrc/libsyntax/parse/literal.rs Outdated
Comment threadsrc/libsyntax/parse/literal.rs Outdated
Comment threadsrc/libsyntax/parse/token.rs Outdated

petrochenkov added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label May 20, 2019

petrochenkov force-pushed the lit3 branch from e559c0a to abaa855Compare May 22, 2019 00:36

petrochenkov added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 22, 2019

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 22, 2019

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 23, 2019

petrochenkov added 6 commits May 23, 2019 12:44

syntax: Return named errors from literal parsing functions
fcc2f92

syntax: More consistent wording for some literal parsing errors
694f76d

syntax: Fix spans for boolean literals passed to proc macros
9450e7d

syntax: Remove an obsolete hack from literal comparisons
558559e

syntax: Turn token::Lit into a struct
ca2a50f

syntax: Some code cleanup
90d15e7

petrochenkov force-pushed the lit3 branch from abaa855 to 90d15e7Compare May 23, 2019 10:07

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 23, 2019

petrochenkov mentioned this pull request May 23, 2019
Avoid more symbol interning #61035
Merged

bors added the merged-by-bors This PR was explicitly merged by bors. label May 23, 2019

bors merged commit 90d15e7 into rust-lang:masterMay 23, 2019

This was referenced May 23, 2019
lexer: Disallow bare CR in raw byte strings #60793
Merged
The essence of lexer #59706
Merged

phansch added a commit to phansch/rust-clippy that referenced this pull request May 23, 2019
Rustup torust-lang/rust#60965
a316179

phansch mentioned this pull request May 23, 2019
Rustup to https://github.com/rust-lang/rust/pull/60965 rust-lang/rust-clippy#4131
Merged

bors added a commit to rust-lang/rust-clippy that referenced this pull request May 23, 2019
Auto merge of#4131- phansch:rustup2, r=phansch
c984f77
Rustup to rust-lang/rust#60965 rust-lang/rust#60965

phansch added a commit to phansch/rust that referenced this pull request May 23, 2019
Update Clippy submodule
13b0a80
Changes: ``` Rustup to rust-lang#60740 Lifetimes UI test cleanup tests: update needless_bool test stderr Rustup to rust-lang#60965 ```

petrochenkov mentioned this pull request Jun 5, 2019
syntax: Keep token span as a part of Token#61541
Merged

petrochenkov deleted the lit3 branch June 5, 2019 16:37

petrochenkov mentioned this pull request Jun 11, 2019
Separate unit tests #61739
Merged

Uh oh!

Uh oh!

Conversation

petrochenkov commented May 19, 2019

Uh oh!

petrochenkov commented May 19, 2019

Uh oh!

bors commented May 19, 2019

Uh oh!

matklad left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

bors commented May 21, 2019

Uh oh!

petrochenkov commented May 22, 2019

Uh oh!

matklad commented May 22, 2019

Uh oh!

matklad commented May 22, 2019

Uh oh!

bors commented May 22, 2019

Uh oh!

bors commented May 23, 2019

Uh oh!

petrochenkov commented May 23, 2019

Uh oh!

bors commented May 23, 2019

Uh oh!

bors commented May 23, 2019

Uh oh!

bors commented May 23, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants