Literal error reporting cleanup #72047

Julian-Wollersberger · 2020-05-09T14:04:41Z

While doing some performance work, I noticed some code duplication in librustc_parser/lexer/mod.rs, so I cleaned it up.

This PR is probably best reviewed commit by commit.

I'm not sure what the API stability practices for librustc_lexer are. Four public methods in unescape.rs can be removed, but two are used by clippy, so I left them in for now.
I could open a PR for Rust-Analyzer when this one lands.

But how do I open a PR for clippy? (Git submodules are frustrating to work with)

@matklad

The phrasing is from the commit description of 395ee0b by @matklad.

rust-highfive · 2020-05-09T14:04:44Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @eddyb (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

petrochenkov · 2020-05-09T14:06:17Z

r? @petrochenkov
cc @matklad

petrochenkov · 2020-05-09T14:08:14Z

But how do I open a PR for clippy? (Git submodules are frustrating to work with)

clippy is currently using a subtree rather than a submodule, so it can be fixed right in this repo.

Julian-Wollersberger · 2020-05-09T14:18:43Z

Thanks. It didn't work with CLion, but it did with command line git.

petrochenkov · 2020-05-09T22:14:12Z

./x.py test --stage 0 src/librustc_lexer

to quickly run the unit tests that are currently failing on CI.

src/librustc_parse/lexer/mod.rs

petrochenkov · 2020-05-10T10:02:34Z

LGTM.
(The unescape_* commits could use some squashing.)

Julian-Wollersberger · 2020-05-12T11:13:07Z

Addressed the feedback (and remembered to do x.py fmt and test tidy this time).
Thanks for reviewing.

petrochenkov · 2020-05-12T15:00:15Z

See #72047 (comment), but I'll r+ in a couple of days anyway because that's not super critical.

…ods into one method `unescape_literal` with a mode argument.

…o one method `validate_literal_escape` with a mode argument. This enables simplifying the `match` in `cook_lexer_literal()` and it eliminates 90 lines of repetition :)

…nd tests.

Julian-Wollersberger · 2020-05-13T08:15:52Z

Cleaned up the git history and the code for Int and Float isn't moved around anymore.

petrochenkov · 2020-05-13T09:16:30Z

Thanks!
@bors r+

bors · 2020-05-13T09:16:31Z

📌 Commit 43ae785 has been approved by petrochenkov

…reporting_cleanup, r=petrochenkov Literal error reporting cleanup While doing some performance work, I noticed some code duplication in `librustc_parser/lexer/mod.rs`, so I cleaned it up. This PR is probably best reviewed commit by commit. I'm not sure what the API stability practices for `librustc_lexer` are. Four public methods in `unescape.rs` can be removed, but two are used by clippy, so I left them in for now. I could open a PR for Rust-Analyzer when this one lands. But how do I open a PR for clippy? (Git submodules are frustrating to work with)

@ghost

Rollup of 5 pull requests Successful merges: - rust-lang#72045 (Incomplete features can also be unsound) - rust-lang#72047 (Literal error reporting cleanup) - rust-lang#72060 (move `ty::List` into a new submodule) - rust-lang#72094 (cmdline: Make target features individually overridable) - rust-lang#72254 (Remove redundant backtick in error message.) Failed merges: r? @ghost

…reporting_cleanup, r=petrochenkov Literal error reporting cleanup While doing some performance work, I noticed some code duplication in `librustc_parser/lexer/mod.rs`, so I cleaned it up. This PR is probably best reviewed commit by commit. I'm not sure what the API stability practices for `librustc_lexer` are. Four public methods in `unescape.rs` can be removed, but two are used by clippy, so I left them in for now. I could open a PR for Rust-Analyzer when this one lands. But how do I open a PR for clippy? (Git submodules are frustrating to work with)

4590: Update to rustc_lexer version 660 r=matklad a=Julian-Wollersberger Change the `unescape_*()` functions to `unescape_literal()`, to address the canges I made in rust-lang/rust#72047. I also noticed some outdated FIXMEs. Co-authored-by: Julian Wollersberger <24991778+Julian-Wollersberger@users.noreply.github.com>

Small doc improvements.

e734e31

The phrasing is from the commit description of 395ee0b by @matklad.

rust-highfive assigned eddyb May 9, 2020

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 9, 2020

rust-highfive assigned petrochenkov and unassigned eddyb May 9, 2020

This comment has been minimized.

Sign in to view

petrochenkov reviewed May 10, 2020

View reviewed changes

src/librustc_parse/lexer/mod.rs Outdated Show resolved Hide resolved

src/librustc_parse/lexer/mod.rs Outdated Show resolved Hide resolved

petrochenkov 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-review Status: Awaiting review from the assignee but also interested parties. labels May 10, 2020

Julian-Wollersberger force-pushed the literal_error_reporting_cleanup branch from 85856ae to 8abd741 Compare May 12, 2020 11:08

Julian-Wollersberger added 3 commits May 13, 2020 09:42

Unified unescape_{char,byte,str,byte_str,raw_str,raw_byte_str} meth…

1be5d1e

…ods into one method `unescape_literal` with a mode argument.

Unified validate_{byte,str,raw_str,raw_byte_str}_escape methods int…

18cc63d

…o one method `validate_literal_escape` with a mode argument. This enables simplifying the `match` in `cook_lexer_literal()` and it eliminates 90 lines of repetition :)

Replace some usages of the old unescape_ functions in AST, clippy a…

43ae785

…nd tests.

Julian-Wollersberger force-pushed the literal_error_reporting_cleanup branch from 8abd741 to 43ae785 Compare May 13, 2020 08:08

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 13, 2020

RalfJung mentioned this pull request May 15, 2020

Rollup of 5 pull requests #72228

Closed

RalfJung mentioned this pull request May 16, 2020

Rollup of 5 pull requests #72276

Merged

bors merged commit ec5610f into rust-lang:master May 16, 2020

Julian-Wollersberger mentioned this pull request May 24, 2020

Update to rustc_lexer version 660 rust-lang/rust-analyzer#4590

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Literal error reporting cleanup #72047

Literal error reporting cleanup #72047

Julian-Wollersberger commented May 9, 2020

rust-highfive commented May 9, 2020

petrochenkov commented May 9, 2020

petrochenkov commented May 9, 2020

Julian-Wollersberger commented May 9, 2020

This comment has been minimized.

petrochenkov commented May 9, 2020

petrochenkov commented May 10, 2020

Julian-Wollersberger commented May 12, 2020

petrochenkov commented May 12, 2020

Julian-Wollersberger commented May 13, 2020

petrochenkov commented May 13, 2020

bors commented May 13, 2020

Literal error reporting cleanup #72047

Literal error reporting cleanup #72047

Conversation

Julian-Wollersberger commented May 9, 2020

rust-highfive commented May 9, 2020

petrochenkov commented May 9, 2020

petrochenkov commented May 9, 2020

Julian-Wollersberger commented May 9, 2020

This comment has been minimized.

petrochenkov commented May 9, 2020

petrochenkov commented May 10, 2020

Julian-Wollersberger commented May 12, 2020

petrochenkov commented May 12, 2020

Julian-Wollersberger commented May 13, 2020

petrochenkov commented May 13, 2020

bors commented May 13, 2020