[red-knot] Emit error if int/float/complex/bytes/boolean literals appear in type expressions outside `typing.Literal[]` by MatthewMckee4 · Pull Request #16765 · astral-sh/ruff

MatthewMckee4 · 2025-03-15T17:46:30Z

Expand InvalidTypeExpression enum to include number, bytes and boolean in type expression

Summary

Fixes #16532

Test Plan

Still need to look into where tests should be put for this improvement

Expand `InvalidTypeExpression` enum to include number, bytes and boolean in type expression

MatthewMckee4 · 2025-03-15T18:14:28Z

I may be wrong, but it seems that byte literals are already handled here:

ruff/crates/red_knot_python_semantic/src/types/infer.rs

Lines 5445 to 5452 in 44aec36

    
           ast::Expr::BytesLiteral(bytes) => { 
        
               self.context.report_lint( 
        
                   &BYTE_STRING_TYPE_ANNOTATION, 
        
                   bytes, 
        
                   format_args!("Type expressions cannot use bytes literal"), 
        
               ); 
        
               TypeAndQualifiers::unknown() 
        
           }

.

And tested here:

ruff/crates/red_knot_python_semantic/resources/mdtest/annotations/string.md

Lines 88 to 89 in 44aec36

    
           # error: [byte-string-type-annotation] "Type expressions cannot use bytes literal" 
        
           i: "b'int'",

…iterals

MatthewMckee4 · 2025-03-16T12:38:28Z

There's now a test failing at

ruff/crates/red_knot_python_semantic/resources/mdtest/annotations/literal.md

Line 141 in ccec364

a1: Literal[26]

I think this is expected though, as the generics are not implemented for SpecialForm i think?

…and properly catch float 'literals' in type expresssions

AlexWaygood

Thanks! I think you're mostly on the right track, but there's a few issues here to sort out

crates/red_knot_python_semantic/src/types.rs

crates/red_knot_python_semantic/resources/mdtest/annotations/literal.md

crates/red_knot_python_semantic/resources/mdtest/annotations/invalid.md

crates/red_knot_python_semantic/src/types/infer.rs

…nce check for float

AlexWaygood

Looks close!

crates/red_knot_python_semantic/src/types/infer.rs

crates/red_knot_python_semantic/resources/mdtest/annotations/invalid.md

AlexWaygood

looks great, thank you!

crates/red_knot_python_semantic/src/types/infer.rs

Co-authored-by: Alex Waygood <[email protected]>

AlexWaygood · 2025-03-16T22:25:14Z

