Skip to content

Add ErrorGuaranteed to ast::LitKind::Err, token::LitKind::Err.#121120

Merged
bors merged 5 commits intorust-lang:masterfrom
nnethercote:LitKind-Err-guar
Feb 15, 2024
Merged

Add ErrorGuaranteed to ast::LitKind::Err, token::LitKind::Err.#121120
bors merged 5 commits intorust-lang:masterfrom
nnethercote:LitKind-Err-guar

Conversation

@nnethercote
Copy link
Contributor

@nnethercote nnethercote commented Feb 15, 2024

Similar to recent work doing the same for ExprKind::Err (#120586) and TyKind::Err (#121109).

r? @oli-obk

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Feb 15, 2024
@rustbot
Copy link
Collaborator

rustbot commented Feb 15, 2024

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

rust-analyzer is developed in its own repository. If possible, consider making this change to rust-lang/rust-analyzer instead.

cc @rust-lang/rust-analyzer

@nnethercote
Copy link
Contributor Author

nnethercote commented Feb 15, 2024

cc @ShE3py @fmease @compiler-errors

@nnethercote
Copy link
Contributor Author

nnethercote commented Feb 15, 2024 •
edited
Loading

Note: I didn't add Dummy variants to either of the LitKind enums, because they weren't necessary. Although there are changes to four "dummy" values in rust-analyzer, those dummies aren't true dummies. Rather, the code to produce the appropriate TyKind simply isn't implemented yet. So I just used Integer which works fine.

fmease
fmease reviewed Feb 15, 2024
View reviewed changes
compiler/rustc_ast/src/util/literal.rs

#[derive(Debug)]
pub enum LitError {
LexerError,
Copy link
Member

@fmease fmease Feb 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎉

@nnethercote
Copy link
Contributor Author

nnethercote commented Feb 15, 2024

Best reviewed one commit at a time.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@nnethercote
Remove LitError::LexerError.
8b35f8e 
`cook_lexer_literal` can emit an error about an invalid int literal but
then return a non-`Err` token. And then `integer_lit` has to account for
this to avoid printing a redundant error message.

This commit changes `cook_lexer_literal` to return `Err` in that case.
Then `integer_lit` doesn't need the special case, and
`LitError::LexerError` can be removed.
@nnethercote
Make report_lit_error return ErrorGuaranteed.
a513bb2 
This will be helpful for subsequent commits.
@nnethercote
Make emit_unescape_error return Option<ErrorGuaranteed>.
332c577 
And use the result in `cook_common` to decide whether to return an error
token.
@nnethercote nnethercote mentioned this pull request Feb 15, 2024
Merged
fmease
fmease reviewed Feb 15, 2024
View reviewed changes
@nnethercote
Add ErrorGuaranteed to ast::LitKind::Err, token::LitKind::Err.
25ed6e4 
This mostly works well, and eliminates a couple of delayed bugs.

One annoying thing is that we should really also add an
`ErrorGuaranteed` to `proc_macro::bridge::LitKind::Err`. But that's
difficult because `proc_macro` doesn't have access to `ErrorGuaranteed`,
so we have to fake it.
@nnethercote
Add suffixes to LitError.
ac47f6c 
To avoid some unwrapping.
fmease
fmease approved these changes Feb 15, 2024
View reviewed changes
Copy link
Member

@fmease fmease left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for updating those variants, now I can sleep soundly :D

r=me when green

@fmease fmease assigned fmease and unassigned oli-obk Feb 15, 2024
@fmease
Copy link
Member

fmease commented Feb 15, 2024

@bors r+

@bors
Copy link
Collaborator

bors commented Feb 15, 2024

📌 Commit ac47f6c has been approved by fmease

It is now in the queue for this repository.

@bors 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 Feb 15, 2024
@GuillaumeGomez GuillaumeGomez mentioned this pull request Feb 15, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 15, 2024
@bors
Auto merge of rust-lang#121142 - GuillaumeGomez:rollup-5qmksjw, r=Gui…
cbddf31 
…llaumeGomez

Rollup of 8 pull requests

Successful merges:

 - rust-lang#120449 (Document requirements for unsized {Rc,Arc}::from_raw)
 - rust-lang#120505 (Fix BTreeMap's Cursor::remove_{next,prev})
 - rust-lang#120672 (std::thread update freebsd stack guard handling.)
 - rust-lang#121088 (Implicitly enable evex512 if avx512 is enabled)
 - rust-lang#121104 (Ignore unsized types when trying to determine the size of the original type)
 - rust-lang#121107 (Fix msg for verbose suggestions with confusable capitalization)
 - rust-lang#121113 (Continue compilation even if inherent impl checks fail)
 - rust-lang#121120 (Add `ErrorGuaranteed` to `ast::LitKind::Err`, `token::LitKind::Err`.)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 06f53dd into rust-lang:master Feb 15, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Feb 15, 2024
@rust-timer
Unrolled build for rust-lang#121120
09494a0 
Rollup merge of rust-lang#121120 - nnethercote:LitKind-Err-guar, r=fmease

Add `ErrorGuaranteed` to `ast::LitKind::Err`, `token::LitKind::Err`.

Similar to recent work doing the same for `ExprKind::Err` (rust-lang#120586) and `TyKind::Err` (rust-lang#121109).

r? `@oli-obk`
@rustbot rustbot added this to the 1.78.0 milestone Feb 15, 2024
@nnethercote nnethercote deleted the LitKind-Err-guar branch February 15, 2024 20:40
@matthiaskrgr matthiaskrgr mentioned this pull request Feb 24, 2024
Closed
@nnethercote nnethercote mentioned this pull request Feb 25, 2024
Merged
flip1995 pushed a commit to flip1995/rust that referenced this pull request Feb 26, 2024
@GuillaumeGomez
Rollup merge of rust-lang#121120 - nnethercote:LitKind-Err-guar, r=fm…
f9b8672 
…ease

Add `ErrorGuaranteed` to `ast::LitKind::Err`, `token::LitKind::Err`.

Similar to recent work doing the same for `ExprKind::Err` (rust-lang#120586) and `TyKind::Err` (rust-lang#121109).

r? `@oli-obk`
@nnethercote nnethercote mentioned this pull request Feb 28, 2024
Merged
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Feb 28, 2024
@GuillaumeGomez
Rollup merge of rust-lang#121724 - nnethercote:LitKind-Err-for-floats…
cd01b13 
…, r=fmease

Use `LitKind::Err` for malformed floats

rust-lang#121120 changed `StringReader::cook_lexer_literal` to return `LitKind::Err` for malformed integer literals. This commit does the same for float literals, for consistency.

r? `@fmease`
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Feb 28, 2024
@matthiaskrgr
Rollup merge of rust-lang#121724 - nnethercote:LitKind-Err-for-floats…
686a4b1 
…, r=fmease

Use `LitKind::Err` for malformed floats

rust-lang#121120 changed `StringReader::cook_lexer_literal` to return `LitKind::Err` for malformed integer literals. This commit does the same for float literals, for consistency.

r? ``@fmease``
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Feb 29, 2024
@rust-timer
Unrolled build for rust-lang#121724
0688e07 
Rollup merge of rust-lang#121724 - nnethercote:LitKind-Err-for-floats, r=fmease

Use `LitKind::Err` for malformed floats

rust-lang#121120 changed `StringReader::cook_lexer_literal` to return `LitKind::Err` for malformed integer literals. This commit does the same for float literals, for consistency.

r? ``@fmease``
flip1995 pushed a commit to flip1995/rust that referenced this pull request Mar 7, 2024
@matthiaskrgr
Rollup merge of rust-lang#121724 - nnethercote:LitKind-Err-for-floats…
f055f2a 
…, r=fmease

Use `LitKind::Err` for malformed floats

rust-lang#121120 changed `StringReader::cook_lexer_literal` to return `LitKind::Err` for malformed integer literals. This commit does the same for float literals, for consistency.

r? ``@fmease``
@compiler-errors compiler-errors mentioned this pull request Mar 31, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@fmease fmease fmease approved these changes

Assignees

@fmease fmease

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.78.0

Development

Successfully merging this pull request may close these issues.

6 participants

@nnethercote @rustbot @rust-log-analyzer @fmease @bors @oli-obk