Add `ErrorGuaranteed` to `ast::LitKind::Err`, `token::LitKind::Err`. by nnethercote · Pull Request #121120 · rust-lang/rust

nnethercote · 2024-02-15T00:43:29Z

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

rustbot · 2024-02-15T00:43:38Z

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 · 2024-02-15T00:43:51Z

cc @ShE3py @fmease @compiler-errors

nnethercote · 2024-02-15T00:46:20Z

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 · 2024-02-15T00:46:35Z


 #[derive(Debug)]
 pub enum LitError {
- LexerError,


nnethercote · 2024-02-15T00:47:30Z

Best reviewed one commit at a time.

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

This will be helpful for subsequent commits.

And use the result in `cook_common` to decide whether to return an error token.

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.

To avoid some unwrapping.

fmease

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

r=me when green

fmease · 2024-02-15T06:03:16Z

@bors r+

bors · 2024-02-15T06:03:18Z

📌 Commit ac47f6c has been approved by fmease

It is now in the queue for this repository.

…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

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`

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

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

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

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

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

nnethercote · 2024-02-15T00:43:29Z

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

r? @oli-obk

rustbot · 2024-02-15T00:43:38Z

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 · 2024-02-15T00:43:51Z

cc @ShE3py @fmease @compiler-errors

nnethercote · 2024-02-15T00:46:20Z

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 · 2024-02-15T00:46:35Z


 #[derive(Debug)]
 pub enum LitError {
- LexerError,


nnethercote · 2024-02-15T00:47:30Z

Best reviewed one commit at a time.

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

This will be helpful for subsequent commits.

And use the result in `cook_common` to decide whether to return an error token.

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.

To avoid some unwrapping.

fmease

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

r=me when green

fmease · 2024-02-15T06:03:16Z

@bors r+

bors · 2024-02-15T06:03:18Z

📌 Commit ac47f6c has been approved by fmease

It is now in the queue for this repository.

…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

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`

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

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

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

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

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

nnethercote · 2024-02-15T00:43:29Z

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

r? @oli-obk

rustbot · 2024-02-15T00:43:38Z

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 · 2024-02-15T00:43:51Z

cc @ShE3py @fmease @compiler-errors

nnethercote · 2024-02-15T00:46:20Z

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 · 2024-02-15T00:46:35Z


 #[derive(Debug)]
 pub enum LitError {
- LexerError,


nnethercote · 2024-02-15T00:47:30Z

Best reviewed one commit at a time.

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

This will be helpful for subsequent commits.

And use the result in `cook_common` to decide whether to return an error token.

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.

To avoid some unwrapping.

fmease

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

r=me when green

fmease · 2024-02-15T06:03:16Z

@bors r+

bors · 2024-02-15T06:03:18Z

📌 Commit ac47f6c has been approved by fmease

It is now in the queue for this repository.

…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

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`

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

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

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

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

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

nnethercote · 2024-02-15T00:43:29Z

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

r? @oli-obk

rustbot · 2024-02-15T00:43:38Z

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 · 2024-02-15T00:43:51Z

cc @ShE3py @fmease @compiler-errors

nnethercote · 2024-02-15T00:46:20Z

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 · 2024-02-15T00:46:35Z


 #[derive(Debug)]
 pub enum LitError {
- LexerError,


nnethercote · 2024-02-15T00:47:30Z

Best reviewed one commit at a time.

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

This will be helpful for subsequent commits.

And use the result in `cook_common` to decide whether to return an error token.

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.

To avoid some unwrapping.

fmease

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

r=me when green

fmease · 2024-02-15T06:03:16Z

@bors r+

bors · 2024-02-15T06:03:18Z

📌 Commit ac47f6c has been approved by fmease

It is now in the queue for this repository.

…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

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`

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

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

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

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

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

nnethercote · 2024-02-15T00:43:29Z

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

r? @oli-obk

rustbot · 2024-02-15T00:43:38Z

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 · 2024-02-15T00:43:51Z

cc @ShE3py @fmease @compiler-errors

nnethercote · 2024-02-15T00:46:20Z

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 · 2024-02-15T00:46:35Z


 #[derive(Debug)]
 pub enum LitError {
- LexerError,


nnethercote · 2024-02-15T00:47:30Z

Best reviewed one commit at a time.

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

This will be helpful for subsequent commits.

And use the result in `cook_common` to decide whether to return an error token.

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.

To avoid some unwrapping.

fmease

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

r=me when green

fmease · 2024-02-15T06:03:16Z

@bors r+

bors · 2024-02-15T06:03:18Z

📌 Commit ac47f6c has been approved by fmease

It is now in the queue for this repository.

…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

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`

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

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

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

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

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

nnethercote · 2024-02-15T00:43:29Z

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

r? @oli-obk

rustbot · 2024-02-15T00:43:38Z

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 · 2024-02-15T00:43:51Z

cc @ShE3py @fmease @compiler-errors

nnethercote · 2024-02-15T00:46:20Z

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 · 2024-02-15T00:46:35Z


 #[derive(Debug)]
 pub enum LitError {
- LexerError,


nnethercote · 2024-02-15T00:47:30Z

Best reviewed one commit at a time.

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

This will be helpful for subsequent commits.

And use the result in `cook_common` to decide whether to return an error token.

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.

To avoid some unwrapping.

fmease

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

r=me when green

fmease · 2024-02-15T06:03:16Z

@bors r+

bors · 2024-02-15T06:03:18Z

📌 Commit ac47f6c has been approved by fmease

It is now in the queue for this repository.

…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

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`

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

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

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

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

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

nnethercote · 2024-02-15T00:43:29Z

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

r? @oli-obk

rustbot · 2024-02-15T00:43:38Z

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 · 2024-02-15T00:43:51Z

cc @ShE3py @fmease @compiler-errors

nnethercote · 2024-02-15T00:46:20Z

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 · 2024-02-15T00:46:35Z


 #[derive(Debug)]
 pub enum LitError {
- LexerError,


nnethercote · 2024-02-15T00:47:30Z

Best reviewed one commit at a time.

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

This will be helpful for subsequent commits.

And use the result in `cook_common` to decide whether to return an error token.

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.

To avoid some unwrapping.

fmease

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

r=me when green

fmease · 2024-02-15T06:03:16Z

@bors r+

bors · 2024-02-15T06:03:18Z

📌 Commit ac47f6c has been approved by fmease

It is now in the queue for this repository.

…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

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`

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

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

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

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

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

nnethercote · 2024-02-15T00:43:29Z

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

r? @oli-obk

rustbot · 2024-02-15T00:43:38Z

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 · 2024-02-15T00:43:51Z

cc @ShE3py @fmease @compiler-errors

nnethercote · 2024-02-15T00:46:20Z

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 · 2024-02-15T00:46:35Z


 #[derive(Debug)]
 pub enum LitError {
- LexerError,


nnethercote · 2024-02-15T00:47:30Z

Best reviewed one commit at a time.

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

This will be helpful for subsequent commits.

And use the result in `cook_common` to decide whether to return an error token.

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.

To avoid some unwrapping.

fmease

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

r=me when green

fmease · 2024-02-15T06:03:16Z

@bors r+

bors · 2024-02-15T06:03:18Z

📌 Commit ac47f6c has been approved by fmease

It is now in the queue for this repository.

…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

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`

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

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

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

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

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

rustbot assigned oli-obk Feb 15, 2024

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

fmease reviewed Feb 15, 2024
View reviewed changes

This comment has been minimized.
Sign in to view

nnethercote added 3 commits February 15, 2024 12:58

Make report_lit_error return ErrorGuaranteed.
a513bb2
This will be helpful for subsequent commits.

Make emit_unescape_error return Option<ErrorGuaranteed>.
332c577
And use the result in `cook_common` to decide whether to return an error token.

nnethercote force-pushed the LitKind-Err-guar branch from 6caf605 to 57c7326Compare February 15, 2024 02:37

nnethercote mentioned this pull request Feb 15, 2024
Add ErrorGuaranteed to ast::ExprKind::Err#120586
Merged

fmease reviewed Feb 15, 2024
View reviewed changes

Comment threadcompiler/rustc_session/src/errors.rs Outdated

nnethercote force-pushed the LitKind-Err-guar branch from 57c7326 to 25ed6e4Compare February 15, 2024 03:46

Add suffixes to LitError.
ac47f6c
To avoid some unwrapping.

fmease approved these changes Feb 15, 2024
View reviewed changes

fmease assigned fmease and unassigned oli-obk Feb 15, 2024

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 mentioned this pull request Feb 15, 2024
Rollup of 8 pull requests #121142
Merged

bors merged commit 06f53dd into rust-lang:masterFeb 15, 2024

rustbot added this to the 1.78.0 milestone Feb 15, 2024

nnethercote deleted the LitKind-Err-guar branch February 15, 2024 20:40

matthiaskrgr mentioned this pull request Feb 24, 2024
ICE: ast lowering: None#121537
Closed

nnethercote mentioned this pull request Feb 25, 2024
fix attribute validation on associated items in traits #121545
Merged

nnethercote mentioned this pull request Feb 28, 2024
Use LitKind::Err for malformed floats #121724
Merged

compiler-errors mentioned this pull request Mar 31, 2024
regression: unwrap on None in ast lowering #123287
Closed

rustbot assigned oli-obk Feb 15, 2024

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

fmease reviewed Feb 15, 2024
View reviewed changes

This comment has been minimized.
Sign in to view

nnethercote added 3 commits February 15, 2024 12:58

Make report_lit_error return ErrorGuaranteed.
a513bb2
This will be helpful for subsequent commits.

Make emit_unescape_error return Option<ErrorGuaranteed>.
332c577
And use the result in `cook_common` to decide whether to return an error token.

nnethercote force-pushed the LitKind-Err-guar branch from 6caf605 to 57c7326Compare February 15, 2024 02:37

nnethercote mentioned this pull request Feb 15, 2024
Add ErrorGuaranteed to ast::ExprKind::Err#120586
Merged

fmease reviewed Feb 15, 2024
View reviewed changes

Comment threadcompiler/rustc_session/src/errors.rs Outdated

nnethercote force-pushed the LitKind-Err-guar branch from 57c7326 to 25ed6e4Compare February 15, 2024 03:46

Add suffixes to LitError.
ac47f6c
To avoid some unwrapping.

fmease approved these changes Feb 15, 2024
View reviewed changes

fmease assigned fmease and unassigned oli-obk Feb 15, 2024

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 mentioned this pull request Feb 15, 2024
Rollup of 8 pull requests #121142
Merged

bors merged commit 06f53dd into rust-lang:masterFeb 15, 2024

rustbot added this to the 1.78.0 milestone Feb 15, 2024

nnethercote deleted the LitKind-Err-guar branch February 15, 2024 20:40

matthiaskrgr mentioned this pull request Feb 24, 2024
ICE: ast lowering: None#121537
Closed

nnethercote mentioned this pull request Feb 25, 2024
fix attribute validation on associated items in traits #121545
Merged

nnethercote mentioned this pull request Feb 28, 2024
Use LitKind::Err for malformed floats #121724
Merged

compiler-errors mentioned this pull request Mar 31, 2024
regression: unwrap on None in ast lowering #123287
Closed

rustbot assigned oli-obk Feb 15, 2024

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

fmease reviewed Feb 15, 2024
View reviewed changes

This comment has been minimized.
Sign in to view

nnethercote added 3 commits February 15, 2024 12:58

Make report_lit_error return ErrorGuaranteed.
a513bb2
This will be helpful for subsequent commits.

Make emit_unescape_error return Option<ErrorGuaranteed>.
332c577
And use the result in `cook_common` to decide whether to return an error token.

nnethercote force-pushed the LitKind-Err-guar branch from 6caf605 to 57c7326Compare February 15, 2024 02:37

nnethercote mentioned this pull request Feb 15, 2024
Add ErrorGuaranteed to ast::ExprKind::Err#120586
Merged

fmease reviewed Feb 15, 2024
View reviewed changes

Comment threadcompiler/rustc_session/src/errors.rs Outdated

nnethercote force-pushed the LitKind-Err-guar branch from 57c7326 to 25ed6e4Compare February 15, 2024 03:46

Add suffixes to LitError.
ac47f6c
To avoid some unwrapping.

fmease approved these changes Feb 15, 2024
View reviewed changes

fmease assigned fmease and unassigned oli-obk Feb 15, 2024

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 mentioned this pull request Feb 15, 2024
Rollup of 8 pull requests #121142
Merged

bors merged commit 06f53dd into rust-lang:masterFeb 15, 2024

rustbot added this to the 1.78.0 milestone Feb 15, 2024

nnethercote deleted the LitKind-Err-guar branch February 15, 2024 20:40

matthiaskrgr mentioned this pull request Feb 24, 2024
ICE: ast lowering: None#121537
Closed

nnethercote mentioned this pull request Feb 25, 2024
fix attribute validation on associated items in traits #121545
Merged

nnethercote mentioned this pull request Feb 28, 2024
Use LitKind::Err for malformed floats #121724
Merged

compiler-errors mentioned this pull request Mar 31, 2024
regression: unwrap on None in ast lowering #123287
Closed

rustbot assigned oli-obk Feb 15, 2024

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

fmease reviewed Feb 15, 2024
View reviewed changes

This comment has been minimized.
Sign in to view

nnethercote added 3 commits February 15, 2024 12:58

Make report_lit_error return ErrorGuaranteed.
a513bb2
This will be helpful for subsequent commits.

Make emit_unescape_error return Option<ErrorGuaranteed>.
332c577
And use the result in `cook_common` to decide whether to return an error token.

nnethercote force-pushed the LitKind-Err-guar branch from 6caf605 to 57c7326Compare February 15, 2024 02:37

nnethercote mentioned this pull request Feb 15, 2024
Add ErrorGuaranteed to ast::ExprKind::Err#120586
Merged

fmease reviewed Feb 15, 2024
View reviewed changes

Comment threadcompiler/rustc_session/src/errors.rs Outdated

nnethercote force-pushed the LitKind-Err-guar branch from 57c7326 to 25ed6e4Compare February 15, 2024 03:46

Add suffixes to LitError.
ac47f6c
To avoid some unwrapping.

fmease approved these changes Feb 15, 2024
View reviewed changes

fmease assigned fmease and unassigned oli-obk Feb 15, 2024

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 mentioned this pull request Feb 15, 2024
Rollup of 8 pull requests #121142
Merged

bors merged commit 06f53dd into rust-lang:masterFeb 15, 2024

rustbot added this to the 1.78.0 milestone Feb 15, 2024

nnethercote deleted the LitKind-Err-guar branch February 15, 2024 20:40

matthiaskrgr mentioned this pull request Feb 24, 2024
ICE: ast lowering: None#121537
Closed

nnethercote mentioned this pull request Feb 25, 2024
fix attribute validation on associated items in traits #121545
Merged

nnethercote mentioned this pull request Feb 28, 2024
Use LitKind::Err for malformed floats #121724
Merged

compiler-errors mentioned this pull request Mar 31, 2024
regression: unwrap on None in ast lowering #123287
Closed

rustbot assigned oli-obk Feb 15, 2024

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

fmease reviewed Feb 15, 2024
View reviewed changes

This comment has been minimized.
Sign in to view

nnethercote added 3 commits February 15, 2024 12:58

Make report_lit_error return ErrorGuaranteed.
a513bb2
This will be helpful for subsequent commits.

Make emit_unescape_error return Option<ErrorGuaranteed>.
332c577
And use the result in `cook_common` to decide whether to return an error token.

nnethercote force-pushed the LitKind-Err-guar branch from 6caf605 to 57c7326Compare February 15, 2024 02:37

nnethercote mentioned this pull request Feb 15, 2024
Add ErrorGuaranteed to ast::ExprKind::Err#120586
Merged

fmease reviewed Feb 15, 2024
View reviewed changes

Comment threadcompiler/rustc_session/src/errors.rs Outdated

nnethercote force-pushed the LitKind-Err-guar branch from 57c7326 to 25ed6e4Compare February 15, 2024 03:46

Add suffixes to LitError.
ac47f6c
To avoid some unwrapping.

fmease approved these changes Feb 15, 2024
View reviewed changes

fmease assigned fmease and unassigned oli-obk Feb 15, 2024

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 mentioned this pull request Feb 15, 2024
Rollup of 8 pull requests #121142
Merged

bors merged commit 06f53dd into rust-lang:masterFeb 15, 2024

rustbot added this to the 1.78.0 milestone Feb 15, 2024

nnethercote deleted the LitKind-Err-guar branch February 15, 2024 20:40

matthiaskrgr mentioned this pull request Feb 24, 2024
ICE: ast lowering: None#121537
Closed

nnethercote mentioned this pull request Feb 25, 2024
fix attribute validation on associated items in traits #121545
Merged

nnethercote mentioned this pull request Feb 28, 2024
Use LitKind::Err for malformed floats #121724
Merged

compiler-errors mentioned this pull request Mar 31, 2024
regression: unwrap on None in ast lowering #123287
Closed

rustbot assigned oli-obk Feb 15, 2024

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

fmease reviewed Feb 15, 2024
View reviewed changes

This comment has been minimized.
Sign in to view

nnethercote added 3 commits February 15, 2024 12:58

Make report_lit_error return ErrorGuaranteed.
a513bb2
This will be helpful for subsequent commits.

Make emit_unescape_error return Option<ErrorGuaranteed>.
332c577
And use the result in `cook_common` to decide whether to return an error token.

nnethercote force-pushed the LitKind-Err-guar branch from 6caf605 to 57c7326Compare February 15, 2024 02:37

nnethercote mentioned this pull request Feb 15, 2024
Add ErrorGuaranteed to ast::ExprKind::Err#120586
Merged

fmease reviewed Feb 15, 2024
View reviewed changes

Comment threadcompiler/rustc_session/src/errors.rs Outdated

nnethercote force-pushed the LitKind-Err-guar branch from 57c7326 to 25ed6e4Compare February 15, 2024 03:46

Add suffixes to LitError.
ac47f6c
To avoid some unwrapping.

fmease approved these changes Feb 15, 2024
View reviewed changes

fmease assigned fmease and unassigned oli-obk Feb 15, 2024

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 mentioned this pull request Feb 15, 2024
Rollup of 8 pull requests #121142
Merged

bors merged commit 06f53dd into rust-lang:masterFeb 15, 2024

rustbot added this to the 1.78.0 milestone Feb 15, 2024

nnethercote deleted the LitKind-Err-guar branch February 15, 2024 20:40

matthiaskrgr mentioned this pull request Feb 24, 2024
ICE: ast lowering: None#121537
Closed

nnethercote mentioned this pull request Feb 25, 2024
fix attribute validation on associated items in traits #121545
Merged

nnethercote mentioned this pull request Feb 28, 2024
Use LitKind::Err for malformed floats #121724
Merged

compiler-errors mentioned this pull request Mar 31, 2024
regression: unwrap on None in ast lowering #123287
Closed

rustbot assigned oli-obk Feb 15, 2024

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

fmease reviewed Feb 15, 2024
View reviewed changes

This comment has been minimized.
Sign in to view

nnethercote added 3 commits February 15, 2024 12:58

Make report_lit_error return ErrorGuaranteed.
a513bb2
This will be helpful for subsequent commits.

Make emit_unescape_error return Option<ErrorGuaranteed>.
332c577
And use the result in `cook_common` to decide whether to return an error token.

nnethercote force-pushed the LitKind-Err-guar branch from 6caf605 to 57c7326Compare February 15, 2024 02:37

nnethercote mentioned this pull request Feb 15, 2024
Add ErrorGuaranteed to ast::ExprKind::Err#120586
Merged

fmease reviewed Feb 15, 2024
View reviewed changes

Comment threadcompiler/rustc_session/src/errors.rs Outdated

nnethercote force-pushed the LitKind-Err-guar branch from 57c7326 to 25ed6e4Compare February 15, 2024 03:46

Add suffixes to LitError.
ac47f6c
To avoid some unwrapping.

fmease approved these changes Feb 15, 2024
View reviewed changes

fmease assigned fmease and unassigned oli-obk Feb 15, 2024

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 mentioned this pull request Feb 15, 2024
Rollup of 8 pull requests #121142
Merged

bors merged commit 06f53dd into rust-lang:masterFeb 15, 2024

rustbot added this to the 1.78.0 milestone Feb 15, 2024

nnethercote deleted the LitKind-Err-guar branch February 15, 2024 20:40

matthiaskrgr mentioned this pull request Feb 24, 2024
ICE: ast lowering: None#121537
Closed

nnethercote mentioned this pull request Feb 25, 2024
fix attribute validation on associated items in traits #121545
Merged

nnethercote mentioned this pull request Feb 28, 2024
Use LitKind::Err for malformed floats #121724
Merged

compiler-errors mentioned this pull request Mar 31, 2024
regression: unwrap on None in ast lowering #123287
Closed

rustbot assigned oli-obk Feb 15, 2024

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

fmease reviewed Feb 15, 2024
View reviewed changes

This comment has been minimized.
Sign in to view

nnethercote added 3 commits February 15, 2024 12:58

Make report_lit_error return ErrorGuaranteed.
a513bb2
This will be helpful for subsequent commits.

Make emit_unescape_error return Option<ErrorGuaranteed>.
332c577
And use the result in `cook_common` to decide whether to return an error token.

nnethercote force-pushed the LitKind-Err-guar branch from 6caf605 to 57c7326Compare February 15, 2024 02:37

nnethercote mentioned this pull request Feb 15, 2024
Add ErrorGuaranteed to ast::ExprKind::Err#120586
Merged

fmease reviewed Feb 15, 2024
View reviewed changes

Comment threadcompiler/rustc_session/src/errors.rs Outdated

nnethercote force-pushed the LitKind-Err-guar branch from 57c7326 to 25ed6e4Compare February 15, 2024 03:46

Add suffixes to LitError.
ac47f6c
To avoid some unwrapping.

fmease approved these changes Feb 15, 2024
View reviewed changes

fmease assigned fmease and unassigned oli-obk Feb 15, 2024

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 mentioned this pull request Feb 15, 2024
Rollup of 8 pull requests #121142
Merged

bors merged commit 06f53dd into rust-lang:masterFeb 15, 2024

rustbot added this to the 1.78.0 milestone Feb 15, 2024

nnethercote deleted the LitKind-Err-guar branch February 15, 2024 20:40

matthiaskrgr mentioned this pull request Feb 24, 2024
ICE: ast lowering: None#121537
Closed

nnethercote mentioned this pull request Feb 25, 2024
fix attribute validation on associated items in traits #121545
Merged

nnethercote mentioned this pull request Feb 28, 2024
Use LitKind::Err for malformed floats #121724
Merged

compiler-errors mentioned this pull request Mar 31, 2024
regression: unwrap on None in ast lowering #123287
Closed

Uh oh!

Uh oh!

Conversation

nnethercote commented Feb 15, 2024

Uh oh!

rustbot commented Feb 15, 2024

Uh oh!

nnethercote commented Feb 15, 2024

Uh oh!

nnethercote commented Feb 15, 2024• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

fmeaseFeb 15, 2024

Choose a reason for hiding this comment

Uh oh!

nnethercote commented Feb 15, 2024

Uh oh!

This comment has been minimized.

Uh oh!

fmease left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

fmease commented Feb 15, 2024

Uh oh!

bors commented Feb 15, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Uh oh!

Uh oh!

Conversation

nnethercote commented Feb 15, 2024

Uh oh!

rustbot commented Feb 15, 2024

Uh oh!

nnethercote commented Feb 15, 2024

Uh oh!

nnethercote commented Feb 15, 2024• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

fmeaseFeb 15, 2024

Choose a reason for hiding this comment

Uh oh!

nnethercote commented Feb 15, 2024

Uh oh!

This comment has been minimized.

Uh oh!

fmease left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

fmease commented Feb 15, 2024

Uh oh!

bors commented Feb 15, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Uh oh!

Uh oh!

Conversation

nnethercote commented Feb 15, 2024

Uh oh!

rustbot commented Feb 15, 2024

Uh oh!

nnethercote commented Feb 15, 2024

Uh oh!

nnethercote commented Feb 15, 2024• edited Loading Uh oh! There was an error while loading. Please reload this page.

nnethercote commented Feb 15, 2024•
edited
Loading

fmease left a comment •
edited
Loading

nnethercote commented Feb 15, 2024•
edited
Loading

fmease left a comment •
edited
Loading

nnethercote commented Feb 15, 2024•
edited
Loading

fmease left a comment •
edited
Loading

nnethercote commented Feb 15, 2024•
edited
Loading

fmease left a comment •
edited
Loading