I'll wait until our CI's back up and running before merging this (everything's disabled at the moment due to #16768, we should get it up again tomorrow)

MatthewMckee4 · 2025-03-16T22:35:55Z

Sounds good, thank you for the feedback!

github-actions · 2025-03-17T07:57:21Z

`mypy_primer` results

No ecosystem changes detected ✅

github-actions · 2025-03-17T08:06:15Z

`ruff-ecosystem` results

Linter (stable)

✅ ecosystem check detected no linter changes.

Linter (preview)

✅ ecosystem check detected no linter changes.

Formatter (stable)

✅ ecosystem check detected no format changes.

Formatter (preview)

✅ ecosystem check detected no format changes.

crates/red_knot_python_semantic/src/types/infer.rs

* main: (25 commits) [syntax-errors] Parenthesized context managers before Python 3.9 (#16523) [ci]: Disable wheel testing on `ppc64le` (#16793) [red-knot] Stabilize `negation_reverses_subtype_order` property test (#16801) [red-knot] Emit error if int/float/complex/bytes/boolean literals appear in type expressions outside `typing.Literal[]` (#16765) [ci] Use `git diff` instead of `changed-files` GH action (#16796) [syntax-errors] Improve error message and range for pre-PEP-614 decorator syntax errors (#16581) [`flake8-bandit`] Allow raw strings in `suspicious-mark-safe-usage` (`S308`) #16702 (#16770) [`refurb`] Avoid panicking `unwrap` in `verbose-decimal-constructor` (`FURB157`) (#16777) [red-knot] Add `--color` CLI option (#16758) [internal]: Upgrade salsa (#16794) Pin dependencies (#16791) [internal]: Update indirect dependencies (#16792) [ci]: Fixup codspeed upgrade (#16790) Update Rust crate compact_str to 0.9.0 (#16785) Update Rust crate clap to v4.5.32 (#16778) Update Rust crate codspeed-criterion-compat to v2.9.1 (#16784) Update Rust crate quote to v1.0.40 (#16782) Update Rust crate ordermap to v0.5.6 (#16781) Update cloudflare/wrangler-action action to v3.14.1 (#16783) Update Rust crate env_logger to v0.11.7 (#16779) ...

Add invalid type expressions.

4ade214

Expand `InvalidTypeExpression` enum to include number, bytes and boolean in type expression

AlexWaygood added the ty Multi-file analysis & type inference label Mar 15, 2025

MatthewMckee4 added 4 commits March 15, 2025 18:34

Add tests for invalid literal type expressions

2787168

Run pre-commit

acc95cb

Update more tests for invalid type expressions with number, boolean l…

ccec364

…iterals

Add test for invalid type form with bytes literal

a036200

Handle unimplemented generics in tests

6644d9b

MatthewMckee4 marked this pull request as ready for review March 16, 2025 12:41

MatthewMckee4 requested review from AlexWaygood, MichaReiser, carljm and sharkdp as code owners March 16, 2025 12:41

MatthewMckee4 added 2 commits March 16, 2025 13:37

Move invalid type expression tests to invalid.md

2da6baa

Add tests for invalid type expressions caught in in_type_expression, …

4f120d9

…and properly catch float 'literals' in type expresssions

AlexWaygood reviewed Mar 16, 2025

View reviewed changes

crates/red_knot_python_semantic/src/types/infer.rs Outdated Show resolved Hide resolved

MatthewMckee4 added 2 commits March 16, 2025 21:24

Remove unnecessary invalid type expression catch in in_type_expression

f6f634a

Provide more detailed error message for number literals, remove insta…

f857957

…nce check for float

AlexWaygood reviewed Mar 16, 2025

View reviewed changes

crates/red_knot_python_semantic/src/types/infer.rs Outdated Show resolved Hide resolved

crates/red_knot_python_semantic/resources/mdtest/annotations/invalid.md Outdated Show resolved Hide resolved

MatthewMckee4 added 2 commits March 16, 2025 22:15

Reduce duplication in invalid literal type inference and tests

e599288

Fix invalid type form error messages in tests

8d759ef

AlexWaygood approved these changes Mar 16, 2025

View reviewed changes

crates/red_knot_python_semantic/src/types/infer.rs Outdated Show resolved Hide resolved

crates/red_knot_python_semantic/src/types/infer.rs Outdated Show resolved Hide resolved

MatthewMckee4 and others added 2 commits March 16, 2025 22:22

Update crates/red_knot_python_semantic/src/types/infer.rs

289a212

Co-authored-by: Alex Waygood <[email protected]>

Update crates/red_knot_python_semantic/src/types/infer.rs

7febfd4

Co-authored-by: Alex Waygood <[email protected]>

MichaReiser closed this Mar 17, 2025

MichaReiser reopened this Mar 17, 2025

AlexWaygood changed the title ~~Add invalid type expressions.~~ [red-knot] Emit error if int/float/complex/bytes/boolean literals appear in type expressions outside typing.Literal[] Mar 17, 2025

AlexWaygood enabled auto-merge (squash) March 17, 2025 11:23

AlexWaygood force-pushed the literal-types-invalid-type-expression branch from ecfe1ac to 74d6751 Compare March 17, 2025 11:24

tweak error message

9c36f0f

AlexWaygood force-pushed the literal-types-invalid-type-expression branch from 74d6751 to 9c36f0f Compare March 17, 2025 11:27

dhruvmanila reviewed Mar 17, 2025

View reviewed changes

crates/red_knot_python_semantic/src/types/infer.rs Show resolved Hide resolved

AlexWaygood disabled auto-merge March 17, 2025 11:31

address Dhruv's feedback

b0b6c63

AlexWaygood enabled auto-merge (squash) March 17, 2025 11:52

AlexWaygood merged commit 2470777 into astral-sh:main Mar 17, 2025
21 checks passed

AlexWaygood mentioned this pull request Mar 17, 2025

[red-knot] Emit errors for more AST nodes that are invalid (or only valid in specific contexts) in type expressions #16816

Closed

MatthewMckee4 deleted the literal-types-invalid-type-expression branch March 17, 2025 20:55

Comments

Conversation

MatthewMckee4 commented Mar 15, 2025

Summary

Test Plan

Uh oh!

MatthewMckee4 commented Mar 15, 2025

Uh oh!

MatthewMckee4 commented Mar 16, 2025

Uh oh!

AlexWaygood left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

AlexWaygood left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

AlexWaygood left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

AlexWaygood commented Mar 16, 2025

Uh oh!

MatthewMckee4 commented Mar 16, 2025

Uh oh!

github-actions bot commented Mar 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

mypy_primer results

Uh oh!

github-actions bot commented Mar 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

ruff-ecosystem results

Linter (stable)

Linter (preview)

Formatter (stable)

Formatter (preview)

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

github-actions bot commented Mar 17, 2025 •

edited

Loading

`mypy_primer` results

github-actions bot commented Mar 17, 2025 •

edited

Loading

`ruff-ecosystem` results