Improve error messages for raw strings (#60762)#70522

rcoh · 2020-03-29T04:13:09Z

This diff improves error messages around raw strings in a few ways:

Catch extra trailing # in the parser. This can't be handled in the lexer because we could be in a macro that actually expects another # (see test)
Refactor & unify error handling in the lexer between ByteStrings and RawByteStrings
Detect potentially intended terminators (longest sequence of "#*" is suggested)

Fixes #60762
cc @estebank who reviewed the original (abandoned) PR for the same ticket.
r? @Centril

This diff improves error messages around raw strings in a few ways: - Catch extra trailing `#` in the parser. This can't be handled in the lexer because we could be in a macro that actually expects another # (see test) - Refactor & unify error handling in the lexer between ByteStrings and RawByteStrings - Detect potentially intended terminators (longest sequence of "#*" is suggested)

src/librustc_lexer/src/cursor.rs

src/librustc_lexer/src/lib.rs

src/librustc_parse/lexer/mod.rs

src/librustc_parse/parser/diagnostics.rs

Centril · 2020-03-29T05:17:05Z

I've left some initial comments, but I'm not qualified to sign off on lexer changes myself.

r? @petrochenkov @matklad

src/librustc_parse/parser/diagnostics.rs

src/librustc_lexer/src/lib.rs

src/librustc_parse/parser/diagnostics.rs

petrochenkov · 2020-03-30T17:44:04Z

@bors r+

bors · 2020-03-30T17:44:06Z

📌 Commit 20e2190 has been approved by petrochenkov

@estebank

…rochenkov Improve error messages for raw strings (rust-lang#60762) This diff improves error messages around raw strings in a few ways: - Catch extra trailing `#` in the parser. This can't be handled in the lexer because we could be in a macro that actually expects another # (see test) - Refactor & unify error handling in the lexer between ByteStrings and RawByteStrings - Detect potentially intended terminators (longest sequence of "#*" is suggested) Fixes rust-lang#60762 cc @estebank who reviewed the original (abandoned) PR for the same ticket. r? @Centril

bors · 2020-03-30T23:14:51Z

⌛ Testing commit 20e2190 with merge a2e8ca2e8ec00ba36705760e1ff649cd620c531d...

bors · 2020-03-30T23:18:54Z

💔 Test failed - checks-azure

petrochenkov · 2020-03-30T23:44:49Z

@bors retry
(Looks like a network failure.)

@estebank

…rochenkov Improve error messages for raw strings (rust-lang#60762) This diff improves error messages around raw strings in a few ways: - Catch extra trailing `#` in the parser. This can't be handled in the lexer because we could be in a macro that actually expects another # (see test) - Refactor & unify error handling in the lexer between ByteStrings and RawByteStrings - Detect potentially intended terminators (longest sequence of "#*" is suggested) Fixes rust-lang#60762 cc @estebank who reviewed the original (abandoned) PR for the same ticket. r? @Centril

Centril · 2020-03-31T12:41:24Z

Failed in #70601 (comment), @bors r-

petrochenkov · 2020-03-31T22:50:45Z

@bors r+

bors · 2020-03-31T22:50:46Z

📌 Commit 55a5eea has been approved by petrochenkov

@estebank

…rochenkov Improve error messages for raw strings (rust-lang#60762) This diff improves error messages around raw strings in a few ways: - Catch extra trailing `#` in the parser. This can't be handled in the lexer because we could be in a macro that actually expects another # (see test) - Refactor & unify error handling in the lexer between ByteStrings and RawByteStrings - Detect potentially intended terminators (longest sequence of "#*" is suggested) Fixes rust-lang#60762 cc @estebank who reviewed the original (abandoned) PR for the same ticket. r? @Centril

@ghost

Rollup of 6 pull requests Successful merges: - rust-lang#70511 (Add `-Z dump-mir-dataflow` flag for dumping dataflow results visualization) - rust-lang#70522 (Improve error messages for raw strings (rust-lang#60762)) - rust-lang#70547 (Add `can_unwind` field to `FnAbi`) - rust-lang#70591 (Ensure LLVM is in the link path for "fulldeps" tests) - rust-lang#70627 (Use place directly its copy) - rust-lang#70652 (Add git repo address to unstable book) Failed merges: - rust-lang#70634 (Remove some reexports in `rustc_middle`) r? @ghost

CAD97 · 2020-04-04T00:59:32Z

cc @matklad is librustc_lexer really the right place to have this step for raw strings, or should that be up a level in librustc_parser's lexer cooking? (My gut says the latter.)

matklad · 2020-04-04T09:03:10Z

This seem to fit pretty well into the rustc_lexer interface, which returns tokens as a bunch of sub-offsets. Ideally, we should dissolve lexer cooking altogether and instead lower the tokens much later, after macro expansion.

Move raw string tests into the raw directory

840a576

rust-highfive assigned Centril Mar 29, 2020

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

rcoh closed this Mar 29, 2020

rcoh reopened this Mar 29, 2020

rcoh force-pushed the 60762-raw-string-errors branch from 0fc2569 to 629e97a Compare March 29, 2020 04:44

rcoh commented Mar 29, 2020

View reviewed changes

src/librustc_lexer/src/cursor.rs Outdated Show resolved Hide resolved

Centril reviewed Mar 29, 2020

View reviewed changes

rust-highfive assigned petrochenkov and unassigned Centril Mar 29, 2020

rcoh added 2 commits March 29, 2020 11:12

Cleanup error messages, improve docstrings

c15f86b

More raw string tests

82b2989

Centril reviewed Mar 29, 2020

View reviewed changes

src/librustc_parse/parser/diagnostics.rs Outdated Show resolved Hide resolved

Cleanup match expression

bceab25

petrochenkov reviewed Mar 30, 2020

View reviewed changes

src/librustc_lexer/src/lib.rs Outdated Show resolved Hide resolved

src/librustc_parse/parser/diagnostics.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 Mar 30, 2020

Clean up redudant conditions and match exprs

20e2190

Centril 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 Mar 30, 2020

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 Mar 30, 2020

Centril mentioned this pull request Mar 30, 2020

Rollup of 4 pull requests #70581

Closed

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 30, 2020

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 Mar 30, 2020

Centril mentioned this pull request Mar 31, 2020

Rollup of 8 pull requests #70601

Closed

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 Mar 31, 2020

Fix tests to handle debug_assert

55a5eea

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 Mar 31, 2020

Centril mentioned this pull request Apr 1, 2020

Rollup of 6 pull requests #70648

Closed

Centril mentioned this pull request Apr 1, 2020

Rollup of 6 pull requests #70653

Merged

bors merged commit c739465 into rust-lang:master Apr 1, 2020

dwrensha mentioned this pull request Apr 1, 2020

thread 'rustc' panicked at 'begin <= end (2 <= 1) when slicing r"' #70677

Closed

rcoh mentioned this pull request Apr 23, 2020

thread 'rustc' panicked at 'begin <= end (2 <= 0) when slicing #71471

Closed

Uh oh!

Conversation

rcoh commented Mar 29, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Centril commented Mar 29, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

petrochenkov commented Mar 30, 2020

Uh oh!

bors commented Mar 30, 2020

Uh oh!

bors commented Mar 30, 2020

Uh oh!

bors commented Mar 30, 2020

Uh oh!

petrochenkov commented Mar 30, 2020

Uh oh!

Centril commented Mar 31, 2020

Uh oh!

petrochenkov commented Mar 31, 2020

Uh oh!

bors commented Mar 31, 2020

Uh oh!

CAD97 commented Apr 4, 2020

Uh oh!

matklad commented Apr 4, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

rcoh commented Mar 29, 2020 •

edited

Loading