diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 20477c4c960e9..84a21ca9ced04 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -373,7 +373,7 @@ jobs: runs-on: ${{ github.repository == 'astral-sh/ruff' && 'depot-ubuntu-22.04-16' || 'ubuntu-latest' }} needs: determine_changes if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main') }} - timeout-minutes: 20 + timeout-minutes: ${{ github.repository == 'astral-sh/ruff' && 20 || 40 }} env: # Line-tables-only debug info: faster builds, backtraces still work. CARGO_PROFILE_DEV_DEBUG: line-tables-only @@ -483,7 +483,7 @@ jobs: runs-on: ${{ matrix.platform }} needs: determine_changes if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main') }} - timeout-minutes: 20 + timeout-minutes: ${{ github.repository == 'astral-sh/ruff' && 20 || 40 }} env: # Line-tables-only debug info: faster builds, backtraces still work. CARGO_PROFILE_DEV_DEBUG: line-tables-only @@ -690,7 +690,7 @@ jobs: needs.determine_changes.outputs.linter == 'true' || needs.determine_changes.outputs.formatter == 'true' ) - timeout-minutes: 20 + timeout-minutes: ${{ github.repository == 'astral-sh/ruff' && 20 || 40 }} env: # Line-tables-only debug info: faster builds, backtraces still work. CARGO_PROFILE_DEV_DEBUG: line-tables-only @@ -808,7 +808,7 @@ jobs: - determine_changes # Only runs on pull requests, since that is the only we way we can find the base version for comparison. if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && github.event_name == 'pull_request' && (needs.determine_changes.outputs.ty == 'true' || needs.determine_changes.outputs.py-fuzzer == 'true') }} - timeout-minutes: ${{ github.repository == 'astral-sh/ruff' && 10 || 20 }} + timeout-minutes: ${{ github.repository == 'astral-sh/ruff' && 10 || 30 }} steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 04b4201c2eec4..302f414160461 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -74,7 +74,7 @@ jobs: plan: permissions: "contents": "read" - runs-on: "depot-ubuntu-24.04-4" + runs-on: ${{ github.repository == 'astral-sh/ruff' && 'depot-ubuntu-24.04-4' || 'ubuntu-latest' }} outputs: val: ${{ steps.plan.outputs.manifest }} tag: ${{ (inputs.tag != 'dry-run' && inputs.tag) || '' }} diff --git a/.github/workflows/ty-ecosystem-analyzer.yaml b/.github/workflows/ty-ecosystem-analyzer.yaml index f433c38ea9ca5..fac0474bffd51 100644 --- a/.github/workflows/ty-ecosystem-analyzer.yaml +++ b/.github/workflows/ty-ecosystem-analyzer.yaml @@ -52,7 +52,7 @@ jobs: matrix: revision: [base, pr] runs-on: ${{ github.repository == 'astral-sh/ruff' && 'depot-ubuntu-22.04-32' || 'ubuntu-latest' }} - timeout-minutes: 5 + timeout-minutes: ${{ github.repository == 'astral-sh/ruff' && 5 || 10 }} steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: diff --git a/Cargo.lock b/Cargo.lock index 7d8d3abe43ee7..907814b017789 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,12 +2,6 @@ # It is not intended for manual editing. version = 4 -[[package]] -name = "adler2" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" - [[package]] name = "aho-corasick" version = "1.1.5" @@ -34,9 +28,9 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "android_system_properties" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +checksum = "ae221649c9976a6f6c56ae1facf410f3ddb33cc661c4b7b61020a912d4237fbc" dependencies = [ "libc", ] @@ -57,21 +51,6 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "anstream" -version = "0.6.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a" -dependencies = [ - "anstyle", - "anstyle-parse 0.2.7", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "is_terminal_polyfill", - "utf8parse", -] - [[package]] name = "anstream" version = "1.0.0" @@ -79,7 +58,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "824a212faf96e9acacdbd09febd34438f8f711fb84e09a8916013cd7815ca28d" dependencies = [ "anstyle", - "anstyle-parse 1.0.0", + "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", @@ -95,22 +74,13 @@ checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000" [[package]] name = "anstyle-lossy" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04d3a5dc826f84d0ea11882bb8054ff7f3d482602e11bb181101303a279ea01f" +checksum = "d9ca7d0f520afcd6d817970d0b2d5fd7c630c75e7783cae046b8b8a783c5befa" dependencies = [ "anstyle", ] -[[package]] -name = "anstyle-parse" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2" -dependencies = [ - "utf8parse", -] - [[package]] name = "anstyle-parse" version = "1.0.0" @@ -122,35 +92,35 @@ dependencies = [ [[package]] name = "anstyle-query" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e231f6134f61b71076a3eab506c379d4f36122f2af15a9ff04415ea4c3339e2" +checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" dependencies = [ - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] name = "anstyle-svg" -version = "0.1.11" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b9ec8c976eada1b0f9747a3d7cc4eae3bef10613e443746e7487f26c872fde" +checksum = "ab68e0b71ea68eb6b399ffe1957f26330aeed91f5e578d442a1c2f3df69f6ec1" dependencies = [ "anstyle", "anstyle-lossy", - "anstyle-parse 0.2.7", + "anstyle-parse", "html-escape", "unicode-width", ] [[package]] name = "anstyle-wincon" -version = "3.0.10" +version = "3.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e0633414522a32ffaac8ac6cc8f748e090c5717661fddeea04219e2344f5f2a" +checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" dependencies = [ "anstyle", "once_cell_polyfill", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -218,20 +188,20 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.89" +version = "0.1.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" +checksum = "82f6aeea286b8eb4dd3431a1be1b59d290ace00f5bfd8e2a159bc2a05e2c1667" dependencies = [ "proc-macro2", "quote", - "syn 2.0.119", + "syn 3.0.4", ] [[package]] name = "attribute-derive" -version = "0.10.3" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0053e96dd3bec5b4879c23a138d6ef26f2cb936c9cdc96274ac2b9ed44b5bb54" +checksum = "05832cdddc8f2650cc2cc187cc2e952b8c133a48eb055f35211f61ee81502d77" dependencies = [ "attribute-derive-macro", "derive-where", @@ -243,9 +213,9 @@ dependencies = [ [[package]] name = "attribute-derive-macro" -version = "0.10.3" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "463b53ad0fd5b460af4b1915fe045ff4d946d025fb6c4dc3337752eaa980f71b" +checksum = "0a7cdbbd4bd005c5d3e2e9c885e6fa575db4f4a3572335b974d8db853b6beb61" dependencies = [ "collection_literals", "interpolator", @@ -259,9 +229,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" +checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53" [[package]] name = "bit-set" @@ -305,15 +275,6 @@ dependencies = [ "wyz", ] -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - [[package]] name = "block2" version = "0.6.2" @@ -331,9 +292,9 @@ checksum = "36f64beae40a84da1b4b26ff2761a5b895c12adc41dc25aaee1c4f2bbfe97a6e" [[package]] name = "bstr" -version = "1.13.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f7dc094d718f2e1c1559ad110e27eeaae14a5465d3d56dd6dbd793079fbd530" +checksum = "6bb31b46c14244e20ee9984b11bf5c992b91fb6939fea616e3512c8baecdbe5f" dependencies = [ "memchr", "regex-automata", @@ -342,15 +303,15 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.19.0" +version = "3.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" +checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649" [[package]] name = "bytecheck" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0caa33a2c0edca0419d15ac723dff03f1956f7978329b1e3b5fdaaaed9d3ca8b" +checksum = "26333eeac754f0ad8a6bcd0eb0ac012156302e4e16b852b72ee399aea4f12c29" dependencies = [ "bytecheck_derive", "ptr_meta", @@ -360,20 +321,20 @@ dependencies = [ [[package]] name = "bytecheck_derive" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89385e82b5d1821d2219e0b095efa2cc1f246cbf99080f3be46a1a85c0d392d9" +checksum = "46d07918caa9eeaaf06b7873925c53a61daac173539b4f7715090745e44e4e69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.119", + "syn 3.0.4", ] [[package]] name = "bytes" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae3f5d315924270530207e2a68396c3cc547f6dca3fbdca317cfb1a51edb593" +checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04" [[package]] name = "cachedir" @@ -410,9 +371,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.65" +version = "1.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e228eec9be7c17ccb640b59b36a5cd805ea2a564a4c5e162c2f659fea30d3b96" +checksum = "0ad534f4357a5264cce5019c989cf66a4f0dc4e0d1b1d15f8aacec0ff7360273" dependencies = [ "find-msvc-tools", "jobserver", @@ -428,19 +389,19 @@ checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" [[package]] name = "cfg_aliases" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" +checksum = "f079e83a288787bcd14a6aea84cee5c87a67c5a3e660c30f557a3d24761b3527" [[package]] name = "chacha20" -version = "0.10.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601" +checksum = "65c35e4b699c7e15ccbe7ee35c005e4fc0a278d22238a2857e6ce2dadeda1b06" dependencies = [ "cfg-if", - "cpufeatures 0.3.0", - "rand_core 0.10.0", + "cpufeatures", + "rand_core 0.10.1", ] [[package]] @@ -458,13 +419,13 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.44" +version = "0.4.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c673075a2e0e5f4a1dde27ce9dee1ea4558c7ffe648f576438a20ca1d2acc4b0" +checksum = "1aa79e62e7697b8e29b513a68abacf485adcd1fe8284a4316c5ae868e6633327" dependencies = [ "iana-time-zone", "num-traits", - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -496,9 +457,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.6.5" +version = "4.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301b56658598e48f3648647ac6fc887be7e7108eddfa4e9b63fcf3ec58c0cadf" +checksum = "473c7e07f409a8d772161724aa8db6a765a2532a70f9667eeb7b49d3d02fbdca" dependencies = [ "clap_builder", "clap_derive", @@ -506,11 +467,11 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.6.5" +version = "4.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94a65403d1a1bd28f7dc68eb8506e8874808ee5eecb59298de588e2e1407a078" +checksum = "7b48fea5a88e9ae728a2dcbedbfc0e730f7d60da42e1cb049a83c9fb8b789889" dependencies = [ - "anstream 1.0.0", + "anstream", "anstyle", "clap_lex", "strsim", @@ -519,9 +480,9 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.58" +version = "4.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75bf0b32ad2e152de789bb635ea4d3078f6b838ad7974143e99b99f45a04af4a" +checksum = "3be2ad0423bdbbb0e25bc89add796f3559706d4a95e1bc98e4d9662a957b6a19" dependencies = [ "clap", ] @@ -539,9 +500,9 @@ dependencies = [ [[package]] name = "clap_complete_nushell" -version = "4.5.8" +version = "4.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a0c951694691e65bf9d421d597d68416c22de9632e884c28412cb8cd8b73dce" +checksum = "ffb66bc82eb9c92b1727310ae2c5868df22ae7cf46185bc5c544a4fa71955e49" dependencies = [ "clap", "clap_complete", @@ -556,14 +517,14 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 3.0.3", + "syn 3.0.4", ] [[package]] name = "clap_lex" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a822ea5bc7590f9d40f1ba12c0dc3c2760f3482c6984db1573ad11031420831" +checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9" [[package]] name = "clearscreen" @@ -573,9 +534,9 @@ checksum = "d669bb552908e336ad5681789752033b45566b7e591aeaac7a614e58e5d6d8f2" dependencies = [ "nix", "terminfo", - "thiserror 2.0.19", + "thiserror 2.0.20", "which", - "windows-sys 0.61.0", + "windows-sys 0.61.2", ] [[package]] @@ -587,7 +548,7 @@ dependencies = [ "anyhow", "cc", "colored", - "getrandom 0.4.2", + "getrandom 0.4.3", "glob", "libc", "nix", @@ -678,15 +639,15 @@ dependencies = [ [[package]] name = "collection_literals" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b3f65b8fb8e88ba339f7d23a390fe1b0896217da05e2a66c584c9b29a91df8" +checksum = "2550f75b8cfac212855f6b1885455df8eaee8fe8e246b647d69146142e016084" [[package]] name = "colorchoice" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" +checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570" [[package]] name = "colored" @@ -694,7 +655,7 @@ version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "faf9468729b8cbcea668e36183cb69d317348c2e08e994829fb56ebfdfbaac34" dependencies = [ - "windows-sys 0.61.0", + "windows-sys 0.61.2", ] [[package]] @@ -726,7 +687,7 @@ dependencies = [ "encode_unicode", "libc", "unicode-width", - "windows-sys 0.61.0", + "windows-sys 0.61.2", ] [[package]] @@ -763,27 +724,18 @@ checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636" [[package]] name = "cpufeatures" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" -dependencies = [ - "libc", -] - -[[package]] -name = "cpufeatures" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201" +checksum = "5ca28b0ae3115b884660db4118d803791fd6756b6e88f39c0f3f7859060d7566" dependencies = [ "libc", ] [[package]] name = "crc32fast" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" +checksum = "8498c871161e1742aaa9d52551b2d6ebdd4c3d45a3be423e3728f33b955be550" dependencies = [ "cfg-if", ] @@ -846,18 +798,18 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.15" +version = "0.5.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2" +checksum = "d85363c37faeca707aef026efa9f3b34d077bce547e48f770770625c6013679e" dependencies = [ "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" +checksum = "5181e0de7b61eb03a81e347d6dd8797bae9da5146707b51077e2d71a54ec0ceb" dependencies = [ "crossbeam-epoch", "crossbeam-utils", @@ -865,27 +817,27 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.18" +version = "0.9.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +checksum = "2d6914041f254d6e9176c01941b21115dcfb7089e55135a35411081bd106ef3f" dependencies = [ "crossbeam-utils", ] [[package]] name = "crossbeam-queue" -version = "0.3.12" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115" +checksum = "803d13fb3b09d88be9f4dbc29062c66b19bf7170867ceb746d2a8689bf6c7a26" dependencies = [ "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.21" +version = "0.8.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" +checksum = "61803da095bee82a81bb1a452ecc25d3b2f1416d1897eb86430c6159ef717c17" [[package]] name = "crunchy" @@ -893,16 +845,6 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - [[package]] name = "csv" version = "1.4.0" @@ -917,9 +859,9 @@ dependencies = [ [[package]] name = "csv-core" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d02f3b0da4c6504f86e9cd789d8dbafab48c2321be74e9987593de5a894d93d" +checksum = "704a3c26996a80471189265814dbc2c257598b96b8a7feae2d31ace646bb9782" dependencies = [ "memchr", ] @@ -932,7 +874,7 @@ checksum = "e0b1fab2ae45819af2d0731d60f2afe17227ebb1a1538a236da84c93e9a60162" dependencies = [ "dispatch2", "nix", - "windows-sys 0.61.0", + "windows-sys 0.61.2", ] [[package]] @@ -963,9 +905,9 @@ dependencies = [ [[package]] name = "defmt" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6e524506490a1953d237cb87b1cfc1e46f88c18f10a22dfe0f507dc6bfc7f7f" +checksum = "e2953bfe4f93bbd20cc71198842756f77d161884c99ebbabc41d80231ded88d1" dependencies = [ "bitflags 1.3.2", "defmt-macros", @@ -973,12 +915,11 @@ dependencies = [ [[package]] name = "defmt-macros" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0a27770e9c8f719a79d8b638281f4d828f77d8fd61e0bd94451b9b85e576a0b" +checksum = "bad9c72e7ca2137e0dc3813245a0d282fd6daad32fd800af018306a9169b5fe8" dependencies = [ "defmt-parser", - "proc-macro-error2", "proc-macro2", "quote", "syn 2.0.119", @@ -990,14 +931,14 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10d60334b3b2e7c9d91ef8150abfb6fa4c1c39ebbcf4a81c2e346aad939fee3e" dependencies = [ - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] name = "derive-where" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef941ded77d15ca19b40374869ac6000af1c9f2a4c0f3d4c70926287e6364a8f" +checksum = "d08b3a0bcc0d079199cd476b2cae8435016ec11d1c0986c6901c5ac223041534" dependencies = [ "proc-macro2", "quote", @@ -1016,16 +957,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "crypto-common", -] - [[package]] name = "dirs" version = "6.0.0" @@ -1044,14 +975,14 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys 0.61.0", + "windows-sys 0.61.2", ] [[package]] name = "dispatch2" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89a09f22a6c6069a18470eb92d2298acf25463f14256d24778e1230d789a2aec" +checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38" dependencies = [ "bitflags 2.13.1", "block2", @@ -1061,13 +992,13 @@ dependencies = [ [[package]] name = "displaydoc" -version = "0.2.5" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +checksum = "c6232dd377dcc64799954cbd3a9bb882e9cdc1308ccd87b1c098f1fb2eaf82a8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.119", + "syn 3.0.4", ] [[package]] @@ -1101,9 +1032,9 @@ checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" [[package]] name = "either" -version = "1.15.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" +checksum = "252afb9ae5eaa683babdc6a068b3f5726eb19e05070c731f9b2a23a7c3e8ed34" [[package]] name = "encode_unicode" @@ -1124,7 +1055,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.61.0", + "windows-sys 0.61.2", ] [[package]] @@ -1151,7 +1082,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de48cc4d1c1d97a20fd819def54b890cadde72ed3ad0c614822a0a433361be96" dependencies = [ "cfg-if", - "windows-sys 0.61.0", + "windows-sys 0.61.2", ] [[package]] @@ -1167,9 +1098,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.3.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" +checksum = "da7c62ceae207dd37ea5b845da6a0696c799f85e97da1ab5b7910be3c1c80223" [[package]] name = "fern" @@ -1192,19 +1123,17 @@ dependencies = [ [[package]] name = "find-msvc-tools" -version = "0.1.9" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" +checksum = "d45db016d36b838f563236e9193d0ee6ce38f3f68b6c94e914b4929c96bbb890" [[package]] name = "flate2" -version = "1.1.2" +version = "1.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d" +checksum = "6e634e2e0ebac1ee034020da1ca582e17ffe4e0f5e985823721e168928136dcb" dependencies = [ - "crc32fast", - "libz-rs-sys", - "miniz_oxide", + "zlib-rs", ] [[package]] @@ -1236,9 +1165,9 @@ dependencies = [ [[package]] name = "fs-err" -version = "3.3.0" +version = "3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73fde052dbfc920003cfd2c8e2c6e6d4cc7c1091538c3a24226cec0665ab08c0" +checksum = "b91aa448ca50d7e79433bdf3ee8d99215430d2ec02ade5aefab2a073a1822e8a" dependencies = [ "autocfg", ] @@ -1260,21 +1189,21 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures-core" -version = "0.3.32" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d" +checksum = "92d699e522242e69e3003b94ecc1f960f3a5e015aa7c5d7486e65ad01dd94f5e" [[package]] name = "futures-task" -version = "0.3.32" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393" +checksum = "cd417de3d1d015fc3bfd2b1ea46dfc7bab72ef86f1cc7cc9c78e728b34a6d1fd" [[package]] name = "futures-util" -version = "0.3.32" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6" +checksum = "0d50a92467f8ba5dd6e3ee5d4bd04d73ab2e4e1c44474a0674821dfce14b79bc" dependencies = [ "futures-core", "futures-task", @@ -1293,16 +1222,6 @@ dependencies = [ "url", ] -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - [[package]] name = "get-size-derive2" version = "0.10.3" @@ -1341,9 +1260,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" +checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0" dependencies = [ "cfg-if", "libc", @@ -1352,28 +1271,14 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" -dependencies = [ - "cfg-if", - "libc", - "r-efi 5.3.0", - "wasip2", -] - -[[package]] -name = "getrandom" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555" +checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099" dependencies = [ "cfg-if", "libc", - "r-efi 6.0.0", - "rand_core 0.10.0", - "wasip2", - "wasip3", + "r-efi", + "rand_core 0.10.1", ] [[package]] @@ -1408,12 +1313,13 @@ dependencies = [ [[package]] name = "half" -version = "2.6.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9" +checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b" dependencies = [ "cfg-if", "crunchy", + "zerocopy", ] [[package]] @@ -1444,9 +1350,9 @@ dependencies = [ [[package]] name = "hashlink" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5081f264ed7adee96ea4b4778b6bb9da0a7228b084587aa3bd3ff05da7c5a3b" +checksum = "32069d97bb81e38fa67eab65e3393bf804bb85969f2bc06bf13f64aef5aba248" dependencies = [ "hashbrown 0.17.1", ] @@ -1465,18 +1371,15 @@ checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c" [[package]] name = "html-escape" -version = "0.2.13" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d1ad449764d627e22bfd7cd5e8868264fc9236e07c752972b4080cd351cb476" -dependencies = [ - "utf8-width", -] +checksum = "c9356095b4b41197bba32173600e1582792cda618f65d12f68e2e77d273413c5" [[package]] name = "iana-time-zone" -version = "0.1.64" +version = "0.1.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb" +checksum = "e31bc9ad994ba00e440a8aa5c9ef0ec67d5cb5e5cb0cc7f8b744a35b389cc470" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1498,9 +1401,9 @@ dependencies = [ [[package]] name = "icu_collections" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2984d1cd16c883d7935b9e07e44071dca8d917fd52ecc02c04d5fa0b5a3f191c" +checksum = "fa68d21081c4a05d5a901a1c62add574c77048b6a1c67be3b50ce0b60d4ca513" dependencies = [ "displaydoc", "potential_utf", @@ -1512,9 +1415,9 @@ dependencies = [ [[package]] name = "icu_locale_core" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92219b62b3e2b4d88ac5119f8904c10f8f61bf7e95b640d25ba3075e6cac2c29" +checksum = "d56e28588da92eee5c3201a6eff33fabdd49b62269c8938d4ff050ce4d900deb" dependencies = [ "displaydoc", "litemap", @@ -1525,9 +1428,9 @@ dependencies = [ [[package]] name = "icu_normalizer" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c56e5ee99d6e3d33bd91c5d85458b6005a22140021cc324cea84dd0e72cff3b4" +checksum = "12f9cf5f235641ed274641dd81c3f28d870e276763d0797aeeab72317b1c646f" dependencies = [ "icu_collections", "icu_normalizer_data", @@ -1539,16 +1442,17 @@ dependencies = [ [[package]] name = "icu_normalizer_data" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da3be0ae77ea334f4da67c12f149704f19f81d1adf7c51cf482943e84a2bad38" +checksum = "1563da1ed3e0b3bf3d74c9b85917ac9c56464d2f57242270c09c9e752f8021a0" [[package]] name = "icu_properties" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bee3b67d0ea5c2cca5003417989af8996f8604e34fb9ddf96208a033901e70de" +checksum = "7e7ca276ad3145661a65914e6daf131ca5120cd3dcee8f8f3214b8875184a148" dependencies = [ + "displaydoc", "icu_collections", "icu_locale_core", "icu_properties_data", @@ -1559,15 +1463,15 @@ dependencies = [ [[package]] name = "icu_properties_data" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e2bbb201e0c04f7b4b3e14382af113e17ba4f63e2c9d2ee626b720cbce54a14" +checksum = "e590f038c1464a96894fd6d10127e90a8be4509f56ff7ecef851b15cee0b7caa" [[package]] name = "icu_provider" -version = "2.2.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "139c4cf31c8b5f33d7e199446eff9c1e02decfc2f0eec2c8d71f65befa45b421" +checksum = "d27bbb9d3abbefac45d55f647c9de1d44aafcd1186eb91879afef17c396c3e73" dependencies = [ "displaydoc", "icu_locale_core", @@ -1578,12 +1482,6 @@ dependencies = [ "zerovec", ] -[[package]] -name = "id-arena" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954" - [[package]] name = "idna" version = "1.1.0" @@ -1597,9 +1495,9 @@ dependencies = [ [[package]] name = "idna_adapter" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344" +checksum = "cb68373c0d6620ef8105e855e7745e18b0d00d3bdb07fb532e434244cdb9a714" dependencies = [ "icu_normalizer", "icu_properties", @@ -1643,9 +1541,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.14.0" +version = "2.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9" +checksum = "07aa2048142242915a31d35844fb311e0e53fcca590c3a0a40dcf1b841fa09eb" dependencies = [ "equivalent", "hashbrown 0.17.1", @@ -1678,9 +1576,9 @@ dependencies = [ [[package]] name = "inotify" -version = "0.11.0" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3" +checksum = "4cc00ea907cab49550b7da656f80ebb97be1b997d931fbcd28d39734e17ce592" dependencies = [ "bitflags 2.13.1", "inotify-sys", @@ -1689,9 +1587,9 @@ dependencies = [ [[package]] name = "inotify-sys" -version = "0.1.5" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" +checksum = "c033f80b2c113cdf91ab7a33faa9cbc014726dcad99880c8609af2a370edf37d" dependencies = [ "libc", ] @@ -1733,12 +1631,9 @@ checksum = "71dd52191aae121e8611f1e8dc3e324dd0dd1dee1e6dd91d10ee07a3cfb4d9d8" [[package]] name = "intrusive-collections" -version = "0.10.1" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80e165935eba36cb526af8389effd2005a741adcbb6ed32106cc68e3f7b92960" -dependencies = [ - "memoffset", -] +checksum = "4275b20e6057cd7733fd8df8a5a31701e4fe44497dad0f3fa0e1c4fb971506be" [[package]] name = "inventory" @@ -1751,9 +1646,9 @@ dependencies = [ [[package]] name = "is-macro" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d57a3e447e24c22647738e4607f1df1e0ec6f72e16182c4cd199f647cdfb0e4" +checksum = "8267aa6001e25494f3015f9663bbd88a18240c74483afa5f0934a1b3e4c388e9" dependencies = [ "heck", "proc-macro2", @@ -1763,20 +1658,20 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.16" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9" +checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46" dependencies = [ "hermit-abi", "libc", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] name = "is_terminal_polyfill" -version = "1.70.1" +version = "1.70.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" +checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" [[package]] name = "itertools" @@ -1816,9 +1711,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.15" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" +checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" [[package]] name = "jiff" @@ -1834,7 +1729,7 @@ dependencies = [ "portable-atomic", "portable-atomic-util", "serde_core", - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -1860,9 +1755,9 @@ dependencies = [ [[package]] name = "jiff-tzdb" -version = "0.1.4" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1283705eb0a21404d2bfd6eef2a7593d240bc42a0bdb39db0ad6fa2ec026524" +checksum = "142bd39932ad231f10513df9ab62661fead8719872150b7ad02a2df79f4e141e" [[package]] name = "jiff-tzdb-platform" @@ -1875,11 +1770,11 @@ dependencies = [ [[package]] name = "jobserver" -version = "0.1.34" +version = "0.1.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33" +checksum = "1c00acbd29eabad4a2392fa0e921c874934dbbf4194312ad20f04a0ed67a3cb3" dependencies = [ - "getrandom 0.3.4", + "getrandom 0.4.3", "libc", ] @@ -1891,9 +1786,9 @@ checksum = "a037eddb7d28de1d0fc42411f501b53b75838d313908078d6698d064f3029b24" [[package]] name = "js-sys" -version = "0.3.100" +version = "0.3.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2025f20d7a4fa7785846e7b63d10a76d3f1cee98ee5cb79ea59703f95e42162" +checksum = "0e0c1080212aad755ea003d18543e8768dd432c48819efd73a7bf1e39b7a5a3a" dependencies = [ "cfg-if", "futures-util", @@ -1902,9 +1797,9 @@ dependencies = [ [[package]] name = "kqueue" -version = "1.1.1" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac30106d7dce88daf4a3fcb4879ea939476d5074a9b7ddd0fb97fa4bed5596a" +checksum = "8d763e5b24120b4ddf50de6c92308156765aabfbbccebf401da7cff2d70a41ea" dependencies = [ "kqueue-sys", "libc", @@ -1912,11 +1807,11 @@ dependencies = [ [[package]] name = "kqueue-sys" -version = "1.0.4" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" +checksum = "07293a4e297ac234359b510362495713f75ea345d5307140414f20c69ffeb087" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.13.1", "libc", ] @@ -1926,12 +1821,6 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" -[[package]] -name = "leb128fmt" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" - [[package]] name = "libc" version = "0.2.189" @@ -1950,7 +1839,7 @@ dependencies = [ "paste", "peg", "regex", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] @@ -1980,35 +1869,25 @@ dependencies = [ [[package]] name = "libredox" -version = "0.1.10" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb" +checksum = "d7955dfc218a8afb29dfeffd540e3a6e96baeb94fe7138228dd7cc6937fbbf96" dependencies = [ - "bitflags 2.13.1", "libc", ] [[package]] name = "libtest-mimic" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5297962ef19edda4ce33aaa484386e0a5b3d7f2f4e037cbeee00503ef6b29d33" +checksum = "14e6ba06f0ade6e504aff834d7c34298e5155c6baca353cc6a4aaff2f9fd7f33" dependencies = [ - "anstream 0.6.21", + "anstream", "anstyle", "clap", "escape8259", ] -[[package]] -name = "libz-rs-sys" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c10501e7805cee23da17c7790e59df2870c0d4043ec6d03f67d31e2b53e77415" -dependencies = [ - "zlib-rs", -] - [[package]] name = "linux-raw-sys" version = "0.12.1" @@ -2017,9 +1896,9 @@ checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" [[package]] name = "litemap" -version = "0.8.0" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956" +checksum = "47d9d19d1d6efa0109d2f65ff4c85cddd50bd572e5a00127ab10987290bcefae" [[package]] name = "lock_api" @@ -2032,9 +1911,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.33" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad" +checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6" [[package]] name = "lsp-server" @@ -2111,17 +1990,17 @@ dependencies = [ "ruff_db", "ruff_diagnostics", "ruff_index", - "ruff_python_ast", - "ruff_python_trivia", - "ruff_source_file", - "ruff_text_size", "rustc-hash", "rustc-stable-hash", + "rustpython-ruff_python_ast", + "rustpython-ruff_python_trivia", + "rustpython-ruff_source_file", + "rustpython-ruff_text_size", "salsa", "serde", - "similar 3.1.2", + "similar 3.2.0", "smallvec", - "thiserror 2.0.19", + "thiserror 2.0.20", "toml 1.1.4+spec-1.1.0", "toml_parser", "tracing", @@ -2133,15 +2012,6 @@ version = "2.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98" -[[package]] -name = "memoffset" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" -dependencies = [ - "autocfg", -] - [[package]] name = "mimalloc" version = "0.1.52" @@ -2153,9 +2023,9 @@ dependencies = [ [[package]] name = "minicov" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4869b6a491569605d66d3952bcdf03df789e5b536e5f0cf7758a7f08a55ae24d" +checksum = "c3aa3aa12b448ac225b3102217d1ac5cc717908f02722926524b0599c933c7a0" dependencies = [ "cc", "walkdir", @@ -2167,25 +2037,16 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" -[[package]] -name = "miniz_oxide" -version = "0.8.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" -dependencies = [ - "adler2", -] - [[package]] name = "mio" -version = "1.0.4" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c" +checksum = "30d65c71f1ce40ab09135ce117d742b9f8a19ff91a41a8b57ed50bc2de59c427" dependencies = [ "libc", "log", "wasi", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -2216,18 +2077,18 @@ checksum = "308d96db8debc727c3fd9744aac51751243420e46edf401010908da7f8d5e57c" [[package]] name = "newtype-uuid" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c012d14ef788ab066a347d19e3dda699916c92293b05b85ba2c76b8c82d2830" +checksum = "0fa56da58097c7ae893c4097bb6d91bb5f7fa330053e07e033349db4d5f83ba8" dependencies = [ "uuid", ] [[package]] name = "nix" -version = "0.31.2" +version = "0.31.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d0705320c1e6ba1d912b5e37cf18071b6c2e9b7fa8215a1e8a7651966f5d3" +checksum = "cf20d2fde8ff38632c426f1165ed7436270b44f199fc55284c38276f9db47c3d" dependencies = [ "bitflags 2.13.1", "cfg-if", @@ -2271,17 +2132,20 @@ dependencies = [ [[package]] name = "notify-types" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e0826a989adedc2a244799e823aece04662b66609d96af8dff7ac6df9a8925d" +checksum = "42b8cfee0e339a0337359f3c88165702ac6e600dc01c0cc9579a92d62b08477a" +dependencies = [ + "bitflags 2.13.1", +] [[package]] name = "nu-ansi-term" -version = "0.50.1" +version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399" +checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -2296,9 +2160,9 @@ dependencies = [ [[package]] name = "objc2" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7c2599ce0ec54857b29ce62166b0ed9b4f6f1a70ccc9a71165b6154caca8c05" +checksum = "3a12a8ed07aefc768292f076dc3ac8c48f3781c8f2d5851dd3d98950e8c5a89f" dependencies = [ "objc2-encode", ] @@ -2326,9 +2190,9 @@ checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" [[package]] name = "once_cell_polyfill" -version = "1.70.1" +version = "1.70.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad" +checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" [[package]] name = "oorandom" @@ -2344,9 +2208,9 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "ordermap" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f7476a5b122ff1fce7208e7ee9dccd0a516e835f5b8b19b8f3c98a34cf757c1" +checksum = "b1288aecc871a8edf4d48083fb911efe2716700ba47bee1854c03466ff3627de" dependencies = [ "indexmap", "serde", @@ -2355,19 +2219,19 @@ dependencies = [ [[package]] name = "os_pipe" -version = "1.2.2" +version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db335f4760b14ead6290116f2427bf33a14d4f0617d49f78a246de10c1831224" +checksum = "7d8fae84b431384b68627d0f9b3b1245fcf9f46f6c0e3dc902e9dce64edd1967" dependencies = [ "libc", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] name = "os_str_bytes" -version = "7.1.1" +version = "7.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63eceb7b5d757011a87d08eb2123db15d87fb0c281f65d101ce30a1e96c3ad5c" +checksum = "73b489f051c9d2f4299ddf8d55e33c65c86a7b76f49359af15f79ebe541d1595" dependencies = [ "memchr", ] @@ -2402,7 +2266,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -2440,9 +2304,9 @@ checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3" [[package]] name = "peg" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9928cfca101b36ec5163e70049ee5368a8a1c3c6efc9ca9c5f9cc2f816152477" +checksum = "0aad070be5b63aa72103f2fcdd70a83adbd5e90112ce5b574171ff1c65501773" dependencies = [ "peg-macros", "peg-runtime", @@ -2450,9 +2314,9 @@ dependencies = [ [[package]] name = "peg-macros" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6298ab04c202fa5b5d52ba03269fb7b74550b150323038878fe6c372d8280f71" +checksum = "ddd8ef6825cae95355031ae26a99b616a2a21f22ba2de0197c43dfb05acbe7ee" dependencies = [ "peg-runtime", "proc-macro2", @@ -2461,9 +2325,9 @@ dependencies = [ [[package]] name = "peg-runtime" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "132dca9b868d927b35b5dd728167b2dee150eb1ad686008fc71ccb298b776fca" +checksum = "7011d97b484a5ebdc4b1fdb3b12d5e4bbbea56e9d22b688f2e79e04b65a7d8a6" [[package]] name = "pep440_rs" @@ -2508,20 +2372,19 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "pest" -version = "2.8.2" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e0a3a33733faeaf8651dfee72dd0f388f0c8e5ad496a3478fa5a922f49cfa8" +checksum = "5a07a60cc7a4d00c91f95c685609d1d2f79050e6804b70ebedd7650f0b839bcf" dependencies = [ "memchr", - "thiserror 2.0.19", "ucd-trie", ] [[package]] name = "pest_derive" -version = "2.8.2" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc58706f770acb1dbd0973e6530a3cff4746fb721207feb3a8a6064cd0b6c663" +checksum = "b3a83744a5c8455b8b3e0dc5031362780a347c878bdd11584d1a8984228cc88d" dependencies = [ "pest", "pest_generator", @@ -2529,9 +2392,9 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.8.2" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d4f36811dfe07f7b8573462465d5cb8965fffc2e71ae377a33aecf14c2c9a2f" +checksum = "e0cd3451aa3de60d4b9a1e736885e4dea6b31617598026f12256ad566d63304a" dependencies = [ "pest", "pest_meta", @@ -2542,12 +2405,11 @@ dependencies = [ [[package]] name = "pest_meta" -version = "2.8.2" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42919b05089acbd0a5dcd5405fb304d17d1053847b81163d09c4ad18ce8e8420" +checksum = "e04d3a0849e241d7dfce834c83b1c5edc8622009e8dd51a12ba1927c32f05496" dependencies = [ "pest", - "sha2", ] [[package]] @@ -2586,7 +2448,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d" dependencies = [ "phf_shared 0.11.3", - "rand 0.8.5", + "rand 0.8.8", ] [[package]] @@ -2609,36 +2471,36 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" +checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" [[package]] name = "pkg-config" -version = "0.3.32" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" +checksum = "f6b464fbc74e149a392436b17d523f769e057cb6877f6a5c4618bc6f11800548" [[package]] name = "portable-atomic" -version = "1.13.1" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" +checksum = "05c8b63e8d9609db387f0324918f81d68fe27748f084ef092fb35954d0539a85" [[package]] name = "portable-atomic-util" -version = "0.2.4" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507" +checksum = "c2a106d1259c23fac8e543272398ae0e3c0b8d33c88ed73d0cc71b0f1d902618" dependencies = [ "portable-atomic", ] [[package]] name = "potential_utf" -version = "0.1.3" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84df19adbe5b5a0782edcab45899906947ab039ccf4573713735ee7de1e6b08a" +checksum = "d83eb9bc6d8e5cf568e7a1101d60ee05e81ed50ea106026f3d18deeb046d7661" dependencies = [ "zerovec", ] @@ -2689,16 +2551,6 @@ dependencies = [ "yansi", ] -[[package]] -name = "prettyplease" -version = "0.2.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" -dependencies = [ - "proc-macro2", - "syn 2.0.119", -] - [[package]] name = "proc-macro-crate" version = "3.5.0" @@ -2708,28 +2560,6 @@ dependencies = [ "toml_edit", ] -[[package]] -name = "proc-macro-error-attr2" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" -dependencies = [ - "proc-macro2", - "quote", -] - -[[package]] -name = "proc-macro-error2" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" -dependencies = [ - "proc-macro-error-attr2", - "proc-macro2", - "quote", - "syn 2.0.119", -] - [[package]] name = "proc-macro-utils" version = "0.10.0" @@ -2762,22 +2592,22 @@ dependencies = [ [[package]] name = "ptr_meta" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b9a0cf95a1196af61d4f1cbdab967179516d9a4a4312af1f31948f8f6224a79" +checksum = "743da816b98c921cdbe8628ef7381b76f25ecf4da599fc80aca90eae7ef70cc0" dependencies = [ "ptr_meta_derive", ] [[package]] name = "ptr_meta_derive" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7347867d0a7e1208d93b46767be83e2b8f978c3dad35f775ac8d8847551d6fe1" +checksum = "1c8d9ca532f185d5d4db7a7c9d51420b452168ea1c2b913953281bd6fe1fcbd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.119", + "syn 3.0.4", ] [[package]] @@ -2790,7 +2620,7 @@ dependencies = [ "pep440_rs", "pep508_rs", "serde", - "thiserror 2.0.19", + "thiserror 2.0.20", "toml 0.9.12+spec-1.1.0", ] @@ -2805,7 +2635,7 @@ dependencies = [ "newtype-uuid", "quick-xml", "strip-ansi-escapes", - "thiserror 2.0.19", + "thiserror 2.0.20", "uuid", ] @@ -2869,12 +2699,6 @@ dependencies = [ "syn 2.0.119", ] -[[package]] -name = "r-efi" -version = "5.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" - [[package]] name = "r-efi" version = "6.0.0" @@ -2889,18 +2713,18 @@ checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" [[package]] name = "rancor" -version = "0.1.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a063ea72381527c2a0561da9c80000ef822bdd7c3241b1cc1b12100e3df081ee" +checksum = "9b534442d0fcdb55d66f373d9cac6d33b6293a2335bc2136dbd06ce0e87d2572" dependencies = [ "ptr_meta", ] [[package]] name = "rand" -version = "0.8.5" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +checksum = "e058c7de0b26af77780c769414d6257830bb240f3c38477dbc2c16e5f54d6d4c" dependencies = [ "libc", "rand_chacha", @@ -2914,8 +2738,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7f5fa3a058cd35567ef9bfa5e75732bee0f9e4c55fa90477bef2dfcdbc4be80" dependencies = [ "chacha20", - "getrandom 0.4.2", - "rand_core 0.10.0", + "getrandom 0.4.3", + "rand_core 0.10.1", ] [[package]] @@ -2934,14 +2758,14 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.16", + "getrandom 0.2.17", ] [[package]] name = "rand_core" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c8d0fd677905edcbeedbf2edb6494d676f0e98d54d5cf9bda0b061cb8fb8aba" +checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69" [[package]] name = "rayon" @@ -2965,9 +2789,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.17" +version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5407465600fb0548f1442edf71dd20683c6ed326200ace4b1ef0763521bb3b77" +checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" dependencies = [ "bitflags 2.13.1", ] @@ -2978,29 +2802,29 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac" dependencies = [ - "getrandom 0.2.16", + "getrandom 0.2.17", "libredox", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] name = "ref-cast" -version = "1.0.25" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f354300ae66f76f1c85c5f84693f0ce81d747e2c3f21a45fef496d89c960bf7d" +checksum = "7e440fb4e4b4147295338efb76001ab9e4efc0e5839df2c47fc5ac2381d365c3" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.25" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da" +checksum = "92ecd8964f8453721699a1ed72037b0db49ce2f5a5138486ee89bed6f67cdf3a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.119", + "syn 3.0.4", ] [[package]] @@ -3028,9 +2852,9 @@ dependencies = [ [[package]] name = "regex-lite" -version = "0.1.7" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "943f41321c63ef1c92fd763bfe054d2668f7f225a5c29f0105903dc2fc04ba30" +checksum = "cab834c73d247e67f4fae452806d17d3c7501756d98c8808d7c9c7aa7d18f973" [[package]] name = "regex-syntax" @@ -3040,18 +2864,18 @@ checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4" [[package]] name = "rend" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cadadef317c2f20755a64d7fdc48f9e7178ee6b0e1f7fce33fa60f1d68a276e6" +checksum = "663ba70707f96e871406fe10d68128412e619b06d1d47cb91c3a4c6501176240" dependencies = [ "bytecheck", ] [[package]] name = "rkyv" -version = "0.8.17" +version = "0.8.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "815cc8a37159a463064825246cadb07961e25cd9885908606f6d08a98d8f8874" +checksum = "d9776093b7ca170454ab1406954f7b7d97a57c51dc6c0642957fb2ef25c2d399" dependencies = [ "bytecheck", "bytes", @@ -3068,20 +2892,20 @@ dependencies = [ [[package]] name = "rkyv_derive" -version = "0.8.17" +version = "0.8.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ed1a78a1b19d184b0daa629dd9a024573173ec7d485b287cb369fb3607cc1c" +checksum = "1c25ef604ac7dd839d44d64648952ea23c97866f124ff671b0ed2cf3ad9bb06e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.119", + "syn 3.0.4", ] [[package]] name = "ron" -version = "0.12.0" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd490c5b18261893f14449cbd28cb9c0b637aebf161cd77900bfdedaff21ec32" +checksum = "81116b9531d61eabc41aeb228e4b6b2435bcca3233b98cf3b3077d4e6e9debb3" dependencies = [ "bitflags 2.13.1", "once_cell", @@ -3131,23 +2955,23 @@ dependencies = [ "ruff_markdown", "ruff_notebook", "ruff_options_metadata", - "ruff_python_ast", "ruff_python_formatter", - "ruff_python_parser", - "ruff_python_trivia", "ruff_ranged_value", "ruff_server", - "ruff_source_file", - "ruff_text_size", "ruff_workspace", "rustc-hash", + "rustpython-ruff_python_ast", + "rustpython-ruff_python_parser", + "rustpython-ruff_python_trivia", + "rustpython-ruff_source_file", + "rustpython-ruff_text_size", "serde", "serde_json", "shellexpand", "strum", "tempfile", "test-case", - "thiserror 2.0.19", + "thiserror 2.0.20", "tikv-jemallocator", "toml 1.1.4+spec-1.1.0", "tracing", @@ -3159,7 +2983,7 @@ dependencies = [ name = "ruff_annotate_snippets" version = "0.0.11" dependencies = [ - "anstream 1.0.0", + "anstream", "anstyle", "memchr", "ruff_annotate_snippets", @@ -3179,12 +3003,12 @@ dependencies = [ "rayon", "ruff_db", "ruff_linter", - "ruff_python_ast", "ruff_python_formatter", - "ruff_python_parser", - "ruff_python_trivia", "ruff_ranged_value", "rustc-hash", + "rustpython-ruff_python_ast", + "rustpython-ruff_python_parser", + "rustpython-ruff_python_trivia", "serde", "serde_json", "tempfile", @@ -3234,21 +3058,21 @@ dependencies = [ "ruff_diagnostics", "ruff_memory_usage", "ruff_notebook", - "ruff_python_ast", - "ruff_python_parser", - "ruff_python_trivia", - "ruff_source_file", - "ruff_text_size", "rustc-hash", + "rustpython-ruff_python_ast", + "rustpython-ruff_python_parser", + "rustpython-ruff_python_trivia", + "rustpython-ruff_source_file", + "rustpython-ruff_text_size", "salsa", "same-file", "schemars", "serde", "serde_json", - "similar 3.1.2", + "similar 3.2.0", "supports-hyperlinks", "tempfile", - "thiserror 2.0.19", + "thiserror 2.0.20", "tracing", "tracing-subscriber", "ty_static", @@ -3278,16 +3102,16 @@ dependencies = [ "ruff_linter", "ruff_notebook", "ruff_options_metadata", - "ruff_python_ast", "ruff_python_codegen", "ruff_python_formatter", - "ruff_python_parser", - "ruff_python_trivia", "ruff_workspace", + "rustpython-ruff_python_ast", + "rustpython-ruff_python_parser", + "rustpython-ruff_python_trivia", "schemars", "serde", "serde_json", - "similar 3.1.2", + "similar 3.2.0", "strum", "tempfile", "toml 1.1.4+spec-1.1.0", @@ -3307,7 +3131,7 @@ version = "0.0.11" dependencies = [ "get-size2", "is-macro", - "ruff_text_size", + "rustpython-ruff_text_size", "serde", ] @@ -3318,8 +3142,8 @@ dependencies = [ "drop_bomb", "ruff_cache", "ruff_macros", - "ruff_text_size", "rustc-hash", + "rustpython-ruff_text_size", "schemars", "serde", "static_assertions", @@ -3338,8 +3162,8 @@ dependencies = [ "ruff_db", "ruff_linter", "ruff_macros", - "ruff_python_ast", - "ruff_python_parser", + "rustpython-ruff_python_ast", + "rustpython-ruff_python_parser", "salsa", "schemars", "serde", @@ -3389,29 +3213,29 @@ dependencies = [ "ruff_diagnostics", "ruff_macros", "ruff_notebook", - "ruff_python_ast", "ruff_python_codegen", "ruff_python_importer", "ruff_python_index", "ruff_python_literal", - "ruff_python_parser", "ruff_python_semantic", "ruff_python_stdlib", - "ruff_python_trivia", "ruff_ranged_value", - "ruff_source_file", - "ruff_text_size", "rustc-hash", + "rustpython-ruff_python_ast", + "rustpython-ruff_python_parser", + "rustpython-ruff_python_trivia", + "rustpython-ruff_source_file", + "rustpython-ruff_text_size", "schemars", "serde", "serde_json", - "similar 3.1.2", + "similar 3.2.0", "smallvec", "strum", "strum_macros", "tempfile", "test-case", - "thiserror 2.0.19", + "thiserror 2.0.20", "toml 1.1.4+spec-1.1.0", "typed-arena", "unicode-normalization", @@ -3429,8 +3253,8 @@ dependencies = [ "proc-macro2", "quote", "regex", - "ruff_python_trivia", - "syn 3.0.3", + "rustpython-ruff_python_trivia", + "syn 3.0.4", ] [[package]] @@ -3440,12 +3264,12 @@ dependencies = [ "insta", "regex", "ruff_linter", - "ruff_python_ast", "ruff_python_formatter", - "ruff_python_trivia", - "ruff_source_file", - "ruff_text_size", "ruff_workspace", + "rustpython-ruff_python_ast", + "rustpython-ruff_python_trivia", + "rustpython-ruff_source_file", + "rustpython-ruff_text_size", ] [[package]] @@ -3458,9 +3282,9 @@ dependencies = [ "mdtest", "ruff_db", "ruff_linter", - "ruff_python_ast", "ruff_ranged_value", "ruff_workspace", + "rustpython-ruff_python_ast", "salsa", ] @@ -3478,12 +3302,12 @@ dependencies = [ "anyhow", "rand 0.10.2", "ruff_diagnostics", - "ruff_source_file", - "ruff_text_size", + "rustpython-ruff_source_file", + "rustpython-ruff_text_size", "serde", "serde_json", "test-case", - "thiserror 2.0.19", + "thiserror 2.0.20", "uuid", ] @@ -3495,51 +3319,25 @@ dependencies = [ ] [[package]] -name = "ruff_python_ast" -version = "0.0.11" -dependencies = [ - "aho-corasick", - "arrayvec", - "bitflags 2.13.1", - "char_str", - "compact_str", - "get-size2", - "is-macro", - "memchr", - "ruff_cache", - "ruff_macros", - "ruff_python_trivia", - "ruff_source_file", - "ruff_text_size", - "rustc-hash", - "salsa", - "schemars", - "serde", - "serde_json", - "thin-vec", - "thiserror 2.0.19", -] - -[[package]] -name = "ruff_python_ast_integration_tests" -version = "0.0.0" +name = "ruff_python_ast_integration_tests" +version = "0.0.0" dependencies = [ "insta", - "ruff_python_ast", - "ruff_python_parser", - "ruff_python_trivia", - "ruff_text_size", + "rustpython-ruff_python_ast", + "rustpython-ruff_python_parser", + "rustpython-ruff_python_trivia", + "rustpython-ruff_text_size", ] [[package]] name = "ruff_python_codegen" version = "0.0.11" dependencies = [ - "ruff_python_ast", "ruff_python_literal", - "ruff_python_parser", - "ruff_source_file", - "ruff_text_size", + "rustpython-ruff_python_ast", + "rustpython-ruff_python_parser", + "rustpython-ruff_source_file", + "rustpython-ruff_text_size", "test-case", ] @@ -3559,20 +3357,20 @@ dependencies = [ "ruff_db", "ruff_formatter", "ruff_macros", - "ruff_python_ast", - "ruff_python_parser", - "ruff_python_trivia", - "ruff_source_file", - "ruff_text_size", "rustc-hash", + "rustpython-ruff_python_ast", + "rustpython-ruff_python_parser", + "rustpython-ruff_python_trivia", + "rustpython-ruff_source_file", + "rustpython-ruff_text_size", "salsa", "schemars", "serde", "serde_json", - "similar 3.1.2", + "similar 3.2.0", "smallvec", "static_assertions", - "thiserror 2.0.19", + "thiserror 2.0.20", "tracing", ] @@ -3583,23 +3381,23 @@ dependencies = [ "anyhow", "insta", "ruff_diagnostics", - "ruff_python_ast", "ruff_python_codegen", - "ruff_python_parser", - "ruff_python_trivia", - "ruff_source_file", - "ruff_text_size", + "rustpython-ruff_python_ast", + "rustpython-ruff_python_parser", + "rustpython-ruff_python_trivia", + "rustpython-ruff_source_file", + "rustpython-ruff_text_size", ] [[package]] name = "ruff_python_index" version = "0.0.11" dependencies = [ - "ruff_python_ast", - "ruff_python_parser", - "ruff_python_trivia", - "ruff_source_file", - "ruff_text_size", + "rustpython-ruff_python_ast", + "rustpython-ruff_python_parser", + "rustpython-ruff_python_trivia", + "rustpython-ruff_source_file", + "rustpython-ruff_text_size", ] [[package]] @@ -3609,37 +3407,7 @@ dependencies = [ "bitflags 2.13.1", "icu_properties", "itertools 0.15.0", - "ruff_python_ast", -] - -[[package]] -name = "ruff_python_parser" -version = "0.0.11" -dependencies = [ - "anyhow", - "bitflags 2.13.1", - "bstr", - "datatest-stable", - "drop_bomb", - "get-size2", - "insta", - "itertools 0.15.0", - "memchr", - "ruff_annotate_snippets", - "ruff_python_ast", - "ruff_python_trivia", - "ruff_source_file", - "ruff_text_size", - "rustc-hash", - "serde", - "serde_json", - "stacker", - "static_assertions", - "thin-vec", - "unicode-ident", - "unicode-normalization", - "unicode_names2", - "walkdir", + "rustpython-ruff_python_ast", ] [[package]] @@ -3652,11 +3420,11 @@ dependencies = [ "ruff_cache", "ruff_index", "ruff_macros", - "ruff_python_ast", - "ruff_python_parser", "ruff_python_stdlib", - "ruff_text_size", "rustc-hash", + "rustpython-ruff_python_ast", + "rustpython-ruff_python_parser", + "rustpython-ruff_text_size", "schemars", "serde", "smallvec", @@ -3671,25 +3439,14 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "ruff_python_trivia" -version = "0.0.11" -dependencies = [ - "itertools 0.15.0", - "ruff_source_file", - "ruff_text_size", - "rustc-hash", - "unicode-ident", -] - [[package]] name = "ruff_python_trivia_integration_tests" version = "0.0.0" dependencies = [ "insta", - "ruff_python_parser", - "ruff_python_trivia", - "ruff_text_size", + "rustpython-ruff_python_parser", + "rustpython-ruff_python_trivia", + "rustpython-ruff_text_size", ] [[package]] @@ -3698,8 +3455,8 @@ version = "0.0.11" dependencies = [ "get-size2", "ruff_db", - "ruff_python_ast", - "ruff_text_size", + "rustpython-ruff_python_ast", + "rustpython-ruff_text_size", "schemars", "serde", "toml 1.1.4+spec-1.1.0", @@ -3726,49 +3483,28 @@ dependencies = [ "ruff_linter", "ruff_markdown", "ruff_notebook", - "ruff_python_ast", "ruff_python_codegen", "ruff_python_formatter", "ruff_python_index", - "ruff_python_parser", "ruff_ranged_value", - "ruff_source_file", - "ruff_text_size", "ruff_workspace", "rustc-hash", + "rustpython-ruff_python_ast", + "rustpython-ruff_python_parser", + "rustpython-ruff_source_file", + "rustpython-ruff_text_size", "serde", "serde_json", "shellexpand", "smallvec", "tempfile", - "thiserror 2.0.19", + "thiserror 2.0.20", "toml 1.1.4+spec-1.1.0", "tracing", "tracing-log", "tracing-subscriber", ] -[[package]] -name = "ruff_source_file" -version = "0.0.11" -dependencies = [ - "get-size2", - "memchr", - "ruff_text_size", - "serde", -] - -[[package]] -name = "ruff_text_size" -version = "0.0.11" -dependencies = [ - "get-size2", - "schemars", - "serde", - "serde_test", - "static_assertions", -] - [[package]] name = "ruff_wasm" version = "0.16.5" @@ -3780,16 +3516,16 @@ dependencies = [ "ruff_db", "ruff_formatter", "ruff_linter", - "ruff_python_ast", "ruff_python_codegen", "ruff_python_formatter", "ruff_python_index", - "ruff_python_parser", - "ruff_python_trivia", "ruff_ranged_value", - "ruff_source_file", - "ruff_text_size", "ruff_workspace", + "rustpython-ruff_python_ast", + "rustpython-ruff_python_parser", + "rustpython-ruff_python_trivia", + "rustpython-ruff_source_file", + "rustpython-ruff_text_size", "serde", "serde-wasm-bindgen", "wasm-bindgen", @@ -3822,13 +3558,13 @@ dependencies = [ "ruff_linter", "ruff_macros", "ruff_options_metadata", - "ruff_python_ast", "ruff_python_formatter", "ruff_python_semantic", "ruff_python_stdlib", "ruff_ranged_value", - "ruff_source_file", "rustc-hash", + "rustpython-ruff_python_ast", + "rustpython-ruff_source_file", "schemars", "serde", "serde_json", @@ -3871,20 +3607,108 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.61.0", + "windows-sys 0.61.2", +] + +[[package]] +name = "rustpython-ruff_python_ast" +version = "0.16.5" +dependencies = [ + "aho-corasick", + "arrayvec", + "bitflags 2.13.1", + "char_str", + "compact_str", + "get-size2", + "is-macro", + "memchr", + "ruff_cache", + "ruff_macros", + "rustc-hash", + "rustpython-ruff_python_trivia", + "rustpython-ruff_source_file", + "rustpython-ruff_text_size", + "salsa", + "schemars", + "serde", + "serde_json", + "thin-vec", + "thiserror 2.0.20", +] + +[[package]] +name = "rustpython-ruff_python_parser" +version = "0.16.5" +dependencies = [ + "anyhow", + "bitflags 2.13.1", + "bstr", + "datatest-stable", + "drop_bomb", + "get-size2", + "insta", + "itertools 0.15.0", + "memchr", + "ruff_annotate_snippets", + "rustc-hash", + "rustpython-ruff_python_ast", + "rustpython-ruff_python_trivia", + "rustpython-ruff_source_file", + "rustpython-ruff_text_size", + "serde", + "serde_json", + "stacker", + "static_assertions", + "thin-vec", + "unicode-ident", + "unicode-normalization", + "unicode_names2", + "walkdir", +] + +[[package]] +name = "rustpython-ruff_python_trivia" +version = "0.16.5" +dependencies = [ + "itertools 0.15.0", + "rustc-hash", + "rustpython-ruff_source_file", + "rustpython-ruff_text_size", + "unicode-ident", +] + +[[package]] +name = "rustpython-ruff_source_file" +version = "0.16.5" +dependencies = [ + "get-size2", + "memchr", + "rustpython-ruff_text_size", + "serde", +] + +[[package]] +name = "rustpython-ruff_text_size" +version = "0.16.5" +dependencies = [ + "get-size2", + "schemars", + "serde", + "serde_test", + "static_assertions", ] [[package]] name = "rustversion" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" +checksum = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f" [[package]] name = "ryu" -version = "1.0.20" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" +checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f" [[package]] name = "salsa" @@ -3927,7 +3751,7 @@ checksum = "445be2bfbb2f67cb663225ecd7bc5a25370c0250fca30f9d8cbad9a913650370" dependencies = [ "proc-macro2", "quote", - "syn 3.0.3", + "syn 3.0.4", ] [[package]] @@ -3961,7 +3785,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 3.0.3", + "syn 3.0.4", ] [[package]] @@ -3976,12 +3800,6 @@ version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" -[[package]] -name = "semver" -version = "1.0.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2" - [[package]] name = "serde" version = "1.0.229" @@ -4020,7 +3838,7 @@ checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348" dependencies = [ "proc-macro2", "quote", - "syn 3.0.3", + "syn 3.0.4", ] [[package]] @@ -4031,7 +3849,7 @@ checksum = "f852137cce035d6a4df67ccce505ff6b3e9fd3a10e3e52b24dc71e650bb1a9bd" dependencies = [ "proc-macro2", "quote", - "syn 3.0.3", + "syn 3.0.4", ] [[package]] @@ -4065,17 +3883,6 @@ dependencies = [ "serde", ] -[[package]] -name = "sha2" -version = "0.10.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" -dependencies = [ - "cfg-if", - "cpufeatures 0.2.17", - "digest", -] - [[package]] name = "sharded-slab" version = "0.1.7" @@ -4114,18 +3921,18 @@ checksum = "bbbb5d9659141646ae647b42fe094daf6c6192d1620870b449d9557f748b2daa" [[package]] name = "similar" -version = "3.1.2" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85ee016af5d736b69fc89e19254540fa4b5f5492853fb5503920f084011c78b6" +checksum = "4f66ca1f7aca2474dc10c942eb22feffc897735f54cd1db90138c2fddb490987" dependencies = [ "bstr", ] [[package]] name = "siphasher" -version = "1.0.1" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" +checksum = "8ee5873ec9cce0195efcb7a4e9507a04cd49aec9c83d0389df45b1ef7ba2e649" [[package]] name = "slab" @@ -4141,11 +3948,11 @@ checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90" [[package]] name = "snapbox" -version = "1.0.0" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d70a71b68054cbe88708f77abfc4bd2daf75028f8f55f4f1cff63565df89ea" +checksum = "8de56eb4784a2c5c1efede55a0f06fbf481bc12b42b355b9525c15db1e3581a8" dependencies = [ - "anstream 0.6.21", + "anstream", "anstyle", "anstyle-svg", "escargot", @@ -4153,26 +3960,26 @@ dependencies = [ "normalize-line-endings", "os_pipe", "serde_json", - "similar 2.7.0", + "similar 3.2.0", "snapbox-macros", "wait-timeout", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] name = "snapbox-macros" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d248cef42e1456ab2f7149c0376985351b7d849ea9ad2a957bf15ddfebf1fdf9" +checksum = "ed4a172e483585ebbc7c7f7d1705ca7e3f94f606ed78caa14805673189fd5455" dependencies = [ - "anstream 0.6.21", + "anstream", ] [[package]] name = "stable_deref_trait" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" +checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" [[package]] name = "stacker" @@ -4184,7 +3991,7 @@ dependencies = [ "cfg-if", "libc", "psm", - "windows-sys 0.61.0", + "windows-sys 0.61.2", ] [[package]] @@ -4258,9 +4065,9 @@ dependencies = [ [[package]] name = "syn" -version = "3.0.3" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53e9bae58849f64dfa4f5d5ae372c8341f7305f82a3868709269343628b659a3" +checksum = "e6275cddf4610d1775e6d1fe9469b2e77d0f39fd98fb7450901b821e0c53649f" dependencies = [ "proc-macro2", "quote", @@ -4291,10 +4098,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" dependencies = [ "fastrand", - "getrandom 0.4.2", + "getrandom 0.4.3", "once_cell", "rustix", - "windows-sys 0.61.0", + "windows-sys 0.61.2", ] [[package]] @@ -4304,7 +4111,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "230a1b821ccbd75b185820a1f1ff7b14d21da1e442e22c0863ea5f08771a8874" dependencies = [ "rustix", - "windows-sys 0.61.0", + "windows-sys 0.61.2", ] [[package]] @@ -4378,11 +4185,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.19" +version = "2.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09a43598840e33d5b0331f38c5e30d13bb11c11210a4b58f0d9b18a5a5eefcd9" +checksum = "ec86235f5fcc2a73650310756d2ac5b138a5780bbbdfae3eeccec992c435ba4f" dependencies = [ - "thiserror-impl 2.0.19", + "thiserror-impl 2.0.20", ] [[package]] @@ -4398,20 +4205,20 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.19" +version = "2.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43cbfe0cf76104d42a574802844187e84a305e531ed54455f11fbde0f10541cd" +checksum = "bc04cd3e1236dd4a98afca4569f2deb3f120e5422a4023be2cb683f8486292af" dependencies = [ "proc-macro2", "quote", - "syn 3.0.3", + "syn 3.0.4", ] [[package]] name = "thread_local" -version = "1.1.9" +version = "1.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185" +checksum = "1ad99c4c6d32803332c548b1af0540b357b3f5fc0be8f6c6bfe8b2e6ae784070" dependencies = [ "cfg-if", ] @@ -4438,9 +4245,9 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8323304221c2a851516f22236c5722a72eaa19749016521d6dff0824447d96d" +checksum = "b1e27c91459209c2986af3dcf603a5a74a4368754ce37414f59acc971167f643" dependencies = [ "displaydoc", "zerovec", @@ -4458,9 +4265,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.10.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa" +checksum = "bb4ebadaa0af04fab11ae01eb5f9fdb5f9c5b875506e210e71c07873528baa7f" dependencies = [ "tinyvec_macros", ] @@ -4483,7 +4290,7 @@ dependencies = [ "toml_datetime 0.7.5+spec-1.1.0", "toml_parser", "toml_writer", - "winnow 0.7.13", + "winnow 0.7.15", ] [[package]] @@ -4498,7 +4305,7 @@ dependencies = [ "toml_datetime 1.1.1+spec-1.1.0", "toml_parser", "toml_writer", - "winnow 1.0.0", + "winnow 1.0.4", ] [[package]] @@ -4521,14 +4328,14 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.25.12+spec-1.1.0" +version = "0.25.13+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2153edc6955a6c354fad8f5efd38b6a8769bdccf9fe50f8e1329f81b0baa5d7" +checksum = "6975367e4d2ef766d86af01ffad14b622fecc8d4357a998fbc4deb6e9bacaf9b" dependencies = [ "indexmap", "toml_datetime 1.1.1+spec-1.1.0", "toml_parser", - "winnow 1.0.0", + "winnow 1.0.4", ] [[package]] @@ -4537,7 +4344,7 @@ version = "1.1.3+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d38ac1cf9b95face32296c0a3ede1fdc270627c9d9c02a7274dd6d960dc4d56" dependencies = [ - "winnow 1.0.0", + "winnow 1.0.4", ] [[package]] @@ -4654,9 +4461,9 @@ dependencies = [ "regex", "ruff_db", "ruff_diagnostics", - "ruff_python_ast", - "ruff_python_trivia", "ruff_ranged_value", + "rustpython-ruff_python_ast", + "rustpython-ruff_python_trivia", "salsa", "serde", "serde_json", @@ -4683,8 +4490,8 @@ version = "0.0.11" dependencies = [ "ordermap", "ruff_db", - "ruff_python_ast", "ruff_ranged_value", + "rustpython-ruff_python_ast", ] [[package]] @@ -4695,7 +4502,7 @@ dependencies = [ "bstr", "clap", "ruff_db", - "ruff_text_size", + "rustpython-ruff_text_size", "ty_ide", "ty_project", ] @@ -4710,7 +4517,7 @@ dependencies = [ "csv", "regex", "ruff_db", - "ruff_text_size", + "rustpython-ruff_text_size", "serde", "tempfile", "toml 1.1.4+spec-1.1.0", @@ -4737,16 +4544,16 @@ dependencies = [ "ruff_diagnostics", "ruff_index", "ruff_memory_usage", - "ruff_python_ast", "ruff_python_codegen", "ruff_python_importer", "ruff_python_literal", - "ruff_python_parser", "ruff_python_stdlib", - "ruff_python_trivia", - "ruff_source_file", - "ruff_text_size", "rustc-hash", + "rustpython-ruff_python_ast", + "rustpython-ruff_python_parser", + "rustpython-ruff_python_trivia", + "rustpython-ruff_source_file", + "rustpython-ruff_text_size", "salsa", "smallvec", "strum", @@ -4773,14 +4580,14 @@ dependencies = [ "regex-syntax", "ruff_db", "ruff_memory_usage", - "ruff_python_ast", "ruff_python_stdlib", "rustc-hash", + "rustpython-ruff_python_ast", "salsa", "strum", "strum_macros", "tempfile", - "thiserror 2.0.19", + "thiserror 2.0.20", "tracing", "ty_vendored", ] @@ -4810,11 +4617,11 @@ dependencies = [ "ruff_macros", "ruff_memory_usage", "ruff_options_metadata", - "ruff_python_ast", "ruff_python_formatter", "ruff_ranged_value", - "ruff_text_size", "rustc-hash", + "rustpython-ruff_python_ast", + "rustpython-ruff_text_size", "salsa", "schemars", "serde", @@ -4823,7 +4630,7 @@ dependencies = [ "strum", "strum_macros", "tempfile", - "thiserror 2.0.19", + "thiserror 2.0.20", "toml 1.1.4+spec-1.1.0", "tracing", "ty_combine", @@ -4849,11 +4656,11 @@ dependencies = [ "ruff_index", "ruff_macros", "ruff_memory_usage", - "ruff_python_ast", - "ruff_python_parser", - "ruff_python_trivia", - "ruff_text_size", "rustc-hash", + "rustpython-ruff_python_ast", + "rustpython-ruff_python_parser", + "rustpython-ruff_python_trivia", + "rustpython-ruff_text_size", "salsa", "schemars", "serde", @@ -4896,14 +4703,14 @@ dependencies = [ "ruff_index", "ruff_macros", "ruff_memory_usage", - "ruff_python_ast", "ruff_python_literal", - "ruff_python_parser", "ruff_python_stdlib", - "ruff_python_trivia", - "ruff_source_file", - "ruff_text_size", "rustc-hash", + "rustpython-ruff_python_ast", + "rustpython-ruff_python_parser", + "rustpython-ruff_python_trivia", + "rustpython-ruff_source_file", + "rustpython-ruff_text_size", "salsa", "schemars", "serde", @@ -4912,7 +4719,7 @@ dependencies = [ "strum", "strum_macros", "test-case", - "thiserror 2.0.19", + "thiserror 2.0.20", "tracing", "ty_module_resolver", "ty_python_core", @@ -4940,11 +4747,11 @@ dependencies = [ "ruff_diagnostics", "ruff_macros", "ruff_notebook", - "ruff_python_ast", "ruff_ranged_value", - "ruff_source_file", - "ruff_text_size", "rustc-hash", + "rustpython-ruff_python_ast", + "rustpython-ruff_source_file", + "rustpython-ruff_text_size", "salsa", "serde", "serde_json", @@ -4952,7 +4759,7 @@ dependencies = [ "smallvec", "strum", "tempfile", - "thiserror 2.0.19", + "thiserror 2.0.20", "tracing", "tracing-subscriber", "ty_combine", @@ -4973,10 +4780,10 @@ dependencies = [ "indexmap", "ruff_annotate_snippets", "ruff_db", - "ruff_python_ast", - "ruff_python_trivia", - "ruff_source_file", - "ruff_text_size", + "rustpython-ruff_python_ast", + "rustpython-ruff_python_trivia", + "rustpython-ruff_source_file", + "rustpython-ruff_text_size", "strum", "strum_macros", "tempfile", @@ -5002,9 +4809,9 @@ dependencies = [ "ruff_db", "ruff_diagnostics", "ruff_notebook", - "ruff_python_ast", - "ruff_python_trivia", - "ruff_source_file", + "rustpython-ruff_python_ast", + "rustpython-ruff_python_trivia", + "rustpython-ruff_source_file", "salsa", "serde", "tempfile", @@ -5040,8 +4847,8 @@ dependencies = [ "ruff_notebook", "ruff_python_formatter", "ruff_ranged_value", - "ruff_source_file", - "ruff_text_size", + "rustpython-ruff_source_file", + "rustpython-ruff_text_size", "serde-wasm-bindgen", "tracing", "ty_ide", @@ -5070,12 +4877,6 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c" -[[package]] -name = "typenum" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f" - [[package]] name = "ucd-trie" version = "0.1.7" @@ -5096,9 +4897,9 @@ checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" [[package]] name = "unicode-normalization" -version = "0.1.24" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" +checksum = "5fd4f6878c9cb28d874b009da9e8d183b5abc80117c40bbd187a1fde336be6e8" dependencies = [ "tinyvec", ] @@ -5109,12 +4910,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254" -[[package]] -name = "unicode-xid" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" - [[package]] name = "unicode_names2" version = "1.3.0" @@ -5134,14 +4929,14 @@ dependencies = [ "getopts", "log", "phf_codegen", - "rand 0.8.5", + "rand 0.8.8", ] [[package]] name = "unit-prefix" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "323402cff2dd658f39ca17c789b502021b3f18707c91cdf22e3838e1b4023817" +checksum = "81e544489bf3d8ef66c953931f56617f423cd4b5494be343d9b9d3dda037b9a3" [[package]] name = "unscanny" @@ -5168,12 +4963,6 @@ version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" -[[package]] -name = "utf8-width" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" - [[package]] name = "utf8_iter" version = "1.0.4" @@ -5188,9 +4977,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.24.0" +version = "1.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf3923a6f5c4c6382e0b653c4117f48d631ea17f38ed86e2a828e6f7412f5239" +checksum = "b5772d71c9be8a8a6ac2117d949c5b224c1b72241bb611d9a3012edcf8af7812" dependencies = [ "js-sys", "wasm-bindgen", @@ -5204,19 +4993,13 @@ checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65" [[package]] name = "version-ranges" -version = "0.1.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8d079415ceb2be83fc355adbadafe401307d5c309c7e6ade6638e6f9f42f42d" +checksum = "31e9bd4e9c9ff6a2a9b5969462ba26216af3e010df0377dad8320ab515262ef8" dependencies = [ "smallvec", ] -[[package]] -name = "version_check" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" - [[package]] name = "vt100" version = "0.16.2" @@ -5272,29 +5055,11 @@ version = "0.11.1+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" -[[package]] -name = "wasip2" -version = "1.0.1+wasi-0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" -dependencies = [ - "wit-bindgen 0.46.0", -] - -[[package]] -name = "wasip3" -version = "0.4.0+wasi-0.3.0-rc-2026-01-06" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5" -dependencies = [ - "wit-bindgen 0.51.0", -] - [[package]] name = "wasm-bindgen" -version = "0.2.123" +version = "0.2.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a254a4b10c19a76f09a27640e7ffbf9bc30bf67e16a3bf28aaefa4920fe81563" +checksum = "1b70935747edd64d89de3efa29d73789b806c15798f8e7dca4d8ac356b50ce70" dependencies = [ "cfg-if", "once_cell", @@ -5305,9 +5070,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.73" +version = "0.4.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54568702fabf5d4849ce2b90fadfa64168a097eaf4b351ce9df8b687a0086aaf" +checksum = "6b7777d5cc23d0e91404e53ce2d5e8ec7acae3026b16233dba62cd3246457950" dependencies = [ "js-sys", "wasm-bindgen", @@ -5315,9 +5080,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.123" +version = "0.2.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24a40fc75b0ec6f3746ceb10d36f53a93dcd68a93b11b6445983945d79eba0dc" +checksum = "77775f8f3f7217702089053b94958f8f54061a3f663417df76e19cbdcca29bc1" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5325,9 +5090,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.123" +version = "0.2.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "908f34bd9b9ce3d4caf07b72dfab63d61504d156856c6bd3cd87fa350cf3985b" +checksum = "e11d33f857dc2fb11b8bc75aee111aa9cbeb12cd9f25efd3d4c2a3dd4e235284" dependencies = [ "bumpalo", "proc-macro2", @@ -5338,18 +5103,18 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.123" +version = "0.2.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7acbf7616c27b194bbb550bf77ed0c2c3e5b7fd1260a93082b95fb7f47959b92" +checksum = "7ef64dbcc55df09c7e5a46182d181c2cfa3e925f3da937ea764728b4bbb9dcbf" dependencies = [ "unicode-ident", ] [[package]] name = "wasm-bindgen-test" -version = "0.3.73" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28a0782b173cf2e98f62aacb487c5c021b7c5925df46098675f28e1fa85e159" +checksum = "895a2607575412a4eda1df892084a375ea10dfeadc4d7d2ab87b854e4ddc7ba1" dependencies = [ "async-trait", "cast", @@ -5369,9 +5134,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-test-macro" -version = "0.3.73" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee997551ce1ad5adda03f7ce37ec34b4140fe9f547fd07b46d55901d1ba1a06b" +checksum = "4288cb0ebe215033bf949ae1fd046726daa4c32a157f24b9dc6ac387a52aa759" dependencies = [ "proc-macro2", "quote", @@ -5380,49 +5145,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-test-shared" -version = "0.2.123" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae0f005eb61f765eff31a79ef71df7e21819731268a868df41192c1e41d6d3e5" - -[[package]] -name = "wasm-encoder" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319" -dependencies = [ - "leb128fmt", - "wasmparser", -] - -[[package]] -name = "wasm-metadata" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909" -dependencies = [ - "anyhow", - "indexmap", - "wasm-encoder", - "wasmparser", -] - -[[package]] -name = "wasmparser" -version = "0.244.0" +version = "0.2.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" -dependencies = [ - "bitflags 2.13.1", - "hashbrown 0.15.5", - "indexmap", - "semver", -] +checksum = "33ff1c1b360982e93b6d8ea9c04836f71dba0817a16f91e229cf3a51bdd9d987" [[package]] name = "web-sys" -version = "0.3.100" +version = "0.3.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0871acf327f283dc6da28a1696cdc64fb355ba9f935d052021fa77f35cce69" +checksum = "c435338968042f4f59a557f690a253676d47ce13ceb55d70100e7facf6620a30" dependencies = [ "js-sys", "wasm-bindgen", @@ -5440,9 +5171,9 @@ dependencies = [ [[package]] name = "which" -version = "8.0.5" +version = "8.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3ef584124b911bcc3875c2f1472e80f24361ceb789bd1c62b3e9a3df9ff43c" +checksum = "bae2f2b2b816647a1cab1acc91f5bd20812d53cb344382635ec2181940c8034f" dependencies = [ "libc", ] @@ -5478,7 +5209,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.61.0", + "windows-sys 0.61.2", ] [[package]] @@ -5489,22 +5220,22 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-core" -version = "0.62.0" +version = "0.62.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57fe7168f7de578d2d8a05b07fd61870d2e73b4020e9f49aa00da8471723497c" +checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" dependencies = [ "windows-implement", "windows-interface", - "windows-link 0.2.1", + "windows-link", "windows-result", "windows-strings", ] [[package]] name = "windows-implement" -version = "0.60.0" +version = "0.60.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" +checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote", @@ -5513,21 +5244,15 @@ dependencies = [ [[package]] name = "windows-interface" -version = "0.59.1" +version = "0.59.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" +checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote", "syn 2.0.119", ] -[[package]] -name = "windows-link" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" - [[package]] name = "windows-link" version = "0.2.1" @@ -5536,38 +5261,20 @@ checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" [[package]] name = "windows-result" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7084dcc306f89883455a206237404d3eaf961e5bd7e0f312f7c91f57eb44167f" +checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" dependencies = [ - "windows-link 0.2.1", + "windows-link", ] [[package]] name = "windows-strings" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7218c655a553b0bed4426cf54b20d7ba363ef543b52d515b3e48d7fd55318dda" -dependencies = [ - "windows-link 0.2.1", -] - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.59.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" dependencies = [ - "windows-targets 0.52.6", + "windows-link", ] [[package]] @@ -5576,261 +5283,103 @@ version = "0.60.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" dependencies = [ - "windows-targets 0.53.3", + "windows-targets", ] [[package]] name = "windows-sys" -version = "0.61.0" +version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e201184e40b2ede64bc2ea34968b28e33622acdbbf37104f0e4a33f7abe657aa" +checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" dependencies = [ - "windows-link 0.2.1", + "windows-link", ] [[package]] name = "windows-targets" -version = "0.52.6" +version = "0.53.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm 0.52.6", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", -] - -[[package]] -name = "windows-targets" -version = "0.53.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91" -dependencies = [ - "windows-link 0.1.3", - "windows_aarch64_gnullvm 0.53.0", - "windows_aarch64_msvc 0.53.0", - "windows_i686_gnu 0.53.0", - "windows_i686_gnullvm 0.53.0", - "windows_i686_msvc 0.53.0", - "windows_x86_64_gnu 0.53.0", - "windows_x86_64_gnullvm 0.53.0", - "windows_x86_64_msvc 0.53.0", + "windows-link", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.6" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" +checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" [[package]] name = "windows_aarch64_msvc" -version = "0.52.6" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" +checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" [[package]] name = "windows_i686_gnu" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3" +checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" [[package]] name = "windows_i686_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.6" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" [[package]] name = "windows_i686_msvc" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" +checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" [[package]] name = "windows_x86_64_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.6" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" +checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" [[package]] name = "windows_x86_64_gnullvm" -version = "0.53.0" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" +checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" [[package]] name = "windows_x86_64_msvc" -version = "0.52.6" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" +checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" [[package]] name = "winnow" -version = "0.7.13" +version = "0.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf" +checksum = "df79d97927682d2fd8adb29682d1140b343be4ac0f08fd68b7765d9c059d3945" [[package]] name = "winnow" -version = "1.0.0" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a90e88e4667264a994d34e6d1ab2d26d398dcdca8b7f52bec8668957517fc7d8" +checksum = "23b97319f7b8343df12cc98938e5c3eb436064524c8d2b4e30a1d3a36eecdf81" dependencies = [ "memchr", ] -[[package]] -name = "wit-bindgen" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" - -[[package]] -name = "wit-bindgen" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" -dependencies = [ - "wit-bindgen-rust-macro", -] - -[[package]] -name = "wit-bindgen-core" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc" -dependencies = [ - "anyhow", - "heck", - "wit-parser", -] - -[[package]] -name = "wit-bindgen-rust" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21" -dependencies = [ - "anyhow", - "heck", - "indexmap", - "prettyplease", - "syn 2.0.119", - "wasm-metadata", - "wit-bindgen-core", - "wit-component", -] - -[[package]] -name = "wit-bindgen-rust-macro" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a" -dependencies = [ - "anyhow", - "prettyplease", - "proc-macro2", - "quote", - "syn 2.0.119", - "wit-bindgen-core", - "wit-bindgen-rust", -] - -[[package]] -name = "wit-component" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" -dependencies = [ - "anyhow", - "bitflags 2.13.1", - "indexmap", - "log", - "serde", - "serde_derive", - "serde_json", - "wasm-encoder", - "wasm-metadata", - "wasmparser", - "wit-parser", -] - -[[package]] -name = "wit-parser" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736" -dependencies = [ - "anyhow", - "id-arena", - "indexmap", - "log", - "semver", - "serde", - "serde_derive", - "serde_json", - "unicode-xid", - "wasmparser", -] - [[package]] name = "writeable" -version = "0.6.2" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9" +checksum = "3ad82d2a33cdc9674dc7465672f271e096168fcdbe0f799d9e6db8c5892679dc" [[package]] name = "wyz" @@ -5849,9 +5398,9 @@ checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" [[package]] name = "yoke" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abe8c5fda708d9ca3df187cae8bfb9ceda00dd96231bed36e445a1a48e66f9ca" +checksum = "709fe23a0424b6a435d82152b1bd3fdfb0833487d5fa90d05d42762a9891fef5" dependencies = [ "stable_deref_trait", "yoke-derive", @@ -5872,18 +5421,18 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.8.27" +version = "0.8.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c" +checksum = "556764e583adb45a9f8d413c2a147fa7e8d821e48e12b14fd560b607998b75eb" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.27" +version = "0.8.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831" +checksum = "f2ab42fc20575779bd240faa45f94a74256f755c0fa9e89f0ede20d91d0cdfc1" dependencies = [ "proc-macro2", "quote", @@ -5892,18 +5441,18 @@ dependencies = [ [[package]] name = "zerofrom" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5" +checksum = "0ec05a11813ea801ff6d75110ad09cd0824ddba17dfe17128ea0d5f68e6c5272" dependencies = [ "zerofrom-derive", ] [[package]] name = "zerofrom-derive" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" +checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1" dependencies = [ "proc-macro2", "quote", @@ -5913,9 +5462,9 @@ dependencies = [ [[package]] name = "zerotrie" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f9152d31db0792fa83f70fb2f83148effb5c1f5b8c7686c3459e361d9bc20bf" +checksum = "4ea269c3bd32f0a32c321907a2ae912ba6f4649bb0fc764a15627e99a7095a3f" dependencies = [ "displaydoc", "yoke", @@ -5924,9 +5473,9 @@ dependencies = [ [[package]] name = "zerovec" -version = "0.11.6" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90f911cbc359ab6af17377d242225f4d75119aec87ea711a880987b18cd7b239" +checksum = "bb0464e17806c1d976d5cba29399c7f08e516e279e2ba493f63123b5fca67dd8" dependencies = [ "yoke", "zerofrom", @@ -5935,13 +5484,13 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.11.3" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555" +checksum = "34df6fc39dbd26ddc9c10e6a2984476e13acce22e64e4487636ef494369225da" dependencies = [ "proc-macro2", "quote", - "syn 2.0.119", + "syn 3.0.4", ] [[package]] @@ -5960,15 +5509,15 @@ dependencies = [ [[package]] name = "zlib-rs" -version = "0.5.5" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40990edd51aae2c2b6907af74ffb635029d5788228222c4bb811e9351c0caad3" +checksum = "34b31d188d9d685a4f9c7b46d6e36631b07058d2cfe190267adce54dc230bf12" [[package]] name = "zmij" -version = "1.0.10" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e0d8dffbae3d840f64bda38e28391faef673a7b5a6017840f2a106c8145868" +checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b" [[package]] name = "zstd" diff --git a/Cargo.toml b/Cargo.toml index 2e809b607964d..547710c7ad79f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,21 +28,21 @@ ruff_markdown = { version = "0.0.11", path = "crates/ruff_markdown" } ruff_memory_usage = { version = "0.0.11", path = "crates/ruff_memory_usage" } ruff_notebook = { version = "0.0.11", path = "crates/ruff_notebook" } ruff_options_metadata = { version = "0.0.11", path = "crates/ruff_options_metadata" } -ruff_python_ast = { version = "0.0.11", path = "crates/ruff_python_ast" } +ruff_python_ast = { package = "rustpython-ruff_python_ast", version = "0.16.5", path = "crates/ruff_python_ast" } ruff_python_codegen = { version = "0.0.11", path = "crates/ruff_python_codegen" } ruff_python_formatter = { version = "0.0.11", path = "crates/ruff_python_formatter" } ruff_python_importer = { version = "0.0.11", path = "crates/ruff_python_importer" } ruff_python_index = { version = "0.0.11", path = "crates/ruff_python_index" } ruff_python_literal = { version = "0.0.11", path = "crates/ruff_python_literal" } -ruff_python_parser = { version = "0.0.11", path = "crates/ruff_python_parser" } +ruff_python_parser = { package = "rustpython-ruff_python_parser", version = "0.16.5", path = "crates/ruff_python_parser" } ruff_python_semantic = { version = "0.0.11", path = "crates/ruff_python_semantic" } ruff_python_stdlib = { version = "0.0.11", path = "crates/ruff_python_stdlib" } -ruff_python_trivia = { version = "0.0.11", path = "crates/ruff_python_trivia" } +ruff_python_trivia = { package = "rustpython-ruff_python_trivia", version = "0.16.5", path = "crates/ruff_python_trivia" } ruff_server = { version = "0.0.11", path = "crates/ruff_server" } -ruff_source_file = { version = "0.0.11", path = "crates/ruff_source_file" } +ruff_source_file = { package = "rustpython-ruff_source_file", version = "0.16.5", path = "crates/ruff_source_file" } ruff_mdtest = { path = "crates/ruff_mdtest" } ruff_ranged_value = { version = "0.0.11", path = "crates/ruff_ranged_value" } -ruff_text_size = { version = "0.0.11", path = "crates/ruff_text_size" } +ruff_text_size = { package = "rustpython-ruff_text_size", version = "0.16.5", path = "crates/ruff_text_size" } ruff_workspace = { version = "0.0.11", path = "crates/ruff_workspace" } ty = { path = "crates/ty" } @@ -291,9 +291,9 @@ codegen-units = 16 # Some crates don't change as much but benefit more from # more expensive optimization passes, so we selectively # decrease codegen-units in some cases. -[profile.release.package.ruff_python_parser] +[profile.release.package.rustpython-ruff_python_parser] codegen-units = 1 -[profile.release.package.ruff_python_ast] +[profile.release.package.rustpython-ruff_python_ast] codegen-units = 1 [profile.release.package.salsa] codegen-units = 1 @@ -321,7 +321,7 @@ opt-level = 3 # Reduce complexity of a parser function that would trigger a locals limit in a wasm tool. # https://github.com/bytecodealliance/wasm-tools/blob/b5c3d98e40590512a3b12470ef358d5c7b983b15/crates/wasmparser/src/limits.rs#L29 -[profile.dev.package.ruff_python_parser] +[profile.dev.package.rustpython-ruff_python_parser] opt-level = 1 # This profile is meant to mimic the `release` profile as closely as diff --git a/crates/ruff_graph/src/collector.rs b/crates/ruff_graph/src/collector.rs index 7d8aae3a6345c..24bd8569ab3c2 100644 --- a/crates/ruff_graph/src/collector.rs +++ b/crates/ruff_graph/src/collector.rs @@ -49,6 +49,7 @@ impl<'ast> SourceOrderVisitor<'ast> for Collector<'_> { is_lazy: _, range: _, node_index: _, + runtime_level: _, }) => { let module = module.as_deref(); let level = *level; @@ -106,6 +107,7 @@ impl<'ast> SourceOrderVisitor<'ast> for Collector<'_> { elif_else_clauses, range: _, node_index: _, + runtime_body: _, }) => { // Skip TYPE_CHECKING blocks if not requested if self.type_checking_imports || !is_type_checking_condition(test) { diff --git a/crates/ruff_linter/src/checkers/ast/analyze/except_handler.rs b/crates/ruff_linter/src/checkers/ast/analyze/except_handler.rs index fd8bed0e29991..bc43ca2947e5b 100644 --- a/crates/ruff_linter/src/checkers/ast/analyze/except_handler.rs +++ b/crates/ruff_linter/src/checkers/ast/analyze/except_handler.rs @@ -16,6 +16,7 @@ pub(crate) fn except_handler(except_handler: &ExceptHandler, checker: &Checker) body, range: _, node_index: _, + runtime_body: _, }) => { if checker.is_rule_enabled(Rule::BareExcept) { pycodestyle::rules::bare_except(checker, type_.as_deref(), body, except_handler); diff --git a/crates/ruff_linter/src/checkers/ast/analyze/expression.rs b/crates/ruff_linter/src/checkers/ast/analyze/expression.rs index d30f5911b2bad..316113456ad84 100644 --- a/crates/ruff_linter/src/checkers/ast/analyze/expression.rs +++ b/crates/ruff_linter/src/checkers/ast/analyze/expression.rs @@ -206,12 +206,14 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) { range: _, node_index: _, parenthesized: _, + runtime_elts: _, }) | Expr::List(ast::ExprList { elts, ctx, range: _, node_index: _, + runtime_elts: _, }) => { if checker.is_rule_enabled(Rule::ImplicitStringConcatenationInCollectionLiteral) { flake8_implicit_str_concat::rules::implicit_string_concatenation_in_collection_literal( @@ -538,6 +540,8 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) { keywords, range: _, node_index: _, + runtime_args: _, + runtime_bases: _, }, range_start: _, node_index: _, @@ -1651,6 +1655,7 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) { comparators, range: _, node_index: _, + runtime_comparators: _, }, ) => { if checker.any_rule_enabled(&[Rule::NoneComparison, Rule::TrueFalseComparison]) { diff --git a/crates/ruff_linter/src/checkers/ast/analyze/statement.rs b/crates/ruff_linter/src/checkers/ast/analyze/statement.rs index 1d007eea2d9ee..174b451064cb8 100644 --- a/crates/ruff_linter/src/checkers/ast/analyze/statement.rs +++ b/crates/ruff_linter/src/checkers/ast/analyze/statement.rs @@ -59,6 +59,10 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) { type_params: _, range: _, node_index: _, + runtime_decorator_list: _, + runtime_type_comment: _, + runtime_type_comment_bytes: _, + runtime_body: _, }, ) => { if checker.is_rule_enabled(Rule::DjangoNonLeadingReceiverDecorator) { @@ -387,6 +391,8 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) { body, range: _, node_index: _, + runtime_decorator_list: _, + runtime_body: _, }, ) => { if checker.is_rule_enabled(Rule::NoClassmethodDecorator) { @@ -715,6 +721,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) { is_lazy: _, range: _, node_index: _, + runtime_level: _, }, ) => { let level = *level; @@ -1255,6 +1262,10 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) { is_async, range: _, node_index: _, + runtime_type_comment: _, + runtime_type_comment_bytes: _, + runtime_body: _, + runtime_orelse: _, }, ) => { if checker.is_rule_enabled(Rule::TooManyNestedBlocks) { @@ -1632,6 +1643,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) { targets, range: _, node_index: _, + runtime_targets: _, }, ) => { if checker.is_rule_enabled(Rule::GlobalStatement) { diff --git a/crates/ruff_linter/src/checkers/ast/mod.rs b/crates/ruff_linter/src/checkers/ast/mod.rs index 7b77bde0cb356..ed508a96f0e09 100644 --- a/crates/ruff_linter/src/checkers/ast/mod.rs +++ b/crates/ruff_linter/src/checkers/ast/mod.rs @@ -1137,6 +1137,7 @@ impl<'a> Visitor<'a> for Checker<'a> { is_lazy, range: _, node_index: _, + runtime_level: _, }) => { if self.semantic.at_top_level() { self.importer.visit_import(stmt); @@ -1581,6 +1582,9 @@ impl<'a> Visitor<'a> for Checker<'a> { is_async: _, range: _, node_index: _, + runtime_type_comment: _, + runtime_type_comment_bytes: _, + runtime_body: _, }) => { for item in items { self.visit_with_item(item); @@ -1595,6 +1599,8 @@ impl<'a> Visitor<'a> for Checker<'a> { orelse, range: _, node_index: _, + runtime_body: _, + runtime_orelse: _, }) => { self.visit_boolean_test(test); self.visit_body(body); @@ -1611,6 +1617,10 @@ impl<'a> Visitor<'a> for Checker<'a> { iter, body, orelse, + runtime_type_comment: _, + runtime_type_comment_bytes: _, + runtime_body: _, + runtime_orelse: _, }) => { self.visit_expr(iter); self.visit_expr(target); @@ -1627,6 +1637,7 @@ impl<'a> Visitor<'a> for Checker<'a> { elif_else_clauses, range: _, node_index: _, + runtime_body: _, }, ) => { self.visit_boolean_test(test); @@ -2079,6 +2090,7 @@ impl<'a> Visitor<'a> for Checker<'a> { items, range: _, node_index: _, + runtime_values: _, }) = arg { for ast::DictItem { key, value } in items { @@ -2189,6 +2201,7 @@ impl<'a> Visitor<'a> for Checker<'a> { range: _, node_index: _, parenthesized: _, + runtime_elts: _, }) = slice.as_ref() { let mut iter = elts.iter(); @@ -2216,6 +2229,7 @@ impl<'a> Visitor<'a> for Checker<'a> { items, range: _, node_index: _, + runtime_values: _, }) = slice.as_ref() { for item in items { @@ -2307,6 +2321,7 @@ impl<'a> Visitor<'a> for Checker<'a> { body: _, range: _, node_index: _, + runtime_body: _, }) => { if let Some(name) = name { // Store the existing binding, if any. diff --git a/crates/ruff_linter/src/importer/mod.rs b/crates/ruff_linter/src/importer/mod.rs index 3387a79a9644e..858945e00218e 100644 --- a/crates/ruff_linter/src/importer/mod.rs +++ b/crates/ruff_linter/src/importer/mod.rs @@ -468,6 +468,7 @@ impl<'a> Importer<'a> { is_lazy: _, range: _, node_index: _, + runtime_level: _, }) = stmt { if *level == 0 diff --git a/crates/ruff_linter/src/rules/airflow/rules/runtime_value_in_dag_or_task.rs b/crates/ruff_linter/src/rules/airflow/rules/runtime_value_in_dag_or_task.rs index 3daf2ef7b663d..b4de9e03c2a2a 100644 --- a/crates/ruff_linter/src/rules/airflow/rules/runtime_value_in_dag_or_task.rs +++ b/crates/ruff_linter/src/rules/airflow/rules/runtime_value_in_dag_or_task.rs @@ -268,6 +268,7 @@ fn find_runtime_varying_call<'a>( | Expr::BooleanLiteral(_) | Expr::NoneLiteral(_) | Expr::EllipsisLiteral(_) + | Expr::Constant(_) | Expr::IpyEscapeCommand(_) => None, } } diff --git a/crates/ruff_linter/src/rules/flake8_annotations/rules/definition.rs b/crates/ruff_linter/src/rules/flake8_annotations/rules/definition.rs index eb750c1269fe6..9ab8962d93a49 100644 --- a/crates/ruff_linter/src/rules/flake8_annotations/rules/definition.rs +++ b/crates/ruff_linter/src/rules/flake8_annotations/rules/definition.rs @@ -649,6 +649,10 @@ pub(crate) fn definition( parameters, returns, body, + runtime_decorator_list: _, + runtime_type_comment: _, + runtime_type_comment_bytes: _, + runtime_body: _, } = function; let is_method = definition.is_method(); diff --git a/crates/ruff_linter/src/rules/flake8_bandit/rules/hardcoded_sql_expression.rs b/crates/ruff_linter/src/rules/flake8_bandit/rules/hardcoded_sql_expression.rs index 1e002c7956f52..d81b5af08efe8 100644 --- a/crates/ruff_linter/src/rules/flake8_bandit/rules/hardcoded_sql_expression.rs +++ b/crates/ruff_linter/src/rules/flake8_bandit/rules/hardcoded_sql_expression.rs @@ -184,6 +184,7 @@ fn is_explicit_concatenation(expr: &Expr) -> Option { Expr::BytesLiteral(_) => Some(false), Expr::NoneLiteral(_) => Some(false), Expr::IpyEscapeCommand(_) => Some(false), + Expr::Constant(_) => None, // Conditionally strings. Expr::Named(ast::ExprNamed { value, .. }) => is_explicit_concatenation(value), diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/assert_false.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/assert_false.rs index 7a2d0d25fd069..36c4bea8d9518 100644 --- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/assert_false.rs +++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/assert_false.rs @@ -71,6 +71,8 @@ fn assertion_error(msg: Option<&Expr>) -> Stmt { keywords: std::iter::empty().collect(), range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_args: None, + runtime_bases: None, }, range_start: ruff_text_size::TextSize::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/delattr_with_constant.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/delattr_with_constant.rs index 0150b672d351b..4d319df637d24 100644 --- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/delattr_with_constant.rs +++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/delattr_with_constant.rs @@ -124,6 +124,7 @@ fn generate_del_statement(obj: &Expr, attr_name: &str, generator: Generator) -> })], range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_targets: None, }); generator.stmt(&stmt) } diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/duplicate_exceptions.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/duplicate_exceptions.rs index c38fc1ecbb537..90ec02f9be62b 100644 --- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/duplicate_exceptions.rs +++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/duplicate_exceptions.rs @@ -121,6 +121,7 @@ fn type_pattern(elts: Vec<&Expr>) -> Expr { range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, parenthesized: true, + runtime_elts: None, } .into() } diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/loop_iterator_mutation.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/loop_iterator_mutation.rs index 84b6e95119e3e..b308769dfbc7c 100644 --- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/loop_iterator_mutation.rs +++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/loop_iterator_mutation.rs @@ -64,6 +64,10 @@ pub(crate) fn loop_iterator_mutation(checker: &Checker, stmt_for: &StmtFor) { is_async: _, range: _, node_index: _, + runtime_type_comment: _, + runtime_type_comment_bytes: _, + runtime_body: _, + runtime_orelse: _, } = stmt_for; let (index, target, iter) = match iter.as_ref() { @@ -343,6 +347,7 @@ impl<'a> Visitor<'a> for LoopMutationsVisitor<'a> { range, targets, node_index: _, + runtime_targets: _, }) => { self.handle_delete(*range, targets); visitor::walk_stmt(self, stmt); diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/reuse_of_groupby_generator.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/reuse_of_groupby_generator.rs index 2dada45a491d7..c047c9c6b0431 100644 --- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/reuse_of_groupby_generator.rs +++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/reuse_of_groupby_generator.rs @@ -158,6 +158,7 @@ impl<'a> Visitor<'a> for GroupNameFinder<'a> { elif_else_clauses, range: _, node_index: _, + runtime_body: _, }) => { // base if plus branches let mut if_stack = Vec::with_capacity(1 + elif_else_clauses.len()); diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/rules/setattr_with_constant.rs b/crates/ruff_linter/src/rules/flake8_bugbear/rules/setattr_with_constant.rs index 05cf844aa3be2..2bef9f8d6adc0 100644 --- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/setattr_with_constant.rs +++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/setattr_with_constant.rs @@ -81,6 +81,9 @@ fn assignment(obj: &Expr, name: &str, value: &Expr, generator: Generator) -> Str value: Box::new(value.clone()), range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }); generator.stmt(&stmt) } diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_dict_comprehension_for_iterable.rs b/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_dict_comprehension_for_iterable.rs index 9fa54fba23f9a..b1059fe3c2abc 100644 --- a/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_dict_comprehension_for_iterable.rs +++ b/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_dict_comprehension_for_iterable.rs @@ -216,6 +216,8 @@ fn fix_unnecessary_dict_comprehension(value: &Expr, generator: &Comprehension) - keywords: std::iter::empty().collect(), range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_args: None, + runtime_bases: None, }; Expr::Call(ExprCall { func: Box::new(Expr::Name(ExprName { diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_list_call.rs b/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_list_call.rs index 15f44a61c2c01..2ebde1e3076af 100644 --- a/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_list_call.rs +++ b/crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_list_call.rs @@ -68,6 +68,8 @@ pub(crate) fn unnecessary_list_call(checker: &Checker, expr: &Expr, call: &ExprC node_index: _, args, keywords: _, + runtime_args: _, + runtime_bases: _, } = arguments; let Some(argument) = helpers::first_argument_with_matching_function("list", func, args) else { diff --git a/crates/ruff_linter/src/rules/flake8_pie/rules/multiple_starts_ends_with.rs b/crates/ruff_linter/src/rules/flake8_pie/rules/multiple_starts_ends_with.rs index 807d076c520e7..60698b02d2fa5 100644 --- a/crates/ruff_linter/src/rules/flake8_pie/rules/multiple_starts_ends_with.rs +++ b/crates/ruff_linter/src/rules/flake8_pie/rules/multiple_starts_ends_with.rs @@ -75,6 +75,7 @@ pub(crate) fn multiple_starts_ends_with(checker: &Checker, expr: &Expr) { values, range: _, node_index: _, + runtime_values: _, }) = expr else { return; @@ -90,6 +91,8 @@ pub(crate) fn multiple_starts_ends_with(checker: &Checker, expr: &Expr) { keywords, range: _, node_index: _, + runtime_args: _, + runtime_bases: _, }, range_start: _, node_index: _, @@ -151,6 +154,8 @@ pub(crate) fn multiple_starts_ends_with(checker: &Checker, expr: &Expr) { keywords: _, range: _, node_index: _, + runtime_args: _, + runtime_bases: _, }, range_start: _, node_index: _, @@ -182,6 +187,7 @@ pub(crate) fn multiple_starts_ends_with(checker: &Checker, expr: &Expr) { range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, parenthesized: true, + runtime_elts: None, }); let node1 = Expr::Name(ast::ExprName { id: arg_name.into(), @@ -203,6 +209,8 @@ pub(crate) fn multiple_starts_ends_with(checker: &Checker, expr: &Expr) { keywords: std::iter::empty().collect(), range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_args: None, + runtime_bases: None, }, range_start: ruff_text_size::TextSize::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, @@ -226,6 +234,7 @@ pub(crate) fn multiple_starts_ends_with(checker: &Checker, expr: &Expr) { .collect(), range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_values: None, }); let bool_op = node; diagnostic.set_fix(Fix::unsafe_edit(Edit::range_replacement( diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/duplicate_literal_member.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/duplicate_literal_member.rs index daf5731a84384..98f3a9eb82bc7 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/rules/duplicate_literal_member.rs +++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/duplicate_literal_member.rs @@ -97,6 +97,7 @@ pub(crate) fn duplicate_literal_member<'a>(checker: &Checker, expr: &'a Expr) { node_index: ruff_python_ast::AtomicNodeIndex::NONE, ctx: ExprContext::Load, parenthesized: false, + runtime_elts: None, }) }), value: subscript.value.clone(), diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/exit_annotations.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/exit_annotations.rs index a11c30ecef088..a754d0ae48afb 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/rules/exit_annotations.rs +++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/exit_annotations.rs @@ -355,6 +355,7 @@ fn check_positional_args_for_overloaded_method( vararg: None, kwonlyargs, kwarg: None, + runtime_defaults: _, } = &**parameters else { return; diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/mod.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/mod.rs index 88346d95fc020..6468f795790ac 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/rules/mod.rs +++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/mod.rs @@ -146,6 +146,7 @@ fn generate_union_fix( node_index: ruff_python_ast::AtomicNodeIndex::NONE, ctx: ExprContext::Load, parenthesized: false, + runtime_elts: None, })), ctx: ExprContext::Load, }); diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/redundant_none_literal.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/redundant_none_literal.rs index 50d4b5ad2787a..2707853bb27fd 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/rules/redundant_none_literal.rs +++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/redundant_none_literal.rs @@ -224,6 +224,7 @@ fn create_fix( node_index: ruff_python_ast::AtomicNodeIndex::NONE, ctx: ExprContext::Load, parenthesized: true, + runtime_elts: None, }) } else { literal_elements[0].clone() diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/simple_defaults.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/simple_defaults.rs index 729e8cfadebee..65a927cd3e0b6 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/rules/simple_defaults.rs +++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/simple_defaults.rs @@ -311,6 +311,7 @@ fn is_valid_default_value_with_annotation( elts, range: _, node_index: _, + runtime_elts: _, }) => { return allow_container && elts.len() <= 10 diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/unnecessary_literal_union.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/unnecessary_literal_union.rs index 5effecb53e26f..ab80332884f8a 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/rules/unnecessary_literal_union.rs +++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/unnecessary_literal_union.rs @@ -145,6 +145,7 @@ pub(crate) fn unnecessary_literal_union<'a>(checker: &Checker, expr: &'a Expr) { node_index: ruff_python_ast::AtomicNodeIndex::NONE, ctx: ExprContext::Load, parenthesized: true, + runtime_elts: None, })), range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, @@ -169,6 +170,7 @@ pub(crate) fn unnecessary_literal_union<'a>(checker: &Checker, expr: &'a Expr) { node_index: ruff_python_ast::AtomicNodeIndex::NONE, ctx: ExprContext::Load, parenthesized: true, + runtime_elts: None, })), range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/unnecessary_type_union.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/unnecessary_type_union.rs index 2d81d84a3e764..308c07063a33c 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/rules/unnecessary_type_union.rs +++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/unnecessary_type_union.rs @@ -181,6 +181,7 @@ pub(crate) fn unnecessary_type_union<'a>(checker: &Checker, union: &'a Expr) { range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, parenthesized: true, + runtime_elts: None, })), ctx: ExprContext::Load, range: TextRange::default(), @@ -206,6 +207,7 @@ pub(crate) fn unnecessary_type_union<'a>(checker: &Checker, union: &'a Expr) { range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, parenthesized: true, + runtime_elts: None, })), ctx: ExprContext::Load, range: TextRange::default(), diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/rules/assertion.rs b/crates/ruff_linter/src/rules/flake8_pytest_style/rules/assertion.rs index 1eb73a034e07a..9982a19ef8eb2 100644 --- a/crates/ruff_linter/src/rules/flake8_pytest_style/rules/assertion.rs +++ b/crates/ruff_linter/src/rules/flake8_pytest_style/rules/assertion.rs @@ -649,6 +649,7 @@ fn is_composite_condition(test: &Expr) -> CompositionKind { values, range: _, node_index: _, + runtime_values: _, }) = operand.as_ref() { // Only split cases without mixed `and` and `or`. diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/rules/parametrize.rs b/crates/ruff_linter/src/rules/flake8_pytest_style/rules/parametrize.rs index f0bd982510f98..395ba854fc49f 100644 --- a/crates/ruff_linter/src/rules/flake8_pytest_style/rules/parametrize.rs +++ b/crates/ruff_linter/src/rules/flake8_pytest_style/rules/parametrize.rs @@ -381,6 +381,7 @@ fn check_names(checker: &Checker, call: &ExprCall, expr: &Expr, argvalues: &Expr range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, parenthesized: true, + runtime_elts: None, }); diagnostic.set_fix(Fix::unsafe_edit(Edit::range_replacement( format!("({})", checker.generator().expr(&node)), @@ -412,6 +413,7 @@ fn check_names(checker: &Checker, call: &ExprCall, expr: &Expr, argvalues: &Expr ctx: ExprContext::Load, range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_elts: None, }); diagnostic.set_fix(Fix::unsafe_edit(Edit::range_replacement( checker.generator().expr(&node), @@ -441,6 +443,7 @@ fn check_names(checker: &Checker, call: &ExprCall, expr: &Expr, argvalues: &Expr ctx: ExprContext::Load, range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_elts: None, }); diagnostic.set_fix(Fix::unsafe_edit(Edit::range_replacement( checker.generator().expr(&node), @@ -487,6 +490,7 @@ fn check_names(checker: &Checker, call: &ExprCall, expr: &Expr, argvalues: &Expr range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, parenthesized: true, + runtime_elts: None, }); diagnostic.set_fix(Fix::unsafe_edit(Edit::range_replacement( format!("({})", checker.generator().expr(&node)), diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/rules/unittest_assert.rs b/crates/ruff_linter/src/rules/flake8_pytest_style/rules/unittest_assert.rs index d799847935641..a9666b750d6cc 100644 --- a/crates/ruff_linter/src/rules/flake8_pytest_style/rules/unittest_assert.rs +++ b/crates/ruff_linter/src/rules/flake8_pytest_style/rules/unittest_assert.rs @@ -177,6 +177,7 @@ fn compare(left: &Expr, cmp_op: CmpOp, right: &Expr) -> Expr { comparators: Box::from([right.clone()]), range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_comparators: None, }) } @@ -396,6 +397,8 @@ impl UnittestAssert { keywords: std::iter::empty().collect(), range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_args: None, + runtime_bases: None, }, range_start: ruff_text_size::TextSize::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, @@ -445,6 +448,8 @@ impl UnittestAssert { keywords: std::iter::empty().collect(), range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_args: None, + runtime_bases: None, }, range_start: ruff_text_size::TextSize::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, diff --git a/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_bool_op.rs b/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_bool_op.rs index 3bc084c5ee5ef..785d871b3a705 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_bool_op.rs +++ b/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_bool_op.rs @@ -314,6 +314,8 @@ fn isinstance_target<'a>(call: &'a Expr, semantic: &'a SemanticModel) -> Option< keywords, range: _, node_index: _, + runtime_args: _, + runtime_bases: _, }, range_start: _, node_index: _, @@ -339,6 +341,7 @@ pub(crate) fn duplicate_isinstance_call(checker: &Checker, expr: &Expr) { values, range: _, node_index: _, + runtime_values: _, }) = expr else { return; @@ -464,6 +467,7 @@ fn match_eq_target(expr: &Expr) -> Option<(&Name, &Expr)> { comparators, range: _, node_index: _, + runtime_comparators: _, }) = expr else { return None; @@ -490,6 +494,7 @@ pub(crate) fn compare_with_tuple(checker: &Checker, expr: &Expr) { values, range: _, node_index: _, + runtime_values: _, }) = expr else { return; @@ -537,6 +542,7 @@ pub(crate) fn compare_with_tuple(checker: &Checker, expr: &Expr) { range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, parenthesized: true, + runtime_elts: None, }; let node1 = ast::ExprName { id: id.clone(), @@ -550,6 +556,7 @@ pub(crate) fn compare_with_tuple(checker: &Checker, expr: &Expr) { comparators: Box::from([node.into()]), range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_comparators: None, }; let in_expr = node2.into(); let mut diagnostic = checker.report_diagnostic( @@ -573,6 +580,7 @@ pub(crate) fn compare_with_tuple(checker: &Checker, expr: &Expr) { values: iter::once(in_expr).chain(unmatched).collect(), range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_values: None, }; node.into() }; @@ -590,6 +598,7 @@ pub(crate) fn expr_and_not_expr(checker: &Checker, expr: &Expr) { values, range: _, node_index: _, + runtime_values: _, }) = expr else { return; @@ -648,6 +657,7 @@ pub(crate) fn expr_or_not_expr(checker: &Checker, expr: &Expr) { values, range: _, node_index: _, + runtime_values: _, }) = expr else { return; @@ -735,6 +745,7 @@ fn is_short_circuit( values, range: _, node_index: _, + runtime_values: _, }) = expr else { return None; diff --git a/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_ifexp.rs b/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_ifexp.rs index 36bc772074441..1ff887a4df180 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_ifexp.rs +++ b/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_ifexp.rs @@ -196,6 +196,8 @@ pub(crate) fn if_expr_with_true_false( keywords: std::iter::empty().collect(), range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_args: None, + runtime_bases: None, }, range_start: ruff_text_size::TextSize::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, diff --git a/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_unary_op.rs b/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_unary_op.rs index 52828929390e9..c6604a99b0fc2 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_unary_op.rs +++ b/crates/ruff_linter/src/rules/flake8_simplify/rules/ast_unary_op.rs @@ -158,6 +158,7 @@ pub(crate) fn negation_with_equal_op(checker: &Checker, expr: &Expr, op: UnaryOp comparators, range: _, node_index: _, + runtime_comparators: _, }) = operand else { return; @@ -191,6 +192,7 @@ pub(crate) fn negation_with_equal_op(checker: &Checker, expr: &Expr, op: UnaryOp comparators: comparators.clone(), range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_comparators: None, }; diagnostic.set_fix(Fix::unsafe_edit(Edit::range_replacement( checker.generator().expr(&node.into()), @@ -214,6 +216,7 @@ pub(crate) fn negation_with_not_equal_op( comparators, range: _, node_index: _, + runtime_comparators: _, }) = operand else { return; @@ -247,6 +250,7 @@ pub(crate) fn negation_with_not_equal_op( comparators: comparators.clone(), range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_comparators: None, }; diagnostic.set_fix(Fix::unsafe_edit(Edit::range_replacement( checker.generator().expr(&node.into()), @@ -297,6 +301,8 @@ pub(crate) fn double_negation(checker: &Checker, expr: &Expr, op: UnaryOp, opera keywords: std::iter::empty().collect(), range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_args: None, + runtime_bases: None, }, range_start: ruff_text_size::TextSize::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, diff --git a/crates/ruff_linter/src/rules/flake8_simplify/rules/if_else_block_instead_of_dict_get.rs b/crates/ruff_linter/src/rules/flake8_simplify/rules/if_else_block_instead_of_dict_get.rs index 95f6df9446ccb..c3bf38ebe1825 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/rules/if_else_block_instead_of_dict_get.rs +++ b/crates/ruff_linter/src/rules/flake8_simplify/rules/if_else_block_instead_of_dict_get.rs @@ -136,6 +136,7 @@ pub(crate) fn if_else_block_instead_of_dict_get(checker: &Checker, stmt_if: &ast comparators: test_dict, range: _, node_index: _, + runtime_comparators: _, }) = &**test else { return; @@ -209,6 +210,8 @@ pub(crate) fn if_else_block_instead_of_dict_get(checker: &Checker, stmt_if: &ast keywords: std::iter::empty().collect(), range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_args: None, + runtime_bases: None, }, range_start: ruff_text_size::TextSize::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, @@ -219,6 +222,9 @@ pub(crate) fn if_else_block_instead_of_dict_get(checker: &Checker, stmt_if: &ast value: Box::new(node3.into()), range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }; let contents = checker.generator().stmt(&node5.into()); @@ -264,6 +270,7 @@ pub(crate) fn if_exp_instead_of_dict_get( comparators: test_dict, range: _, node_index: _, + runtime_comparators: _, }) = test else { return; @@ -318,6 +325,8 @@ pub(crate) fn if_exp_instead_of_dict_get( keywords: std::iter::empty().collect(), range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_args: None, + runtime_bases: None, }, range_start: ruff_text_size::TextSize::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, diff --git a/crates/ruff_linter/src/rules/flake8_simplify/rules/if_else_block_instead_of_dict_lookup.rs b/crates/ruff_linter/src/rules/flake8_simplify/rules/if_else_block_instead_of_dict_lookup.rs index 6d5d387002ec1..9cc656254361f 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/rules/if_else_block_instead_of_dict_lookup.rs +++ b/crates/ruff_linter/src/rules/flake8_simplify/rules/if_else_block_instead_of_dict_lookup.rs @@ -65,6 +65,7 @@ pub(crate) fn if_else_block_instead_of_dict_lookup(checker: &Checker, stmt_if: & comparators, range: _, node_index: _, + runtime_comparators: _, }) = test.as_ref() else { return; @@ -152,6 +153,7 @@ pub(crate) fn if_else_block_instead_of_dict_lookup(checker: &Checker, stmt_if: & comparators, range: _, node_index: _, + runtime_comparators: _, })) => { let Expr::Name(ast::ExprName { id, .. }) = left.as_ref() else { return; diff --git a/crates/ruff_linter/src/rules/flake8_simplify/rules/if_else_block_instead_of_if_exp.rs b/crates/ruff_linter/src/rules/flake8_simplify/rules/if_else_block_instead_of_if_exp.rs index 0ae0a887d2746..87ced474a8f7b 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/rules/if_else_block_instead_of_if_exp.rs +++ b/crates/ruff_linter/src/rules/flake8_simplify/rules/if_else_block_instead_of_if_exp.rs @@ -105,6 +105,7 @@ pub(crate) fn if_else_block_instead_of_if_exp(checker: &Checker, stmt_if: &ast:: elif_else_clauses, range: _, node_index: _, + runtime_body: _, } = stmt_if; // `test: None` to only match an `else` clause @@ -280,6 +281,9 @@ fn assignment_ternary( value: Box::new(node.into()), range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }; node1.into() } @@ -290,12 +294,16 @@ fn assignment_binary_and(target_var: &Expr, left_value: &Expr, right_value: &Exp values: vec![left_value.clone(), right_value.clone()], range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_values: None, }; let node1 = ast::StmtAssign { targets: vec![target_var.clone()], value: Box::new(node.into()), range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }; node1.into() } @@ -311,9 +319,13 @@ fn assignment_binary_or(target_var: &Expr, left_value: &Expr, right_value: &Expr node_index: ruff_python_ast::AtomicNodeIndex::NONE, op: BoolOp::Or, values: vec![left_value.clone(), right_value.clone()], + runtime_values: None, }) .into(), ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }) .into() } diff --git a/crates/ruff_linter/src/rules/flake8_simplify/rules/needless_bool.rs b/crates/ruff_linter/src/rules/flake8_simplify/rules/needless_bool.rs index 4837637222743..b58bbf527da35 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/rules/needless_bool.rs +++ b/crates/ruff_linter/src/rules/flake8_simplify/rules/needless_bool.rs @@ -135,12 +135,16 @@ pub(crate) fn needless_bool(checker: &Checker, stmt: &Stmt) { test: Some(elif_test), range: elif_range, node_index: _, + runtime_body: _, + runtime_orelse: _, }, ElifElseClause { body: else_body, test: None, range: else_range, node_index: _, + runtime_body: _, + runtime_orelse: _, }, ] => ( elif_test, @@ -259,6 +263,7 @@ pub(crate) fn needless_bool(checker: &Checker, stmt: &Stmt) { comparators: Box::new([right.clone()]), range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_comparators: None, })) } @@ -288,6 +293,8 @@ pub(crate) fn needless_bool(checker: &Checker, stmt: &Stmt) { keywords: std::iter::empty().collect(), range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_args: None, + runtime_bases: None, }, range_start: ruff_text_size::TextSize::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, diff --git a/crates/ruff_linter/src/rules/flake8_simplify/rules/reimplemented_builtin.rs b/crates/ruff_linter/src/rules/flake8_simplify/rules/reimplemented_builtin.rs index 5f3ce524eda3d..ac5aac0f5e213 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/rules/reimplemented_builtin.rs +++ b/crates/ruff_linter/src/rules/flake8_simplify/rules/reimplemented_builtin.rs @@ -155,6 +155,7 @@ pub(crate) fn convert_for_loop_to_any_all(checker: &Checker, stmt: &Stmt) { comparators, range: _, node_index: _, + runtime_comparators: _, }) = &loop_.test { if let ([op], [comparator]) = (&**ops, &**comparators) { @@ -176,6 +177,7 @@ pub(crate) fn convert_for_loop_to_any_all(checker: &Checker, stmt: &Stmt) { comparators: Box::from([comparator.clone()]), range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_comparators: None, }; node.into() } else { @@ -294,6 +296,7 @@ fn match_loop(stmt: &Stmt) -> Option> { elif_else_clauses: nested_elif_else_clauses, range: _, node_index: _, + runtime_body: _, }), ] = body.as_slice() else { @@ -417,6 +420,8 @@ fn return_stmt(id: Name, test: &Expr, target: &Expr, iter: &Expr, generator: Gen is_async: false, range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_ifs: None, + runtime_is_async: None, }], range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, @@ -435,6 +440,8 @@ fn return_stmt(id: Name, test: &Expr, target: &Expr, iter: &Expr, generator: Gen keywords: std::iter::empty().collect(), range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_args: None, + runtime_bases: None, }, range_start: ruff_text_size::TextSize::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, diff --git a/crates/ruff_linter/src/rules/flake8_simplify/rules/split_static_string.rs b/crates/ruff_linter/src/rules/flake8_simplify/rules/split_static_string.rs index 0546ccd38f027..47b20f3f679bb 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/rules/split_static_string.rs +++ b/crates/ruff_linter/src/rules/flake8_simplify/rules/split_static_string.rs @@ -190,6 +190,7 @@ fn construct_replacement(elts: &[&str], flags: StringLiteralFlags) -> Expr { ctx: ExprContext::Load, range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_elts: None, }) } diff --git a/crates/ruff_linter/src/rules/flake8_tidy_imports/rules/relative_imports.rs b/crates/ruff_linter/src/rules/flake8_tidy_imports/rules/relative_imports.rs index e16a8710f009b..abff2bfc70d09 100644 --- a/crates/ruff_linter/src/rules/flake8_tidy_imports/rules/relative_imports.rs +++ b/crates/ruff_linter/src/rules/flake8_tidy_imports/rules/relative_imports.rs @@ -113,6 +113,7 @@ fn fix_banned_relative_import( is_lazy: *is_lazy, range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_level: None, }; let content = generator.stmt(&node.into()); Some(Fix::unsafe_edit(Edit::range_replacement( diff --git a/crates/ruff_linter/src/rules/flynt/helpers.rs b/crates/ruff_linter/src/rules/flynt/helpers.rs index d0ea3ea97e1f1..e3618d47961c2 100644 --- a/crates/ruff_linter/src/rules/flynt/helpers.rs +++ b/crates/ruff_linter/src/rules/flynt/helpers.rs @@ -10,6 +10,9 @@ fn to_interpolated_string_interpolation_element(inner: &Expr) -> ast::Interpolat format_spec: None, range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_formatted_value_format_spec: None, + runtime_interpolation_format_spec: None, + runtime_str: None, }) } @@ -34,6 +37,8 @@ fn is_simple_call(expr: &Expr) -> bool { keywords, range: _, node_index: _, + runtime_args: _, + runtime_bases: _, }, range_start: _, node_index: _, diff --git a/crates/ruff_linter/src/rules/isort/annotate.rs b/crates/ruff_linter/src/rules/isort/annotate.rs index b70c665925a2b..582ad32c5e9e0 100644 --- a/crates/ruff_linter/src/rules/isort/annotate.rs +++ b/crates/ruff_linter/src/rules/isort/annotate.rs @@ -67,6 +67,7 @@ pub(crate) fn annotate_imports<'a>( is_lazy, range: _, node_index: _, + runtime_level: _, }) => { // Find comments above. let mut atop = vec![]; diff --git a/crates/ruff_linter/src/rules/isort/rules/add_required_imports.rs b/crates/ruff_linter/src/rules/isort/rules/add_required_imports.rs index e14d3284bc130..a6ef29679a4de 100644 --- a/crates/ruff_linter/src/rules/isort/rules/add_required_imports.rs +++ b/crates/ruff_linter/src/rules/isort/rules/add_required_imports.rs @@ -82,6 +82,7 @@ fn includes_import(stmt: &Stmt, target: &NameImport) -> bool { is_lazy: _, range: _, node_index: _, + runtime_level: _, }) = &stmt else { return false; diff --git a/crates/ruff_linter/src/rules/perflint/rules/manual_dict_comprehension.rs b/crates/ruff_linter/src/rules/perflint/rules/manual_dict_comprehension.rs index fd47256e93433..1cd48cac910e7 100644 --- a/crates/ruff_linter/src/rules/perflint/rules/manual_dict_comprehension.rs +++ b/crates/ruff_linter/src/rules/perflint/rules/manual_dict_comprehension.rs @@ -124,6 +124,9 @@ pub(crate) fn manual_dict_comprehension(checker: &Checker, for_stmt: &ast::StmtF value, range, node_index: _, + runtime_targets: _, + runtime_type_comment: _, + runtime_type_comment_bytes: _, }) = stmt else { return; diff --git a/crates/ruff_linter/src/rules/perflint/rules/manual_list_comprehension.rs b/crates/ruff_linter/src/rules/perflint/rules/manual_list_comprehension.rs index f74bdb14846f6..0ed65383aaacc 100644 --- a/crates/ruff_linter/src/rules/perflint/rules/manual_list_comprehension.rs +++ b/crates/ruff_linter/src/rules/perflint/rules/manual_list_comprehension.rs @@ -146,6 +146,8 @@ pub(crate) fn manual_list_comprehension(checker: &Checker, for_stmt: &ast::StmtF keywords, range: _, node_index: _, + runtime_args: _, + runtime_bases: _, }, range_start: _, node_index: _, diff --git a/crates/ruff_linter/src/rules/perflint/rules/manual_list_copy.rs b/crates/ruff_linter/src/rules/perflint/rules/manual_list_copy.rs index e34b29ccfbea2..d7c22c6d350ac 100644 --- a/crates/ruff_linter/src/rules/perflint/rules/manual_list_copy.rs +++ b/crates/ruff_linter/src/rules/perflint/rules/manual_list_copy.rs @@ -74,6 +74,8 @@ pub(crate) fn manual_list_copy(checker: &Checker, for_stmt: &ast::StmtFor) { keywords, range: _, node_index: _, + runtime_args: _, + runtime_bases: _, }, range_start: _, node_index: _, diff --git a/crates/ruff_linter/src/rules/perflint/rules/unnecessary_list_cast.rs b/crates/ruff_linter/src/rules/perflint/rules/unnecessary_list_cast.rs index 8ee945c57010b..513a6f8ff0d62 100644 --- a/crates/ruff_linter/src/rules/perflint/rules/unnecessary_list_cast.rs +++ b/crates/ruff_linter/src/rules/perflint/rules/unnecessary_list_cast.rs @@ -76,6 +76,8 @@ pub(crate) fn unnecessary_list_cast(checker: &Checker, iter: &Expr, body: &[Stmt keywords: _, range: _, node_index: _, + runtime_args: _, + runtime_bases: _, }, range_start: _, node_index: _, diff --git a/crates/ruff_linter/src/rules/pycodestyle/rules/lambda_assignment.rs b/crates/ruff_linter/src/rules/pycodestyle/rules/lambda_assignment.rs index 167f736cac0eb..04b1b594c62b6 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/rules/lambda_assignment.rs +++ b/crates/ruff_linter/src/rules/pycodestyle/rules/lambda_assignment.rs @@ -247,6 +247,10 @@ fn function( type_params: None, range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_body: None, + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }); let generated = checker.generator().stmt(&func); @@ -263,6 +267,10 @@ fn function( type_params: None, range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_body: None, + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }); let generated = checker.generator().stmt(&function); diff --git a/crates/ruff_linter/src/rules/pycodestyle/rules/not_tests.rs b/crates/ruff_linter/src/rules/pycodestyle/rules/not_tests.rs index 2f1eb953853c9..0354b182d977d 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/rules/not_tests.rs +++ b/crates/ruff_linter/src/rules/pycodestyle/rules/not_tests.rs @@ -92,6 +92,7 @@ pub(crate) fn not_tests(checker: &Checker, unary_op: &ast::ExprUnaryOp) { comparators, range: _, node_index: _, + runtime_comparators: _, }) = unary_op.operand.as_ref() else { return; diff --git a/crates/ruff_linter/src/rules/pylint/rules/bad_string_format_type.rs b/crates/ruff_linter/src/rules/pylint/rules/bad_string_format_type.rs index 0da09d6ce4d21..6c9419a9353f3 100644 --- a/crates/ruff_linter/src/rules/pylint/rules/bad_string_format_type.rs +++ b/crates/ruff_linter/src/rules/pylint/rules/bad_string_format_type.rs @@ -243,6 +243,7 @@ pub(crate) fn bad_string_format_type( items, range: _, node_index: _, + runtime_values: _, }) => is_valid_dict(&format_strings, items), _ => is_valid_constant(&format_strings, &bin_op.right), }; diff --git a/crates/ruff_linter/src/rules/pylint/rules/if_stmt_min_max.rs b/crates/ruff_linter/src/rules/pylint/rules/if_stmt_min_max.rs index 4f6b16acf7cb7..d5dc162cb2674 100644 --- a/crates/ruff_linter/src/rules/pylint/rules/if_stmt_min_max.rs +++ b/crates/ruff_linter/src/rules/pylint/rules/if_stmt_min_max.rs @@ -90,6 +90,7 @@ pub(crate) fn if_stmt_min_max(checker: &Checker, stmt_if: &ast::StmtIf) { elif_else_clauses, range: _, node_index: _, + runtime_body: _, } = stmt_if; if !elif_else_clauses.is_empty() { diff --git a/crates/ruff_linter/src/rules/pylint/rules/manual_import_from.rs b/crates/ruff_linter/src/rules/pylint/rules/manual_import_from.rs index 3334fefa31f47..2d9644435282d 100644 --- a/crates/ruff_linter/src/rules/pylint/rules/manual_import_from.rs +++ b/crates/ruff_linter/src/rules/pylint/rules/manual_import_from.rs @@ -99,6 +99,7 @@ pub(crate) fn manual_from_import(checker: &Checker, stmt: &Stmt, alias: &Alias, is_lazy, range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_level: None, }; diagnostic.set_fix(Fix::safe_edit(Edit::range_replacement( checker.generator().stmt(&node.into()), diff --git a/crates/ruff_linter/src/rules/pylint/rules/nested_min_max.rs b/crates/ruff_linter/src/rules/pylint/rules/nested_min_max.rs index ad85576b420df..474cecc116e4f 100644 --- a/crates/ruff_linter/src/rules/pylint/rules/nested_min_max.rs +++ b/crates/ruff_linter/src/rules/pylint/rules/nested_min_max.rs @@ -137,6 +137,8 @@ fn collect_nested_args(min_max: MinMax, args: &[Expr], semantic: &SemanticModel) keywords, range: _, node_index: _, + runtime_args: _, + runtime_bases: _, }, range_start: _, node_index: _, @@ -207,6 +209,8 @@ pub(crate) fn nested_min_max( keywords: keywords.iter().cloned().collect(), range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_args: None, + runtime_bases: None, }, range_start: ruff_text_size::TextSize::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, diff --git a/crates/ruff_linter/src/rules/pylint/rules/redefined_loop_name.rs b/crates/ruff_linter/src/rules/pylint/rules/redefined_loop_name.rs index c3a95da741923..5d631ca79c8a7 100644 --- a/crates/ruff_linter/src/rules/pylint/rules/redefined_loop_name.rs +++ b/crates/ruff_linter/src/rules/pylint/rules/redefined_loop_name.rs @@ -325,6 +325,7 @@ fn assignment_targets_from_expr<'a>( elts, range: _, node_index: _, + runtime_elts: _, }) => Box::new( elts.iter() .flat_map(|elt| assignment_targets_from_expr(elt, dummy_variable_rgx)), @@ -335,6 +336,7 @@ fn assignment_targets_from_expr<'a>( range: _, node_index: _, parenthesized: _, + runtime_elts: _, }) => Box::new( elts.iter() .flat_map(|elt| assignment_targets_from_expr(elt, dummy_variable_rgx)), diff --git a/crates/ruff_linter/src/rules/pylint/rules/repeated_equality_comparison.rs b/crates/ruff_linter/src/rules/pylint/rules/repeated_equality_comparison.rs index 472f678a41e79..4f7759cc03d43 100644 --- a/crates/ruff_linter/src/rules/pylint/rules/repeated_equality_comparison.rs +++ b/crates/ruff_linter/src/rules/pylint/rules/repeated_equality_comparison.rs @@ -186,6 +186,7 @@ pub(crate) fn repeated_equality_comparison(checker: &Checker, bool_op: &ast::Exp elts: comparators.iter().copied().cloned().collect(), range: TextRange::default(), node_index: AtomicNodeIndex::NONE, + runtime_elts: None, }) } else { Expr::Tuple(ast::ExprTuple { @@ -194,6 +195,7 @@ pub(crate) fn repeated_equality_comparison(checker: &Checker, bool_op: &ast::Exp node_index: AtomicNodeIndex::NONE, ctx: ExprContext::Load, parenthesized: true, + runtime_elts: None, }) }; @@ -210,11 +212,13 @@ pub(crate) fn repeated_equality_comparison(checker: &Checker, bool_op: &ast::Exp comparators: Box::from([comparator]), range: bool_op.range(), node_index: AtomicNodeIndex::NONE, + runtime_comparators: None, }))) .chain(after) .collect(), range: bool_op.range(), node_index: AtomicNodeIndex::NONE, + runtime_values: None, })), bool_op.range(), ))); diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/convert_named_tuple_functional_to_class.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/convert_named_tuple_functional_to_class.rs index 67b146dc19f01..24ac4dec218a9 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/rules/convert_named_tuple_functional_to_class.rs +++ b/crates/ruff_linter/src/rules/pyupgrade/rules/convert_named_tuple_functional_to_class.rs @@ -178,6 +178,7 @@ fn create_field_assignment_stmt(field: Name, annotation: &Expr) -> Stmt { simple: true, range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_simple: None, } .into() } @@ -241,12 +242,16 @@ fn create_class_def_stmt(typename: &str, body: Suite, base_class: &Expr) -> Stmt keywords: std::iter::empty().collect(), range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_args: None, + runtime_bases: None, })), body, type_params: None, decorator_list: DecoratorList::new(), range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_body: None, + runtime_decorator_list: None, } .into() } diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/convert_typed_dict_functional_to_class.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/convert_typed_dict_functional_to_class.rs index 980e57eed92e1..a7631c3292808 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/rules/convert_typed_dict_functional_to_class.rs +++ b/crates/ruff_linter/src/rules/pyupgrade/rules/convert_typed_dict_functional_to_class.rs @@ -163,6 +163,7 @@ fn create_field_assignment_stmt(field: &str, annotation: &Expr) -> Stmt { simple: true, range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_simple: None, } .into() } @@ -184,12 +185,16 @@ fn create_class_def_stmt( }, range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_args: None, + runtime_bases: None, })), body, type_params: None, decorator_list: ast::DecoratorList::new(), range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_body: None, + runtime_decorator_list: None, } .into() } @@ -272,6 +277,7 @@ fn match_fields_and_total(arguments: &Arguments) -> Option<(Suite, Option<&Keywo items, range: _, node_index: _, + runtime_values: _, }) => Some((fields_from_dict_literal(items)?, total)), Expr::Call(ast::ExprCall { func, diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/deprecated_c_element_tree.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/deprecated_c_element_tree.rs index dfcd64f88b21d..d693c92e96734 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/rules/deprecated_c_element_tree.rs +++ b/crates/ruff_linter/src/rules/pyupgrade/rules/deprecated_c_element_tree.rs @@ -76,6 +76,7 @@ pub(crate) fn deprecated_c_element_tree(checker: &Checker, stmt: &Stmt) { is_lazy: _, range: _, node_index: _, + runtime_level: _, }) => { if *level > 0 { // Ex) `import .xml.etree.cElementTree as ET` diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/lru_cache_with_maxsize_none.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/lru_cache_with_maxsize_none.rs index 98f58f138cb7e..a85ad550e2518 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/rules/lru_cache_with_maxsize_none.rs +++ b/crates/ruff_linter/src/rules/pyupgrade/rules/lru_cache_with_maxsize_none.rs @@ -71,6 +71,8 @@ pub(crate) fn lru_cache_with_maxsize_none(checker: &Checker, decorator_list: &[D keywords, range: _, node_index: _, + runtime_args: _, + runtime_bases: _, }, range_start: _, node_index: _, diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/native_literals.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/native_literals.rs index 58f74144f77d0..ba3416d067d60 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/rules/native_literals.rs +++ b/crates/ruff_linter/src/rules/pyupgrade/rules/native_literals.rs @@ -196,6 +196,8 @@ pub(crate) fn native_literals( keywords, range: _, node_index: _, + runtime_args: _, + runtime_bases: _, }, range_start: _, node_index: _, diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/os_error_alias.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/os_error_alias.rs index c7bcb169c6da5..8fb36d8e65a09 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/rules/os_error_alias.rs +++ b/crates/ruff_linter/src/rules/pyupgrade/rules/os_error_alias.rs @@ -146,6 +146,7 @@ fn tuple_diagnostic(checker: &Checker, tuple: &ast::ExprTuple, aliases: &[&Expr] range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, parenthesized: true, + runtime_elts: None, }; format!("({})", checker.generator().expr(&node.into())) }; diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/outdated_version_block.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/outdated_version_block.rs index 10e9cd34f213b..97e2d71148501 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/rules/outdated_version_block.rs +++ b/crates/ruff_linter/src/rules/pyupgrade/rules/outdated_version_block.rs @@ -97,6 +97,7 @@ pub(crate) fn outdated_version_block(checker: &Checker, stmt_if: &StmtIf) { comparators, range: _, node_index: _, + runtime_comparators: _, }) = &branch.test else { continue; diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/pep695/mod.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/pep695/mod.rs index 109ccd762db48..f816d0f0108ec 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/rules/pep695/mod.rs +++ b/crates/ruff_linter/src/rules/pyupgrade/rules/pep695/mod.rs @@ -156,6 +156,7 @@ impl<'a> From<&'a TypeVar<'a>> for TypeParam { elts: constraints.iter().map(|expr| (*expr).clone()).collect(), ctx: ast::ExprContext::Load, parenthesized: true, + runtime_elts: None, }))) } Some(TypeVarRestriction::AnyStr) => { @@ -178,6 +179,7 @@ impl<'a> From<&'a TypeVar<'a>> for TypeParam { ], ctx: ast::ExprContext::Load, parenthesized: true, + runtime_elts: None, }))) } None => None, diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/printf_string_formatting.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/printf_string_formatting.rs index 7396addf2643e..b6390b44d8344 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/rules/printf_string_formatting.rs +++ b/crates/ruff_linter/src/rules/pyupgrade/rules/printf_string_formatting.rs @@ -237,6 +237,7 @@ fn clean_params_dictionary(right: &Expr, locator: &Locator, stylist: &Stylist) - items, range: _, node_index: _, + runtime_values: _, }) = &right { let mut arguments: Vec = vec![]; diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/timeout_error_alias.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/timeout_error_alias.rs index 4933330ba5ade..045e91601b44d 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/rules/timeout_error_alias.rs +++ b/crates/ruff_linter/src/rules/pyupgrade/rules/timeout_error_alias.rs @@ -159,6 +159,7 @@ fn tuple_diagnostic(checker: &Checker, tuple: &ast::ExprTuple, aliases: &[&Expr] range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, parenthesized: true, + runtime_elts: None, }; format!("({})", checker.generator().expr(&node.into())) }; diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/unnecessary_default_type_args.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/unnecessary_default_type_args.rs index a1c76c016bbcf..abf3cd3582e68 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/rules/unnecessary_default_type_args.rs +++ b/crates/ruff_linter/src/rules/pyupgrade/rules/unnecessary_default_type_args.rs @@ -87,6 +87,7 @@ pub(crate) fn unnecessary_default_type_args(checker: &Checker, expr: &Expr) { range: _, node_index: _, parenthesized: _, + runtime_elts: _, }) = slice.as_ref() else { return; @@ -131,6 +132,7 @@ pub(crate) fn unnecessary_default_type_args(checker: &Checker, expr: &Expr) { range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, parenthesized: true, + runtime_elts: None, }) }), ctx: ast::ExprContext::Load, diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/use_pep604_annotation.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/use_pep604_annotation.rs index e7fdb3ee6ad0f..7d44175bffece 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/rules/use_pep604_annotation.rs +++ b/crates/ruff_linter/src/rules/pyupgrade/rules/use_pep604_annotation.rs @@ -326,6 +326,7 @@ fn is_allowed_value(expr: &Expr) -> bool { | Expr::BooleanLiteral(_) | Expr::NoneLiteral(_) | Expr::EllipsisLiteral(_) + | Expr::Constant(_) | Expr::Attribute(_) | Expr::Subscript(_) | Expr::Name(_) diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/yield_in_for_loop.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/yield_in_for_loop.rs index dfa34e7b29eb8..0de36d1be1f7e 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/rules/yield_in_for_loop.rs +++ b/crates/ruff_linter/src/rules/pyupgrade/rules/yield_in_for_loop.rs @@ -83,6 +83,10 @@ pub(crate) fn yield_in_for_loop(checker: &Checker, stmt_for: &ast::StmtFor) { is_async: _, range: _, node_index: _, + runtime_type_comment: _, + runtime_type_comment_bytes: _, + runtime_body: _, + runtime_orelse: _, } = stmt_for; // If there is an else statement, don't rewrite. diff --git a/crates/ruff_linter/src/rules/refurb/helpers.rs b/crates/ruff_linter/src/rules/refurb/helpers.rs index 52c27be5bcc62..5f1a28df090ce 100644 --- a/crates/ruff_linter/src/rules/refurb/helpers.rs +++ b/crates/ruff_linter/src/rules/refurb/helpers.rs @@ -36,6 +36,8 @@ pub(super) fn generate_method_call(name: Name, method: &str, generator: Generato keywords: std::iter::empty().collect(), range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_args: None, + runtime_bases: None, }, range_start: ruff_text_size::TextSize::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, @@ -71,6 +73,7 @@ pub(super) fn replace_with_identity_check( comparators: [ast::ExprNoneLiteral::default().into()].into(), range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_comparators: None, }); let new_content = generator.expr(&new_expr); diff --git a/crates/ruff_linter/src/rules/refurb/rules/bit_count.rs b/crates/ruff_linter/src/rules/refurb/rules/bit_count.rs index 150b439f6e78c..8b800854e1ab1 100644 --- a/crates/ruff_linter/src/rules/refurb/rules/bit_count.rs +++ b/crates/ruff_linter/src/rules/refurb/rules/bit_count.rs @@ -157,6 +157,7 @@ pub(crate) fn bit_count(checker: &Checker, call: &ExprCall) { | Expr::Compare(_) | Expr::Tuple(_) | Expr::Generator(_) + | Expr::Constant(_) | Expr::IpyEscapeCommand(_) => true, Expr::Call(_) diff --git a/crates/ruff_linter/src/rules/refurb/rules/check_and_remove_from_set.rs b/crates/ruff_linter/src/rules/refurb/rules/check_and_remove_from_set.rs index b004ff775e8f2..3355e669f13fa 100644 --- a/crates/ruff_linter/src/rules/refurb/rules/check_and_remove_from_set.rs +++ b/crates/ruff_linter/src/rules/refurb/rules/check_and_remove_from_set.rs @@ -203,6 +203,8 @@ fn make_suggestion(set: &ast::ExprName, element: &Expr, generator: Generator) -> keywords: std::iter::empty().collect(), range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_args: None, + runtime_bases: None, }, range_start: ruff_text_size::TextSize::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, diff --git a/crates/ruff_linter/src/rules/refurb/rules/read_whole_file.rs b/crates/ruff_linter/src/rules/refurb/rules/read_whole_file.rs index d24b77574c3a2..bac7df407c3e5 100644 --- a/crates/ruff_linter/src/rules/refurb/rules/read_whole_file.rs +++ b/crates/ruff_linter/src/rules/refurb/rules/read_whole_file.rs @@ -183,6 +183,8 @@ fn make_suggestion(open: &FileOpen<'_>, generator: Generator) -> String { keywords: open.keywords.iter().copied().cloned().collect(), range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_args: None, + runtime_bases: None, }, range_start: ruff_text_size::TextSize::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, diff --git a/crates/ruff_linter/src/rules/refurb/rules/reimplemented_starmap.rs b/crates/ruff_linter/src/rules/refurb/rules/reimplemented_starmap.rs index fae162caee696..772ee1992c10b 100644 --- a/crates/ruff_linter/src/rules/refurb/rules/reimplemented_starmap.rs +++ b/crates/ruff_linter/src/rules/refurb/rules/reimplemented_starmap.rs @@ -324,6 +324,8 @@ fn construct_starmap_call(starmap_binding: Name, iter: &Expr, func: &Expr) -> as keywords: std::iter::empty().collect(), range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_args: None, + runtime_bases: None, }, range_start: ruff_text_size::TextSize::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, @@ -345,6 +347,8 @@ fn wrap_with_call_to(call: ast::ExprCall, func_name: Name) -> ast::ExprCall { keywords: std::iter::empty().collect(), range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_args: None, + runtime_bases: None, }, range_start: ruff_text_size::TextSize::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, diff --git a/crates/ruff_linter/src/rules/refurb/rules/repeated_append.rs b/crates/ruff_linter/src/rules/refurb/rules/repeated_append.rs index 9b7bb026a28c1..5880a29b2f411 100644 --- a/crates/ruff_linter/src/rules/refurb/rules/repeated_append.rs +++ b/crates/ruff_linter/src/rules/refurb/rules/repeated_append.rs @@ -346,6 +346,7 @@ fn make_suggestion(group: &AppendGroup, generator: Generator) -> String { range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, parenthesized: true, + runtime_elts: None, }; // Make `var.extend`. // NOTE: receiver is the same for all appends and that's why we can take the first. @@ -364,6 +365,8 @@ fn make_suggestion(group: &AppendGroup, generator: Generator) -> String { keywords: std::iter::empty().collect(), range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_args: None, + runtime_bases: None, }, range_start: ruff_text_size::TextSize::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, diff --git a/crates/ruff_linter/src/rules/refurb/rules/slice_to_remove_prefix_or_suffix.rs b/crates/ruff_linter/src/rules/refurb/rules/slice_to_remove_prefix_or_suffix.rs index 5c23bdae1d46f..6299cd659732e 100644 --- a/crates/ruff_linter/src/rules/refurb/rules/slice_to_remove_prefix_or_suffix.rs +++ b/crates/ruff_linter/src/rules/refurb/rules/slice_to_remove_prefix_or_suffix.rs @@ -189,6 +189,7 @@ fn affix_removal_data_stmt(if_stmt: &ast::StmtIf) -> Option> elif_else_clauses, range: _, node_index: _, + runtime_body: _, } = if_stmt; // Cannot safely transform, e.g., @@ -222,6 +223,9 @@ fn affix_removal_data_stmt(if_stmt: &ast::StmtIf) -> Option> targets, range: _, node_index: _, + runtime_targets: _, + runtime_type_comment: _, + runtime_type_comment_bytes: _, } = statement.as_assign_stmt()?; let [target] = targets.as_slice() else { return None; diff --git a/crates/ruff_linter/src/rules/refurb/rules/unnecessary_enumerate.rs b/crates/ruff_linter/src/rules/refurb/rules/unnecessary_enumerate.rs index 9ac6a6b127826..b3dd0f1edd99a 100644 --- a/crates/ruff_linter/src/rules/refurb/rules/unnecessary_enumerate.rs +++ b/crates/ruff_linter/src/rules/refurb/rules/unnecessary_enumerate.rs @@ -252,6 +252,8 @@ fn generate_range_len_call(name: Name, generator: Generator) -> String { keywords: std::iter::empty().collect(), range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_args: None, + runtime_bases: None, }, range_start: ruff_text_size::TextSize::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, @@ -272,6 +274,8 @@ fn generate_range_len_call(name: Name, generator: Generator) -> String { keywords: std::iter::empty().collect(), range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_args: None, + runtime_bases: None, }, range_start: ruff_text_size::TextSize::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, diff --git a/crates/ruff_linter/src/rules/ruff/rules/assert_with_print_message.rs b/crates/ruff_linter/src/rules/ruff/rules/assert_with_print_message.rs index bab669f7b677c..8be5855a71c61 100644 --- a/crates/ruff_linter/src/rules/ruff/rules/assert_with_print_message.rs +++ b/crates/ruff_linter/src/rules/ruff/rules/assert_with_print_message.rs @@ -134,6 +134,9 @@ mod print_arguments { format_spec: None, range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_formatted_value_format_spec: None, + runtime_interpolation_format_spec: None, + runtime_str: None, }, )], } @@ -252,6 +255,8 @@ mod print_arguments { }), range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_joined_str: None, + runtime_values: None, })) } diff --git a/crates/ruff_linter/src/rules/ruff/rules/collection_literal_concatenation.rs b/crates/ruff_linter/src/rules/ruff/rules/collection_literal_concatenation.rs index 629407c172e8c..ec5351f771462 100644 --- a/crates/ruff_linter/src/rules/ruff/rules/collection_literal_concatenation.rs +++ b/crates/ruff_linter/src/rules/ruff/rules/collection_literal_concatenation.rs @@ -169,6 +169,7 @@ fn concatenate_expressions(expr: &Expr) -> Option<(Expr, Type)> { ctx: ExprContext::Load, range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_elts: None, } .into(), Type::Tuple => ast::ExprTuple { @@ -177,6 +178,7 @@ fn concatenate_expressions(expr: &Expr) -> Option<(Expr, Type)> { range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, parenthesized: true, + runtime_elts: None, } .into(), }; diff --git a/crates/ruff_linter/src/rules/ruff/rules/invalid_formatter_suppression_comment.rs b/crates/ruff_linter/src/rules/ruff/rules/invalid_formatter_suppression_comment.rs index 9d2d6bfe5bb2e..1c7f4506724ee 100644 --- a/crates/ruff_linter/src/rules/ruff/rules/invalid_formatter_suppression_comment.rs +++ b/crates/ruff_linter/src/rules/ruff/rules/invalid_formatter_suppression_comment.rs @@ -322,6 +322,7 @@ const fn is_valid_enclosing_node(node: AnyNodeRef) -> bool { | AnyNodeRef::ExprList(_) | AnyNodeRef::ExprTuple(_) | AnyNodeRef::ExprSlice(_) + | AnyNodeRef::ExprConstant(_) | AnyNodeRef::ExprIpyEscapeCommand(_) | AnyNodeRef::PatternMatchValue(_) | AnyNodeRef::PatternMatchSingleton(_) diff --git a/crates/ruff_linter/src/rules/ruff/rules/legacy_form_pytest_raises.rs b/crates/ruff_linter/src/rules/ruff/rules/legacy_form_pytest_raises.rs index 6d5fb72c5d97b..387a834f6ab45 100644 --- a/crates/ruff_linter/src/rules/ruff/rules/legacy_form_pytest_raises.rs +++ b/crates/ruff_linter/src/rules/ruff/rules/legacy_form_pytest_raises.rs @@ -266,6 +266,8 @@ fn generate_with_statement( }) .as_slice() .into(), + runtime_args: None, + runtime_bases: None, }, }; @@ -278,6 +280,8 @@ fn generate_with_statement( range: TextRange::default(), args: func_args.into(), keywords: func_keywords.into(), + runtime_args: None, + runtime_bases: None, }, }; @@ -287,6 +291,9 @@ fn generate_with_statement( range: TextRange::default(), targets: assign_targets.to_vec(), value: Box::new(func_call.into()), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }) } else { Stmt::Expr(StmtExpr { @@ -307,5 +314,8 @@ fn generate_with_statement( optional_vars: optional_vars.map(|var| Box::new(var.clone())), }], body: ast::Suite::from([body]), + runtime_body: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }) } diff --git a/crates/ruff_linter/src/rules/ruff/rules/map_int_version_parsing.rs b/crates/ruff_linter/src/rules/ruff/rules/map_int_version_parsing.rs index 132d6f309c6db..3e20cbd2dbe52 100644 --- a/crates/ruff_linter/src/rules/ruff/rules/map_int_version_parsing.rs +++ b/crates/ruff_linter/src/rules/ruff/rules/map_int_version_parsing.rs @@ -71,6 +71,8 @@ fn map_call_with_two_arguments<'a>( keywords, range: _, node_index: _, + runtime_args: _, + runtime_bases: _, }, range_start: _, node_index: _, diff --git a/crates/ruff_linter/src/rules/ruff/rules/mutable_fromkeys_value.rs b/crates/ruff_linter/src/rules/ruff/rules/mutable_fromkeys_value.rs index 02348e60e73a6..7a6cc6f590b5f 100644 --- a/crates/ruff_linter/src/rules/ruff/rules/mutable_fromkeys_value.rs +++ b/crates/ruff_linter/src/rules/ruff/rules/mutable_fromkeys_value.rs @@ -119,6 +119,8 @@ fn generate_dict_comprehension( range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, is_async: false, + runtime_ifs: None, + runtime_is_async: None, }; // Construct the dict comprehension. let dict_comp = ast::ExprDictComp { diff --git a/crates/ruff_linter/src/rules/ruff/rules/never_union.rs b/crates/ruff_linter/src/rules/ruff/rules/never_union.rs index 2b060b0106436..bc4b07dd21af0 100644 --- a/crates/ruff_linter/src/rules/ruff/rules/never_union.rs +++ b/crates/ruff_linter/src/rules/ruff/rules/never_union.rs @@ -192,6 +192,7 @@ pub(crate) fn never_union(checker: &Checker, expr: &Expr) { range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, parenthesized: true, + runtime_elts: None, })), ctx: ast::ExprContext::Load, range: TextRange::default(), diff --git a/crates/ruff_linter/src/rules/ruff/rules/none_not_at_end_of_union.rs b/crates/ruff_linter/src/rules/ruff/rules/none_not_at_end_of_union.rs index 7b26826b0d5bb..6b67f5bfde56a 100644 --- a/crates/ruff_linter/src/rules/ruff/rules/none_not_at_end_of_union.rs +++ b/crates/ruff_linter/src/rules/ruff/rules/none_not_at_end_of_union.rs @@ -186,6 +186,7 @@ fn generate_fix( range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, parenthesized: false, + runtime_elts: None, })), ctx: ruff_python_ast::ExprContext::Load, range: TextRange::default(), diff --git a/crates/ruff_linter/src/rules/ruff/rules/sort_dunder_slots.rs b/crates/ruff_linter/src/rules/ruff/rules/sort_dunder_slots.rs index b6c2d12833a40..33b0faae72834 100644 --- a/crates/ruff_linter/src/rules/ruff/rules/sort_dunder_slots.rs +++ b/crates/ruff_linter/src/rules/ruff/rules/sort_dunder_slots.rs @@ -230,6 +230,7 @@ impl<'a> StringLiteralDisplay<'a> { elts, range, node_index: _, + runtime_elts: _, }) => { let kind = DisplayKind::Sequence(SequenceKind::Set); Self { diff --git a/crates/ruff_linter/src/rules/ruff/rules/unnecessary_nested_literal.rs b/crates/ruff_linter/src/rules/ruff/rules/unnecessary_nested_literal.rs index 6ad14cb512313..cce4f9d7867f4 100644 --- a/crates/ruff_linter/src/rules/ruff/rules/unnecessary_nested_literal.rs +++ b/crates/ruff_linter/src/rules/ruff/rules/unnecessary_nested_literal.rs @@ -121,6 +121,7 @@ pub(crate) fn unnecessary_nested_literal<'a>(checker: &Checker, literal_expr: &' node_index: ruff_python_ast::AtomicNodeIndex::NONE, ctx: ExprContext::Load, parenthesized: false, + runtime_elts: None, }) }), value: subscript.value.clone(), diff --git a/crates/ruff_linter/src/rules/ruff/rules/unnecessary_regular_expression.rs b/crates/ruff_linter/src/rules/ruff/rules/unnecessary_regular_expression.rs index d10b31efef3f3..998e6ecff4948 100644 --- a/crates/ruff_linter/src/rules/ruff/rules/unnecessary_regular_expression.rs +++ b/crates/ruff_linter/src/rules/ruff/rules/unnecessary_regular_expression.rs @@ -336,6 +336,7 @@ impl<'a> ReFunc<'a> { comparators: Box::new([right.clone()]), range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_comparators: None, }) } @@ -356,6 +357,8 @@ impl<'a> ReFunc<'a> { keywords: std::iter::empty().collect(), range: TextRange::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, + runtime_args: None, + runtime_bases: None, }, range_start: ruff_text_size::TextSize::default(), node_index: ruff_python_ast::AtomicNodeIndex::NONE, diff --git a/crates/ruff_python_ast/Cargo.toml b/crates/ruff_python_ast/Cargo.toml index 41bc9ceabd27b..042218f5243c1 100644 --- a/crates/ruff_python_ast/Cargo.toml +++ b/crates/ruff_python_ast/Cargo.toml @@ -1,7 +1,7 @@ [package] -name = "ruff_python_ast" -version = "0.0.11" -description = "This is an internal component crate of Ruff" +description = "Unofficial fork for RustPython" +name = "rustpython-ruff_python_ast" +version = "0.16.5" authors = { workspace = true } edition = { workspace = true } rust-version = { workspace = true } @@ -15,6 +15,7 @@ license = { workspace = true } ignored = ["ruff_cache"] [lib] +name = "ruff_python_ast" [dependencies] ruff_cache = { workspace = true, optional = true } diff --git a/crates/ruff_python_ast/ast.toml b/crates/ruff_python_ast/ast.toml index e64e3f09285e3..312ed40c0a3b9 100644 --- a/crates/ruff_python_ast/ast.toml +++ b/crates/ruff_python_ast/ast.toml @@ -69,7 +69,10 @@ doc = "See also [mod](https://docs.python.org/3/library/ast.html#ast.mod)" [Mod.nodes.ModModule] doc = "See also [Module](https://docs.python.org/3/library/ast.html#ast.Module)" -fields = [{ name = "body", type = "ThinVec" }] +fields = [ + { name = "body", type = "ThinVec" }, + { name = "runtime_body", type = "Vec>?", skip_visit = true }, +] [Mod.nodes.ModExpression] doc = "See also [Module](https://docs.python.org/3/library/ast.html#ast.Module)" @@ -93,6 +96,10 @@ fields = [ { name = "parameters", type = "Box" }, { name = "returns", type = "Expr?", is_annotation = true }, { name = "body", type = "ThinVec" }, + { name = "runtime_decorator_list", type = "Vec>?", skip_visit = true }, + { name = "runtime_type_comment", type = "Box?", skip_visit = true }, + { name = "runtime_type_comment_bytes", type = "Vec?", skip_visit = true }, + { name = "runtime_body", type = "Vec>?", skip_visit = true }, ] [Stmt.nodes.StmtClassDef] @@ -103,6 +110,8 @@ fields = [ { name = "type_params", type = "Box?" }, { name = "arguments", type = "Box?" }, { name = "body", type = "ThinVec" }, + { name = "runtime_decorator_list", type = "Vec>?", skip_visit = true }, + { name = "runtime_body", type = "Vec>?", skip_visit = true }, ] [Stmt.nodes.StmtReturn] @@ -111,7 +120,10 @@ fields = [{ name = "value", type = "Expr?" }] [Stmt.nodes.StmtDelete] doc = "See also [Delete](https://docs.python.org/3/library/ast.html#ast.Delete)" -fields = [{ name = "targets", type = "Expr*" }] +fields = [ + { name = "targets", type = "Expr*" }, + { name = "runtime_targets", type = "Vec>?", skip_visit = true }, +] [Stmt.nodes.StmtTypeAlias] doc = "See also [TypeAlias](https://docs.python.org/3/library/ast.html#ast.TypeAlias)" @@ -126,6 +138,9 @@ doc = "See also [Assign](https://docs.python.org/3/library/ast.html#ast.Assign)" fields = [ { name = "targets", type = "Expr*" }, { name = "value", type = "Expr" }, + { name = "runtime_targets", type = "Vec>?", skip_visit = true }, + { name = "runtime_type_comment", type = "Box?", skip_visit = true }, + { name = "runtime_type_comment_bytes", type = "Vec?", skip_visit = true }, ] [Stmt.nodes.StmtAugAssign] @@ -143,6 +158,7 @@ fields = [ { name = "annotation", type = "Expr", is_annotation = true }, { name = "value", type = "Expr?" }, { name = "simple", type = "bool" }, + { name = "runtime_simple", type = "i32?", skip_visit = true }, ] [Stmt.nodes.StmtFor] @@ -156,6 +172,10 @@ fields = [ { name = "iter", type = "Expr" }, { name = "body", type = "ThinVec" }, { name = "orelse", type = "ThinVec" }, + { name = "runtime_type_comment", type = "Box?", skip_visit = true }, + { name = "runtime_type_comment_bytes", type = "Vec?", skip_visit = true }, + { name = "runtime_body", type = "Vec>?", skip_visit = true }, + { name = "runtime_orelse", type = "Vec>?", skip_visit = true }, ] [Stmt.nodes.StmtWhile] @@ -165,6 +185,8 @@ fields = [ { name = "test", type = "Expr" }, { name = "body", type = "ThinVec" }, { name = "orelse", type = "ThinVec" }, + { name = "runtime_body", type = "Vec>?", skip_visit = true }, + { name = "runtime_orelse", type = "Vec>?", skip_visit = true }, ] [Stmt.nodes.StmtIf] @@ -174,6 +196,7 @@ fields = [ { name = "test", type = "Expr" }, { name = "body", type = "ThinVec" }, { name = "elif_else_clauses", type = "ElifElseClause*" }, + { name = "runtime_body", type = "Vec>?", skip_visit = true }, ] [Stmt.nodes.StmtWith] @@ -185,6 +208,9 @@ fields = [ { name = "is_async", type = "bool" }, { name = "items", type = "WithItem*" }, { name = "body", type = "ThinVec" }, + { name = "runtime_type_comment", type = "Box?", skip_visit = true }, + { name = "runtime_type_comment_bytes", type = "Vec?", skip_visit = true }, + { name = "runtime_body", type = "Vec>?", skip_visit = true }, ] [Stmt.nodes.StmtMatch] @@ -207,6 +233,10 @@ fields = [ { name = "orelse", type = "ThinVec" }, { name = "finalbody", type = "ThinVec" }, { name = "is_star", type = "bool" }, + { name = "runtime_body", type = "Vec>?", skip_visit = true }, + { name = "runtime_handlers", type = "Vec>?", skip_visit = true }, + { name = "runtime_orelse", type = "Vec>?", skip_visit = true }, + { name = "runtime_finalbody", type = "Vec>?", skip_visit = true }, ] [Stmt.nodes.StmtAssert] @@ -227,6 +257,7 @@ fields = [ { name = "names", type = "Alias*" }, { name = "level", type = "u32" }, { name = "is_lazy", type = "bool" }, + { name = "runtime_level", type = "i32?", skip_visit = true }, ] [Stmt.nodes.StmtGlobal] @@ -321,7 +352,11 @@ doc = "See also [expr](https://docs.python.org/3/library/ast.html#ast.expr)" [Expr.nodes.ExprBoolOp] doc = "See also [BoolOp](https://docs.python.org/3/library/ast.html#ast.BoolOp)" -fields = [{ name = "op", type = "BoolOp" }, { name = "values", type = "Expr*" }] +fields = [ + { name = "op", type = "BoolOp" }, + { name = "values", type = "Expr*" }, + { name = "runtime_values", type = "Vec>?", skip_visit = true }, +] custom_source_order = true [Expr.nodes.ExprNamed] @@ -361,12 +396,18 @@ source_order = ["body", "test", "orelse"] [Expr.nodes.ExprDict] doc = "See also [Dict](https://docs.python.org/3/library/ast.html#ast.Dict)" -fields = [{ name = "items", type = "DictItem*" }] +fields = [ + { name = "items", type = "DictItem*" }, + { name = "runtime_values", type = "Vec>?", skip_visit = true }, +] custom_source_order = true [Expr.nodes.ExprSet] doc = "See also [Set](https://docs.python.org/3/library/ast.html#ast.Set)" -fields = [{ name = "elts", type = "Expr*" }] +fields = [ + { name = "elts", type = "Expr*" }, + { name = "runtime_elts", type = "Vec>?", skip_visit = true }, +] [Expr.nodes.ExprListComp] doc = "See also [ListComp](https://docs.python.org/3/library/ast.html#ast.ListComp)" @@ -416,6 +457,7 @@ fields = [ { name = "left", type = "Expr" }, { name = "ops", type = "Box<[CmpOp]>" }, { name = "comparators", type = "Box<[Expr]>" }, + { name = "runtime_comparators", type = "Vec>?", skip_visit = true }, ] # The fields must be visited simultaneously custom_source_order = true @@ -444,7 +486,11 @@ doesn't join the implicitly concatenated parts into a single string. Instead, it keeps them separate and provide various methods to access the parts. See also [JoinedStr](https://docs.python.org/3/library/ast.html#ast.JoinedStr)""" -fields = [{ name = "value", type = "FStringValue" }] +fields = [ + { name = "value", type = "FStringValue" }, + { name = "runtime_joined_str", type = "Vec?", skip_visit = true }, + { name = "runtime_values", type = "Vec>?", skip_visit = true }, +] custom_source_order = true [Expr.nodes.ExprTString] @@ -456,7 +502,11 @@ doesn't join the implicitly concatenated parts into a single string. Instead, it keeps them separate and provide various methods to access the parts. See also [TemplateStr](https://docs.python.org/3/library/ast.html#ast.TemplateStr)""" -fields = [{ name = "value", type = "TStringValue" }] +fields = [ + { name = "value", type = "TStringValue" }, + { name = "runtime_template_str", type = "Vec?", skip_visit = true }, + { name = "runtime_values", type = "Vec>?", skip_visit = true }, +] custom_source_order = true [Expr.nodes.ExprStringLiteral] @@ -488,6 +538,14 @@ derives = ["Default"] fields = [] derives = ["Default"] +[Expr.nodes.ExprConstant] +doc = "See also [Constant](https://docs.python.org/3/library/ast.html#ast.Constant)" +fields = [ + { name = "value", type = "ConstantValue", skip_visit = true }, + { name = "kind", type = "Box?", skip_visit = true }, + { name = "invalid_type", type = "Box?", skip_visit = true }, +] + [Expr.nodes.ExprAttribute] doc = "See also [Attribute](https://docs.python.org/3/library/ast.html#ast.Attribute)" fields = [ @@ -523,6 +581,7 @@ doc = "See also [List](https://docs.python.org/3/library/ast.html#ast.List)" fields = [ { name = "elts", type = "Expr*" }, { name = "ctx", type = "ExprContext" }, + { name = "runtime_elts", type = "Vec>?", skip_visit = true }, ] [Expr.nodes.ExprTuple] @@ -531,6 +590,7 @@ fields = [ { name = "elts", type = "Expr*" }, { name = "ctx", type = "ExprContext" }, { name = "parenthesized", type = "bool" }, + { name = "runtime_elts", type = "Vec>?", skip_visit = true }, ] [Expr.nodes.ExprSlice] @@ -583,7 +643,10 @@ fields = [{ name = "value", type = "Singleton" }] [Pattern.nodes.PatternMatchSequence] doc = "See also [MatchSequence](https://docs.python.org/3/library/ast.html#ast.MatchSequence)" -fields = [{ name = "patterns", type = "Pattern*" }] +fields = [ + { name = "patterns", type = "Pattern*" }, + { name = "runtime_patterns", type = "Vec>?", skip_visit = true }, +] [Pattern.nodes.PatternMatchMapping] doc = "See also [MatchMapping](https://docs.python.org/3/library/ast.html#ast.MatchMapping)" @@ -591,6 +654,8 @@ fields = [ { name = "keys", type = "ThinVec" }, { name = "patterns", type = "ThinVec" }, { name = "rest", type = "Identifier?" }, + { name = "runtime_keys", type = "Vec>?", skip_visit = true }, + { name = "runtime_patterns", type = "Vec>?", skip_visit = true }, ] custom_source_order = true @@ -599,6 +664,9 @@ doc = "See also [MatchClass](https://docs.python.org/3/library/ast.html#ast.Matc fields = [ { name = "cls", type = "Box" }, { name = "arguments", type = "PatternArguments" }, + { name = "runtime_patterns", type = "Vec>?", skip_visit = true }, + { name = "runtime_kwd_attrs", type = "Vec?", skip_visit = true }, + { name = "runtime_kwd_patterns", type = "Vec>?", skip_visit = true }, ] [Pattern.nodes.PatternMatchStar] @@ -614,7 +682,10 @@ fields = [ [Pattern.nodes.PatternMatchOr] doc = "See also [MatchOr](https://docs.python.org/3/library/ast.html#ast.MatchOr)" -fields = [{ name = "patterns", type = "Pattern*" }] +fields = [ + { name = "patterns", type = "Pattern*" }, + { name = "runtime_patterns", type = "Vec>?", skip_visit = true }, +] [TypeParam] doc = "See also [type_param](https://docs.python.org/3/library/ast.html#ast.type_param)" diff --git a/crates/ruff_python_ast/generate.py b/crates/ruff_python_ast/generate.py index 1d360e891cc88..6d28d574a0360 100644 --- a/crates/ruff_python_ast/generate.py +++ b/crates/ruff_python_ast/generate.py @@ -44,6 +44,7 @@ "Alias", "Singleton", "PatternArguments", + "ConstantValue", } @@ -276,10 +277,10 @@ def __init__(self, rule: str) -> None: rule = rule[:-1] self.sequence_kind, self.name = split_sequence_type(rule) - if self.optional and self.sequence_kind is not None: + if self.optional and self.sequence_kind is not None and "<" not in rule: raise ValueError(f"optional field cannot be sequence or slice: {self.rule}") if self.sequence_kind is not None and ( - not self.name or any(ch in self.name for ch in "?*&[]<>") + not self.name or any(ch in self.name for ch in "?*&[]") ): raise ValueError(f"Invalid collection element type: {rule}") diff --git a/crates/ruff_python_ast/src/comparable.rs b/crates/ruff_python_ast/src/comparable.rs index c769effe628e6..dfc201d9f9b88 100644 --- a/crates/ruff_python_ast/src/comparable.rs +++ b/crates/ruff_python_ast/src/comparable.rs @@ -16,7 +16,7 @@ //! have the same shape in that they evaluate to the same value. use crate as ast; -use crate::{Expr, Number}; +use crate::{ConstantValue, Expr, Number}; use std::borrow::Cow; use std::hash::Hash; @@ -365,6 +365,44 @@ impl<'a> From<&'a ast::Number> for ComparableNumber<'a> { } } +#[derive(Debug, PartialEq, Eq, Hash)] +pub enum ComparableConstantValue<'a> { + None, + Boolean(bool), + Str(&'a str), + Bytes(Cow<'a, [u8]>), + Integer(&'a str), + Tuple(Vec), + Frozenset(Vec), + Float(u64), + Complex { real: u64, imag: u64 }, + Ellipsis, +} + +impl<'a> From<&'a ConstantValue> for ComparableConstantValue<'a> { + fn from(value: &'a ConstantValue) -> Self { + match value { + ConstantValue::None => Self::None, + ConstantValue::Boolean(value) => Self::Boolean(*value), + ConstantValue::Str(value) => Self::Str(value), + ConstantValue::Bytes(value) => Self::Bytes(Cow::from(value.as_ref())), + ConstantValue::Integer(value) => Self::Integer(value), + ConstantValue::Tuple(elements) => { + Self::Tuple(elements.iter().map(Into::into).collect()) + } + ConstantValue::Frozenset(elements) => { + Self::Frozenset(elements.iter().map(Into::into).collect()) + } + ConstantValue::Float(value) => Self::Float(value.to_bits()), + ConstantValue::Complex { real, imag } => Self::Complex { + real: real.to_bits(), + imag: imag.to_bits(), + }, + ConstantValue::Ellipsis => Self::Ellipsis, + } + } +} + #[derive(Debug, Default, PartialEq, Eq, Hash)] pub struct ComparableArguments<'a> { args: Vec>, @@ -575,8 +613,7 @@ impl<'a> From<&'a ast::InterpolatedElement> for InterpolatedElement<'a> { debug_text, conversion, format_spec, - range: _, - node_index: _, + .. } = interpolated_element; Self { @@ -609,6 +646,7 @@ impl<'a> From<&'a ast::ElifElseClause> for ComparableElifElseClause<'a> { node_index: _, test, body, + .. } = elif_else_clause; Self { test: test.as_ref().map(Into::into), @@ -985,6 +1023,11 @@ pub struct ExprNumberLiteral<'a> { value: ComparableNumber<'a>, } +#[derive(Debug, PartialEq, Eq, Hash)] +pub struct ExprConstant<'a> { + value: ComparableConstantValue<'a>, +} + #[derive(Debug, PartialEq, Eq, Hash)] pub struct ExprBoolLiteral { value: bool, @@ -1061,6 +1104,7 @@ pub enum ComparableExpr<'a> { StringLiteral(ExprStringLiteral<'a>), BytesLiteral(ExprBytesLiteral<'a>), NumberLiteral(ExprNumberLiteral<'a>), + Constant(ExprConstant<'a>), BoolLiteral(ExprBoolLiteral), NoneLiteral, EllipsisLiteral, @@ -1089,92 +1133,54 @@ impl<'a> From<&'a Box> for ComparableExpr<'a> { impl<'a> From<&'a ast::Expr> for ComparableExpr<'a> { fn from(expr: &'a ast::Expr) -> Self { match expr { - ast::Expr::BoolOp(ast::ExprBoolOp { - op, - values, - range: _, - node_index: _, - }) => Self::BoolOp(ExprBoolOp { + ast::Expr::BoolOp(ast::ExprBoolOp { op, values, .. }) => Self::BoolOp(ExprBoolOp { op: (*op).into(), values: values.iter().map(Into::into).collect(), }), - ast::Expr::Named(ast::ExprNamed { - target, - value, - range: _, - node_index: _, - }) => Self::NamedExpr(ExprNamed { + ast::Expr::Named(ast::ExprNamed { target, value, .. }) => Self::NamedExpr(ExprNamed { target: target.into(), value: value.into(), }), ast::Expr::BinOp(ast::ExprBinOp { - left, - op, - right, - range: _, - node_index: _, + left, op, right, .. }) => Self::BinOp(ExprBinOp { left: left.into(), op: (*op).into(), right: right.into(), }), - ast::Expr::UnaryOp(ast::ExprUnaryOp { - op, - operand, - range: _, - node_index: _, - }) => Self::UnaryOp(ExprUnaryOp { - op: (*op).into(), - operand: operand.into(), - }), + ast::Expr::UnaryOp(ast::ExprUnaryOp { op, operand, .. }) => { + Self::UnaryOp(ExprUnaryOp { + op: (*op).into(), + operand: operand.into(), + }) + } ast::Expr::Lambda(ast::ExprLambda { - parameters, - body, - range: _, - node_index: _, + parameters, body, .. }) => Self::Lambda(ExprLambda { parameters: parameters.as_ref().map(Into::into), body: body.into(), }), ast::Expr::If(ast::ExprIf { - test, - body, - orelse, - range: _, - node_index: _, + test, body, orelse, .. }) => Self::IfExp(ExprIf { test: test.into(), body: body.into(), orelse: orelse.into(), }), - ast::Expr::Dict(ast::ExprDict { - items, - range: _, - node_index: _, - }) => Self::Dict(ExprDict { + ast::Expr::Dict(ast::ExprDict { items, .. }) => Self::Dict(ExprDict { items: items.iter().map(ComparableDictItem::from).collect(), }), - ast::Expr::Set(ast::ExprSet { - elts, - range: _, - node_index: _, - }) => Self::Set(ExprSet { + ast::Expr::Set(ast::ExprSet { elts, .. }) => Self::Set(ExprSet { elts: elts.iter().map(Into::into).collect(), }), ast::Expr::ListComp(ast::ExprListComp { - elt, - generators, - range: _, - node_index: _, + elt, generators, .. }) => Self::ListComp(ExprListComp { elt: elt.into(), generators: generators.iter().map(Into::into).collect(), }), ast::Expr::SetComp(ast::ExprSetComp { - elt, - generators, - range: _, - node_index: _, + elt, generators, .. }) => Self::SetComp(ExprSetComp { elt: elt.into(), generators: generators.iter().map(Into::into).collect(), @@ -1183,173 +1189,110 @@ impl<'a> From<&'a ast::Expr> for ComparableExpr<'a> { key, value, generators, - range: _, - node_index: _, + .. }) => Self::DictComp(ExprDictComp { key: key.as_ref().map(Into::into), value: value.into(), generators: generators.iter().map(Into::into).collect(), }), ast::Expr::Generator(ast::ExprGenerator { - elt, - generators, - range: _, - node_index: _, - parenthesized: _, + elt, generators, .. }) => Self::GeneratorExp(ExprGenerator { elt: elt.into(), generators: generators.iter().map(Into::into).collect(), }), - ast::Expr::Await(ast::ExprAwait { - value, - range: _, - node_index: _, - }) => Self::Await(ExprAwait { + ast::Expr::Await(ast::ExprAwait { value, .. }) => Self::Await(ExprAwait { value: value.into(), }), - ast::Expr::Yield(ast::ExprYield { - value, - range: _, - node_index: _, - }) => Self::Yield(ExprYield { + ast::Expr::Yield(ast::ExprYield { value, .. }) => Self::Yield(ExprYield { value: value.as_ref().map(Into::into), }), - ast::Expr::YieldFrom(ast::ExprYieldFrom { - value, - range: _, - node_index: _, - }) => Self::YieldFrom(ExprYieldFrom { - value: value.into(), - }), + ast::Expr::YieldFrom(ast::ExprYieldFrom { value, .. }) => { + Self::YieldFrom(ExprYieldFrom { + value: value.into(), + }) + } ast::Expr::Compare(ast::ExprCompare { left, ops, comparators, - range: _, - node_index: _, + .. }) => Self::Compare(ExprCompare { left: left.into(), ops: ops.iter().copied().map(Into::into).collect(), comparators: comparators.iter().map(Into::into).collect(), }), ast::Expr::Call(ast::ExprCall { - func, - arguments, - range_start: _, - node_index: _, + func, arguments, .. }) => Self::Call(ExprCall { func: func.into(), arguments: arguments.into(), }), - ast::Expr::FString(ast::ExprFString { - value, - range: _, - node_index: _, - }) => Self::FString(ExprFString { + ast::Expr::FString(ast::ExprFString { value, .. }) => Self::FString(ExprFString { value: value.into(), }), - ast::Expr::TString(ast::ExprTString { - value, - range: _, - node_index: _, - }) => Self::TString(ExprTString { + ast::Expr::TString(ast::ExprTString { value, .. }) => Self::TString(ExprTString { value: value.into(), }), - ast::Expr::StringLiteral(ast::ExprStringLiteral { - value, - range: _, - node_index: _, - }) => Self::StringLiteral(ExprStringLiteral { - value: ComparableStringLiteral { - value: value.to_str(), - }, - }), - ast::Expr::BytesLiteral(ast::ExprBytesLiteral { - value, - range: _, - node_index: _, - }) => Self::BytesLiteral(ExprBytesLiteral { - value: ComparableBytesLiteral { - value: Cow::from(value), - }, - }), - ast::Expr::NumberLiteral(ast::ExprNumberLiteral { - value, - range: _, - node_index: _, - }) => Self::NumberLiteral(ExprNumberLiteral { + ast::Expr::StringLiteral(ast::ExprStringLiteral { value, .. }) => { + Self::StringLiteral(ExprStringLiteral { + value: ComparableStringLiteral { + value: value.to_str(), + }, + }) + } + ast::Expr::BytesLiteral(ast::ExprBytesLiteral { value, .. }) => { + Self::BytesLiteral(ExprBytesLiteral { + value: ComparableBytesLiteral { + value: Cow::from(value), + }, + }) + } + ast::Expr::NumberLiteral(ast::ExprNumberLiteral { value, .. }) => { + Self::NumberLiteral(ExprNumberLiteral { + value: value.into(), + }) + } + ast::Expr::Constant(ast::ExprConstant { value, .. }) => Self::Constant(ExprConstant { value: value.into(), }), - ast::Expr::BooleanLiteral(ast::ExprBooleanLiteral { - value, - range: _, - node_index: _, - }) => Self::BoolLiteral(ExprBoolLiteral { value: *value }), + ast::Expr::BooleanLiteral(ast::ExprBooleanLiteral { value, .. }) => { + Self::BoolLiteral(ExprBoolLiteral { value: *value }) + } ast::Expr::NoneLiteral(_) => Self::NoneLiteral, ast::Expr::EllipsisLiteral(_) => Self::EllipsisLiteral, - ast::Expr::Attribute(ast::ExprAttribute { - value, - attr, - ctx: _, - range: _, - node_index: _, - }) => Self::Attribute(ExprAttribute { - value: value.into(), - attr: attr.as_str(), - }), - ast::Expr::Subscript(ast::ExprSubscript { - value, - slice, - ctx: _, - range: _, - node_index: _, - }) => Self::Subscript(ExprSubscript { - value: value.into(), - slice: slice.into(), - }), - ast::Expr::Starred(ast::ExprStarred { - value, - ctx: _, - range: _, - node_index: _, - }) => Self::Starred(ExprStarred { + ast::Expr::Attribute(ast::ExprAttribute { value, attr, .. }) => { + Self::Attribute(ExprAttribute { + value: value.into(), + attr: attr.as_str(), + }) + } + ast::Expr::Subscript(ast::ExprSubscript { value, slice, .. }) => { + Self::Subscript(ExprSubscript { + value: value.into(), + slice: slice.into(), + }) + } + ast::Expr::Starred(ast::ExprStarred { value, .. }) => Self::Starred(ExprStarred { value: value.into(), }), ast::Expr::Name(name) => name.into(), - ast::Expr::List(ast::ExprList { - elts, - ctx: _, - range: _, - node_index: _, - }) => Self::List(ExprList { + ast::Expr::List(ast::ExprList { elts, .. }) => Self::List(ExprList { elts: elts.iter().map(Into::into).collect(), }), - ast::Expr::Tuple(ast::ExprTuple { - elts, - ctx: _, - range: _, - node_index: _, - parenthesized: _, - }) => Self::Tuple(ExprTuple { + ast::Expr::Tuple(ast::ExprTuple { elts, .. }) => Self::Tuple(ExprTuple { elts: elts.iter().map(Into::into).collect(), }), ast::Expr::Slice(ast::ExprSlice { - lower, - upper, - step, - range: _, - node_index: _, + lower, upper, step, .. }) => Self::Slice(ExprSlice { lower: lower.as_ref().map(Into::into), upper: upper.as_ref().map(Into::into), step: step.as_ref().map(Into::into), }), - ast::Expr::IpyEscapeCommand(ast::ExprIpyEscapeCommand { - kind, - value, - range: _, - node_index: _, - }) => Self::IpyEscapeCommand(ExprIpyEscapeCommand { kind: *kind, value }), + ast::Expr::IpyEscapeCommand(ast::ExprIpyEscapeCommand { kind, value, .. }) => { + Self::IpyEscapeCommand(ExprIpyEscapeCommand { kind: *kind, value }) + } } } } @@ -1432,31 +1375,24 @@ impl<'a> From<&'a ast::TypeParam> for ComparableTypeParam<'a> { name, bound, default, - range: _, - node_index: _, + .. }) => Self::TypeVar(TypeParamTypeVar { name: name.as_str(), bound: bound.as_ref().map(Into::into), default: default.as_ref().map(Into::into), }), - ast::TypeParam::TypeVarTuple(ast::TypeParamTypeVarTuple { - name, - default, - range: _, - node_index: _, - }) => Self::TypeVarTuple(TypeParamTypeVarTuple { - name: name.as_str(), - default: default.as_ref().map(Into::into), - }), - ast::TypeParam::ParamSpec(ast::TypeParamParamSpec { - name, - default, - range: _, - node_index: _, - }) => Self::ParamSpec(TypeParamParamSpec { - name: name.as_str(), - default: default.as_ref().map(Into::into), - }), + ast::TypeParam::TypeVarTuple(ast::TypeParamTypeVarTuple { name, default, .. }) => { + Self::TypeVarTuple(TypeParamTypeVarTuple { + name: name.as_str(), + default: default.as_ref().map(Into::into), + }) + } + ast::TypeParam::ParamSpec(ast::TypeParamParamSpec { name, default, .. }) => { + Self::ParamSpec(TypeParamParamSpec { + name: name.as_str(), + default: default.as_ref().map(Into::into), + }) + } } } } @@ -1633,8 +1569,7 @@ impl<'a> From<&'a ast::Stmt> for ComparableStmt<'a> { decorator_list, returns, type_params, - range: _, - node_index: _, + .. }) => Self::FunctionDef(StmtFunctionDef { is_async: *is_async, name: name.as_str(), @@ -1650,8 +1585,7 @@ impl<'a> From<&'a ast::Stmt> for ComparableStmt<'a> { body, decorator_list, type_params, - range: _, - node_index: _, + .. }) => Self::ClassDef(StmtClassDef { name: name.as_str(), arguments: arguments.as_ref().map(Into::into).unwrap_or_default(), @@ -1659,18 +1593,10 @@ impl<'a> From<&'a ast::Stmt> for ComparableStmt<'a> { decorator_list: decorator_list.iter().map(Into::into).collect(), type_params: type_params.as_ref().map(Into::into), }), - ast::Stmt::Return(ast::StmtReturn { - value, - range: _, - node_index: _, - }) => Self::Return(StmtReturn { + ast::Stmt::Return(ast::StmtReturn { value, .. }) => Self::Return(StmtReturn { value: value.as_ref().map(Into::into), }), - ast::Stmt::Delete(ast::StmtDelete { - targets, - range: _, - node_index: _, - }) => Self::Delete(StmtDelete { + ast::Stmt::Delete(ast::StmtDelete { targets, .. }) => Self::Delete(StmtDelete { targets: targets.iter().map(Into::into).collect(), }), ast::Stmt::TypeAlias(ast::StmtTypeAlias { @@ -1684,21 +1610,12 @@ impl<'a> From<&'a ast::Stmt> for ComparableStmt<'a> { type_params: type_params.as_ref().map(Into::into), value: value.into(), }), - ast::Stmt::Assign(ast::StmtAssign { - targets, - value, - range: _, - node_index: _, - }) => Self::Assign(StmtAssign { + ast::Stmt::Assign(ast::StmtAssign { targets, value, .. }) => Self::Assign(StmtAssign { targets: targets.iter().map(Into::into).collect(), value: value.into(), }), ast::Stmt::AugAssign(ast::StmtAugAssign { - target, - op, - value, - range: _, - node_index: _, + target, op, value, .. }) => Self::AugAssign(StmtAugAssign { target: target.into(), op: (*op).into(), @@ -1709,8 +1626,7 @@ impl<'a> From<&'a ast::Stmt> for ComparableStmt<'a> { annotation, value, simple, - range: _, - node_index: _, + .. }) => Self::AnnAssign(StmtAnnAssign { target: target.into(), annotation: annotation.into(), @@ -1723,8 +1639,7 @@ impl<'a> From<&'a ast::Stmt> for ComparableStmt<'a> { iter, body, orelse, - range: _, - node_index: _, + .. }) => Self::For(StmtFor { is_async: *is_async, target: target.into(), @@ -1733,11 +1648,7 @@ impl<'a> From<&'a ast::Stmt> for ComparableStmt<'a> { orelse: orelse.iter().map(Into::into).collect(), }), ast::Stmt::While(ast::StmtWhile { - test, - body, - orelse, - range: _, - node_index: _, + test, body, orelse, .. }) => Self::While(StmtWhile { test: test.into(), body: body.iter().map(Into::into).collect(), @@ -1747,8 +1658,7 @@ impl<'a> From<&'a ast::Stmt> for ComparableStmt<'a> { test, body, elif_else_clauses, - range: _, - node_index: _, + .. }) => Self::If(StmtIf { test: test.into(), body: body.iter().map(Into::into).collect(), @@ -1758,28 +1668,17 @@ impl<'a> From<&'a ast::Stmt> for ComparableStmt<'a> { is_async, items, body, - range: _, - node_index: _, + .. }) => Self::With(StmtWith { is_async: *is_async, items: items.iter().map(Into::into).collect(), body: body.iter().map(Into::into).collect(), }), - ast::Stmt::Match(ast::StmtMatch { - subject, - cases, - range: _, - node_index: _, - }) => Self::Match(StmtMatch { + ast::Stmt::Match(ast::StmtMatch { subject, cases, .. }) => Self::Match(StmtMatch { subject: subject.into(), cases: cases.iter().map(Into::into).collect(), }), - ast::Stmt::Raise(ast::StmtRaise { - exc, - cause, - range: _, - node_index: _, - }) => Self::Raise(StmtRaise { + ast::Stmt::Raise(ast::StmtRaise { exc, cause, .. }) => Self::Raise(StmtRaise { exc: exc.as_ref().map(Into::into), cause: cause.as_ref().map(Into::into), }), @@ -1789,8 +1688,7 @@ impl<'a> From<&'a ast::Stmt> for ComparableStmt<'a> { orelse, finalbody, is_star, - range: _, - node_index: _, + .. }) => Self::Try(StmtTry { body: body.iter().map(Into::into).collect(), handlers: handlers.iter().map(Into::into).collect(), @@ -1798,21 +1696,11 @@ impl<'a> From<&'a ast::Stmt> for ComparableStmt<'a> { finalbody: finalbody.iter().map(Into::into).collect(), is_star: *is_star, }), - ast::Stmt::Assert(ast::StmtAssert { - test, - msg, - range: _, - node_index: _, - }) => Self::Assert(StmtAssert { + ast::Stmt::Assert(ast::StmtAssert { test, msg, .. }) => Self::Assert(StmtAssert { test: test.into(), msg: msg.as_ref().map(Into::into), }), - ast::Stmt::Import(ast::StmtImport { - names, - is_lazy, - range: _, - node_index: _, - }) => Self::Import(StmtImport { + ast::Stmt::Import(ast::StmtImport { names, is_lazy, .. }) => Self::Import(StmtImport { names: names.iter().map(Into::into).collect(), is_lazy: *is_lazy, }), @@ -1821,39 +1709,23 @@ impl<'a> From<&'a ast::Stmt> for ComparableStmt<'a> { names, level, is_lazy, - range: _, - node_index: _, + .. }) => Self::ImportFrom(StmtImportFrom { module: module.as_deref(), names: names.iter().map(Into::into).collect(), level: *level, is_lazy: *is_lazy, }), - ast::Stmt::Global(ast::StmtGlobal { - names, - range: _, - node_index: _, - }) => Self::Global(StmtGlobal { + ast::Stmt::Global(ast::StmtGlobal { names, .. }) => Self::Global(StmtGlobal { names: names.iter().map(ast::Identifier::as_str).collect(), }), - ast::Stmt::Nonlocal(ast::StmtNonlocal { - names, - range: _, - node_index: _, - }) => Self::Nonlocal(StmtNonlocal { + ast::Stmt::Nonlocal(ast::StmtNonlocal { names, .. }) => Self::Nonlocal(StmtNonlocal { names: names.iter().map(ast::Identifier::as_str).collect(), }), - ast::Stmt::IpyEscapeCommand(ast::StmtIpyEscapeCommand { - kind, - value, - range: _, - node_index: _, - }) => Self::IpyEscapeCommand(StmtIpyEscapeCommand { kind: *kind, value }), - ast::Stmt::Expr(ast::StmtExpr { - value, - range: _, - node_index: _, - }) => Self::Expr(StmtExpr { + ast::Stmt::IpyEscapeCommand(ast::StmtIpyEscapeCommand { kind, value, .. }) => { + Self::IpyEscapeCommand(StmtIpyEscapeCommand { kind: *kind, value }) + } + ast::Stmt::Expr(ast::StmtExpr { value, .. }) => Self::Expr(StmtExpr { value: value.into(), }), ast::Stmt::Pass(_) => Self::Pass, @@ -2055,6 +1927,12 @@ impl<'a> From<&'a Expr> for HashableExpr<'a> { Expr::BooleanLiteral(boolean) => Some(HashableNumber::real(HashableReal::Integer( i128::from(u8::from(boolean.value)), ))), + Expr::Constant(ast::ExprConstant { + value: ConstantValue::Boolean(value), + .. + }) => Some(HashableNumber::real(HashableReal::Integer(i128::from( + u8::from(*value), + )))), Expr::NumberLiteral(number) => match &number.value { Number::Int(int) => HashableReal::from_int(int).map(HashableNumber::real), Number::Float(float) => { diff --git a/crates/ruff_python_ast/src/generated.rs b/crates/ruff_python_ast/src/generated.rs index 086ba0ffeb6f7..6c01a570bcf83 100644 --- a/crates/ruff_python_ast/src/generated.rs +++ b/crates/ruff_python_ast/src/generated.rs @@ -1321,6 +1321,7 @@ pub enum Expr { BooleanLiteral(crate::ExprBooleanLiteral), NoneLiteral(crate::ExprNoneLiteral), EllipsisLiteral(crate::ExprEllipsisLiteral), + Constant(crate::ExprConstant), Attribute(crate::ExprAttribute), Subscript(crate::ExprSubscript), Starred(crate::ExprStarred), @@ -1481,6 +1482,12 @@ impl From for Expr { } } +impl From for Expr { + fn from(node: crate::ExprConstant) -> Self { + Self::Constant(node) + } +} + impl From for Expr { fn from(node: crate::ExprAttribute) -> Self { Self::Attribute(node) @@ -1557,6 +1564,7 @@ impl ruff_text_size::Ranged for Expr { Self::BooleanLiteral(node) => node.range(), Self::NoneLiteral(node) => node.range(), Self::EllipsisLiteral(node) => node.range(), + Self::Constant(node) => node.range(), Self::Attribute(node) => node.range(), Self::Subscript(node) => node.range(), Self::Starred(node) => node.range(), @@ -1597,6 +1605,7 @@ impl crate::HasNodeIndex for Expr { Self::BooleanLiteral(node) => node.node_index(), Self::NoneLiteral(node) => node.node_index(), Self::EllipsisLiteral(node) => node.node_index(), + Self::Constant(node) => node.node_index(), Self::Attribute(node) => node.node_index(), Self::Subscript(node) => node.node_index(), Self::Starred(node) => node.node_index(), @@ -2536,6 +2545,43 @@ impl Expr { } } + #[inline] + pub const fn is_constant_expr(&self) -> bool { + matches!(self, Self::Constant(_)) + } + + #[inline] + pub fn constant_expr(self) -> Option { + match self { + Self::Constant(val) => Some(val), + _ => None, + } + } + + #[inline] + pub fn expect_constant_expr(self) -> crate::ExprConstant { + match self { + Self::Constant(val) => val, + _ => panic!("called expect on {self:?}"), + } + } + + #[inline] + pub fn as_constant_expr_mut(&mut self) -> Option<&mut crate::ExprConstant> { + match self { + Self::Constant(val) => Some(val), + _ => None, + } + } + + #[inline] + pub fn as_constant_expr(&self) -> Option<&crate::ExprConstant> { + match self { + Self::Constant(val) => Some(val), + _ => None, + } + } + #[inline] pub const fn is_attribute_expr(&self) -> bool { matches!(self, Self::Attribute(_)) @@ -3870,6 +3916,12 @@ impl ruff_text_size::Ranged for crate::ExprEllipsisLiteral { } } +impl ruff_text_size::Ranged for crate::ExprConstant { + fn range(&self) -> ruff_text_size::TextRange { + self.range + } +} + impl ruff_text_size::Ranged for crate::ExprAttribute { fn range(&self) -> ruff_text_size::TextRange { self.range @@ -4434,6 +4486,12 @@ impl crate::HasNodeIndex for crate::ExprEllipsisLiteral { } } +impl crate::HasNodeIndex for crate::ExprConstant { + fn node_index(&self) -> &crate::AtomicNodeIndex { + &self.node_index + } +} + impl crate::HasNodeIndex for crate::ExprAttribute { fn node_index(&self) -> &crate::AtomicNodeIndex { &self.node_index @@ -4767,6 +4825,7 @@ impl Expr { Expr::BooleanLiteral(node) => node.visit_source_order(visitor), Expr::NoneLiteral(node) => node.visit_source_order(visitor), Expr::EllipsisLiteral(node) => node.visit_source_order(visitor), + Expr::Constant(node) => node.visit_source_order(visitor), Expr::Attribute(node) => node.visit_source_order(visitor), Expr::Subscript(node) => node.visit_source_order(visitor), Expr::Starred(node) => node.visit_source_order(visitor), @@ -5240,6 +5299,8 @@ pub enum ExprRef<'a> { NoneLiteral(&'a crate::ExprNoneLiteral), #[is(name = "ellipsis_literal_expr")] EllipsisLiteral(&'a crate::ExprEllipsisLiteral), + #[is(name = "constant_expr")] + Constant(&'a crate::ExprConstant), #[is(name = "attribute_expr")] Attribute(&'a crate::ExprAttribute), #[is(name = "subscript_expr")] @@ -5286,6 +5347,7 @@ impl<'a> From<&'a Expr> for ExprRef<'a> { Expr::BooleanLiteral(node) => ExprRef::BooleanLiteral(node), Expr::NoneLiteral(node) => ExprRef::NoneLiteral(node), Expr::EllipsisLiteral(node) => ExprRef::EllipsisLiteral(node), + Expr::Constant(node) => ExprRef::Constant(node), Expr::Attribute(node) => ExprRef::Attribute(node), Expr::Subscript(node) => ExprRef::Subscript(node), Expr::Starred(node) => ExprRef::Starred(node), @@ -5448,6 +5510,12 @@ impl<'a> From<&'a crate::ExprEllipsisLiteral> for ExprRef<'a> { } } +impl<'a> From<&'a crate::ExprConstant> for ExprRef<'a> { + fn from(node: &'a crate::ExprConstant) -> Self { + Self::Constant(node) + } +} + impl<'a> From<&'a crate::ExprAttribute> for ExprRef<'a> { fn from(node: &'a crate::ExprAttribute) -> Self { Self::Attribute(node) @@ -5524,6 +5592,7 @@ impl ruff_text_size::Ranged for ExprRef<'_> { Self::BooleanLiteral(node) => node.range(), Self::NoneLiteral(node) => node.range(), Self::EllipsisLiteral(node) => node.range(), + Self::Constant(node) => node.range(), Self::Attribute(node) => node.range(), Self::Subscript(node) => node.range(), Self::Starred(node) => node.range(), @@ -5564,6 +5633,7 @@ impl crate::HasNodeIndex for ExprRef<'_> { Self::BooleanLiteral(node) => node.node_index(), Self::NoneLiteral(node) => node.node_index(), Self::EllipsisLiteral(node) => node.node_index(), + Self::Constant(node) => node.node_index(), Self::Attribute(node) => node.node_index(), Self::Subscript(node) => node.node_index(), Self::Starred(node) => node.node_index(), @@ -5881,6 +5951,7 @@ pub enum AnyNodeRef<'a> { ExprBooleanLiteral(&'a crate::ExprBooleanLiteral), ExprNoneLiteral(&'a crate::ExprNoneLiteral), ExprEllipsisLiteral(&'a crate::ExprEllipsisLiteral), + ExprConstant(&'a crate::ExprConstant), ExprAttribute(&'a crate::ExprAttribute), ExprSubscript(&'a crate::ExprSubscript), ExprStarred(&'a crate::ExprStarred), @@ -6080,6 +6151,7 @@ impl<'a> From<&'a Expr> for AnyNodeRef<'a> { Expr::BooleanLiteral(node) => AnyNodeRef::ExprBooleanLiteral(node), Expr::NoneLiteral(node) => AnyNodeRef::ExprNoneLiteral(node), Expr::EllipsisLiteral(node) => AnyNodeRef::ExprEllipsisLiteral(node), + Expr::Constant(node) => AnyNodeRef::ExprConstant(node), Expr::Attribute(node) => AnyNodeRef::ExprAttribute(node), Expr::Subscript(node) => AnyNodeRef::ExprSubscript(node), Expr::Starred(node) => AnyNodeRef::ExprStarred(node), @@ -6120,6 +6192,7 @@ impl<'a> From> for AnyNodeRef<'a> { ExprRef::BooleanLiteral(node) => AnyNodeRef::ExprBooleanLiteral(node), ExprRef::NoneLiteral(node) => AnyNodeRef::ExprNoneLiteral(node), ExprRef::EllipsisLiteral(node) => AnyNodeRef::ExprEllipsisLiteral(node), + ExprRef::Constant(node) => AnyNodeRef::ExprConstant(node), ExprRef::Attribute(node) => AnyNodeRef::ExprAttribute(node), ExprRef::Subscript(node) => AnyNodeRef::ExprSubscript(node), ExprRef::Starred(node) => AnyNodeRef::ExprStarred(node), @@ -6160,6 +6233,7 @@ impl<'a> AnyNodeRef<'a> { Self::ExprBooleanLiteral(node) => Some(ExprRef::BooleanLiteral(node)), Self::ExprNoneLiteral(node) => Some(ExprRef::NoneLiteral(node)), Self::ExprEllipsisLiteral(node) => Some(ExprRef::EllipsisLiteral(node)), + Self::ExprConstant(node) => Some(ExprRef::Constant(node)), Self::ExprAttribute(node) => Some(ExprRef::Attribute(node)), Self::ExprSubscript(node) => Some(ExprRef::Subscript(node)), Self::ExprStarred(node) => Some(ExprRef::Starred(node)), @@ -6630,6 +6704,12 @@ impl<'a> From<&'a crate::ExprEllipsisLiteral> for AnyNodeRef<'a> { } } +impl<'a> From<&'a crate::ExprConstant> for AnyNodeRef<'a> { + fn from(node: &'a crate::ExprConstant) -> AnyNodeRef<'a> { + AnyNodeRef::ExprConstant(node) + } +} + impl<'a> From<&'a crate::ExprAttribute> for AnyNodeRef<'a> { fn from(node: &'a crate::ExprAttribute) -> AnyNodeRef<'a> { AnyNodeRef::ExprAttribute(node) @@ -6937,6 +7017,7 @@ impl ruff_text_size::Ranged for AnyNodeRef<'_> { AnyNodeRef::ExprBooleanLiteral(node) => node.range(), AnyNodeRef::ExprNoneLiteral(node) => node.range(), AnyNodeRef::ExprEllipsisLiteral(node) => node.range(), + AnyNodeRef::ExprConstant(node) => node.range(), AnyNodeRef::ExprAttribute(node) => node.range(), AnyNodeRef::ExprSubscript(node) => node.range(), AnyNodeRef::ExprStarred(node) => node.range(), @@ -7038,6 +7119,7 @@ impl crate::HasNodeIndex for AnyNodeRef<'_> { AnyNodeRef::ExprBooleanLiteral(node) => node.node_index(), AnyNodeRef::ExprNoneLiteral(node) => node.node_index(), AnyNodeRef::ExprEllipsisLiteral(node) => node.node_index(), + AnyNodeRef::ExprConstant(node) => node.node_index(), AnyNodeRef::ExprAttribute(node) => node.node_index(), AnyNodeRef::ExprSubscript(node) => node.node_index(), AnyNodeRef::ExprStarred(node) => node.node_index(), @@ -7139,6 +7221,7 @@ impl AnyNodeRef<'_> { AnyNodeRef::ExprBooleanLiteral(node) => std::ptr::NonNull::from(*node).cast(), AnyNodeRef::ExprNoneLiteral(node) => std::ptr::NonNull::from(*node).cast(), AnyNodeRef::ExprEllipsisLiteral(node) => std::ptr::NonNull::from(*node).cast(), + AnyNodeRef::ExprConstant(node) => std::ptr::NonNull::from(*node).cast(), AnyNodeRef::ExprAttribute(node) => std::ptr::NonNull::from(*node).cast(), AnyNodeRef::ExprSubscript(node) => std::ptr::NonNull::from(*node).cast(), AnyNodeRef::ExprStarred(node) => std::ptr::NonNull::from(*node).cast(), @@ -7246,6 +7329,7 @@ impl<'a> AnyNodeRef<'a> { AnyNodeRef::ExprBooleanLiteral(node) => node.visit_source_order(visitor), AnyNodeRef::ExprNoneLiteral(node) => node.visit_source_order(visitor), AnyNodeRef::ExprEllipsisLiteral(node) => node.visit_source_order(visitor), + AnyNodeRef::ExprConstant(node) => node.visit_source_order(visitor), AnyNodeRef::ExprAttribute(node) => node.visit_source_order(visitor), AnyNodeRef::ExprSubscript(node) => node.visit_source_order(visitor), AnyNodeRef::ExprStarred(node) => node.visit_source_order(visitor), @@ -7363,6 +7447,7 @@ impl AnyNodeRef<'_> { | AnyNodeRef::ExprBooleanLiteral(_) | AnyNodeRef::ExprNoneLiteral(_) | AnyNodeRef::ExprEllipsisLiteral(_) + | AnyNodeRef::ExprConstant(_) | AnyNodeRef::ExprAttribute(_) | AnyNodeRef::ExprSubscript(_) | AnyNodeRef::ExprStarred(_) @@ -8135,6 +8220,16 @@ impl<'a> TryFrom> for &'a crate::ExprEllipsisLiteral { } } +impl<'a> TryFrom> for &'a crate::ExprConstant { + type Error = (); + fn try_from(node: AnyRootNodeRef<'a>) -> Result<&'a crate::ExprConstant, ()> { + match node { + AnyRootNodeRef::Expr(Expr::Constant(node)) => Ok(node), + _ => Err(()), + } + } +} + impl<'a> TryFrom> for &'a crate::ExprAttribute { type Error = (); fn try_from(node: AnyRootNodeRef<'a>) -> Result<&'a crate::ExprAttribute, ()> { @@ -9127,6 +9222,7 @@ pub enum NodeKind { ExprBooleanLiteral, ExprNoneLiteral, ExprEllipsisLiteral, + ExprConstant, ExprAttribute, ExprSubscript, ExprStarred, @@ -9226,6 +9322,7 @@ impl AnyNodeRef<'_> { AnyNodeRef::ExprBooleanLiteral(_) => NodeKind::ExprBooleanLiteral, AnyNodeRef::ExprNoneLiteral(_) => NodeKind::ExprNoneLiteral, AnyNodeRef::ExprEllipsisLiteral(_) => NodeKind::ExprEllipsisLiteral, + AnyNodeRef::ExprConstant(_) => NodeKind::ExprConstant, AnyNodeRef::ExprAttribute(_) => NodeKind::ExprAttribute, AnyNodeRef::ExprSubscript(_) => NodeKind::ExprSubscript, AnyNodeRef::ExprStarred(_) => NodeKind::ExprStarred, @@ -9281,6 +9378,7 @@ pub struct ModModule { pub node_index: crate::AtomicNodeIndex, pub range: ruff_text_size::TextRange, pub body: thin_vec::ThinVec, + pub runtime_body: Option>>, } /// See also [Module](https://docs.python.org/3/library/ast.html#ast.Module) @@ -9308,6 +9406,10 @@ pub struct StmtFunctionDef { pub parameters: Box, pub returns: Option>, pub body: thin_vec::ThinVec, + pub runtime_decorator_list: Option>>, + pub runtime_type_comment: Option>, + pub runtime_type_comment_bytes: Option>, + pub runtime_body: Option>>, } /// See also [ClassDef](https://docs.python.org/3/library/ast.html#ast.ClassDef) @@ -9321,6 +9423,8 @@ pub struct StmtClassDef { pub type_params: Option>, pub arguments: Option>, pub body: thin_vec::ThinVec, + pub runtime_decorator_list: Option>>, + pub runtime_body: Option>>, } /// See also [Return](https://docs.python.org/3/library/ast.html#ast.Return) @@ -9339,6 +9443,7 @@ pub struct StmtDelete { pub node_index: crate::AtomicNodeIndex, pub range: ruff_text_size::TextRange, pub targets: Vec, + pub runtime_targets: Option>>, } /// See also [TypeAlias](https://docs.python.org/3/library/ast.html#ast.TypeAlias) @@ -9360,6 +9465,9 @@ pub struct StmtAssign { pub range: ruff_text_size::TextRange, pub targets: Vec, pub value: Box, + pub runtime_targets: Option>>, + pub runtime_type_comment: Option>, + pub runtime_type_comment_bytes: Option>, } /// See also [AugAssign](https://docs.python.org/3/library/ast.html#ast.AugAssign) @@ -9383,6 +9491,7 @@ pub struct StmtAnnAssign { pub annotation: Box, pub value: Option>, pub simple: bool, + pub runtime_simple: Option, } /// See also [For](https://docs.python.org/3/library/ast.html#ast.For) @@ -9399,6 +9508,10 @@ pub struct StmtFor { pub iter: Box, pub body: thin_vec::ThinVec, pub orelse: thin_vec::ThinVec, + pub runtime_type_comment: Option>, + pub runtime_type_comment_bytes: Option>, + pub runtime_body: Option>>, + pub runtime_orelse: Option>>, } /// See also [While](https://docs.python.org/3/library/ast.html#ast.While) @@ -9411,6 +9524,8 @@ pub struct StmtWhile { pub test: Box, pub body: thin_vec::ThinVec, pub orelse: thin_vec::ThinVec, + pub runtime_body: Option>>, + pub runtime_orelse: Option>>, } /// See also [If](https://docs.python.org/3/library/ast.html#ast.If) @@ -9422,6 +9537,7 @@ pub struct StmtIf { pub test: Box, pub body: thin_vec::ThinVec, pub elif_else_clauses: Vec, + pub runtime_body: Option>>, } /// See also [With](https://docs.python.org/3/library/ast.html#ast.With) @@ -9436,6 +9552,9 @@ pub struct StmtWith { pub is_async: bool, pub items: Vec, pub body: thin_vec::ThinVec, + pub runtime_type_comment: Option>, + pub runtime_type_comment_bytes: Option>, + pub runtime_body: Option>>, } /// See also [Match](https://docs.python.org/3/library/ast.html#ast.Match) @@ -9470,6 +9589,10 @@ pub struct StmtTry { pub orelse: thin_vec::ThinVec, pub finalbody: thin_vec::ThinVec, pub is_star: bool, + pub runtime_body: Option>>, + pub runtime_handlers: Option>>, + pub runtime_orelse: Option>>, + pub runtime_finalbody: Option>>, } /// See also [Assert](https://docs.python.org/3/library/ast.html#ast.Assert) @@ -9502,6 +9625,7 @@ pub struct StmtImportFrom { pub names: Vec, pub level: u32, pub is_lazy: bool, + pub runtime_level: Option, } /// See also [Global](https://docs.python.org/3/library/ast.html#ast.Global) @@ -9626,6 +9750,7 @@ pub struct ExprBoolOp { pub range: ruff_text_size::TextRange, pub op: crate::BoolOp, pub values: Vec, + pub runtime_values: Option>>, } /// See also [NamedExpr](https://docs.python.org/3/library/ast.html#ast.NamedExpr) @@ -9687,6 +9812,7 @@ pub struct ExprDict { pub node_index: crate::AtomicNodeIndex, pub range: ruff_text_size::TextRange, pub items: Vec, + pub runtime_values: Option>>, } /// See also [Set](https://docs.python.org/3/library/ast.html#ast.Set) @@ -9696,6 +9822,7 @@ pub struct ExprSet { pub node_index: crate::AtomicNodeIndex, pub range: ruff_text_size::TextRange, pub elts: Vec, + pub runtime_elts: Option>>, } /// See also [ListComp](https://docs.python.org/3/library/ast.html#ast.ListComp) @@ -9776,6 +9903,7 @@ pub struct ExprCompare { pub left: Box, pub ops: Box<[crate::CmpOp]>, pub comparators: Box<[Expr]>, + pub runtime_comparators: Option>>, } /// A call expression whose end offset is derived from its arguments. @@ -9807,6 +9935,8 @@ pub struct ExprFString { pub node_index: crate::AtomicNodeIndex, pub range: ruff_text_size::TextRange, pub value: crate::FStringValue, + pub runtime_joined_str: Option>, + pub runtime_values: Option>>, } /// An AST node that represents either a single-part t-string literal @@ -9823,6 +9953,8 @@ pub struct ExprTString { pub node_index: crate::AtomicNodeIndex, pub range: ruff_text_size::TextRange, pub value: crate::TStringValue, + pub runtime_template_str: Option>, + pub runtime_values: Option>>, } /// An AST node that represents either a single-part string literal @@ -9875,6 +10007,17 @@ pub struct ExprEllipsisLiteral { pub range: ruff_text_size::TextRange, } +/// See also [Constant](https://docs.python.org/3/library/ast.html#ast.Constant) +#[derive(Clone, Debug, PartialEq)] +#[cfg_attr(feature = "get-size", derive(get_size2::GetSize))] +pub struct ExprConstant { + pub node_index: crate::AtomicNodeIndex, + pub range: ruff_text_size::TextRange, + pub value: crate::ConstantValue, + pub kind: Option>, + pub invalid_type: Option>, +} + /// See also [Attribute](https://docs.python.org/3/library/ast.html#ast.Attribute) #[derive(Clone, Debug, PartialEq)] #[cfg_attr(feature = "get-size", derive(get_size2::GetSize))] @@ -9925,6 +10068,7 @@ pub struct ExprList { pub range: ruff_text_size::TextRange, pub elts: Vec, pub ctx: crate::ExprContext, + pub runtime_elts: Option>>, } /// See also [Tuple](https://docs.python.org/3/library/ast.html#ast.Tuple) @@ -9936,6 +10080,7 @@ pub struct ExprTuple { pub elts: Vec, pub ctx: crate::ExprContext, pub parenthesized: bool, + pub runtime_elts: Option>>, } /// See also [Slice](https://docs.python.org/3/library/ast.html#ast.Slice) @@ -9994,6 +10139,7 @@ pub struct PatternMatchSequence { pub node_index: crate::AtomicNodeIndex, pub range: ruff_text_size::TextRange, pub patterns: Vec, + pub runtime_patterns: Option>>, } /// See also [MatchMapping](https://docs.python.org/3/library/ast.html#ast.MatchMapping) @@ -10005,6 +10151,8 @@ pub struct PatternMatchMapping { pub keys: thin_vec::ThinVec, pub patterns: thin_vec::ThinVec, pub rest: Option, + pub runtime_keys: Option>>, + pub runtime_patterns: Option>>, } /// See also [MatchClass](https://docs.python.org/3/library/ast.html#ast.MatchClass) @@ -10015,6 +10163,9 @@ pub struct PatternMatchClass { pub range: ruff_text_size::TextRange, pub cls: Box, pub arguments: crate::PatternArguments, + pub runtime_patterns: Option>>, + pub runtime_kwd_attrs: Option>, + pub runtime_kwd_patterns: Option>>, } /// See also [MatchStar](https://docs.python.org/3/library/ast.html#ast.MatchStar) @@ -10043,6 +10194,7 @@ pub struct PatternMatchOr { pub node_index: crate::AtomicNodeIndex, pub range: ruff_text_size::TextRange, pub patterns: Vec, + pub runtime_patterns: Option>>, } /// See also [TypeVar](https://docs.python.org/3/library/ast.html#ast.TypeVar) @@ -10083,6 +10235,7 @@ impl ModModule { { let ModModule { body, + runtime_body: _, range: _, node_index: _, } = self; @@ -10117,6 +10270,10 @@ impl StmtFunctionDef { parameters, returns, body, + runtime_decorator_list: _, + runtime_type_comment: _, + runtime_type_comment_bytes: _, + runtime_body: _, range: _, node_index: _, } = self; @@ -10151,6 +10308,8 @@ impl StmtClassDef { type_params, arguments, body, + runtime_decorator_list: _, + runtime_body: _, range: _, node_index: _, } = self; @@ -10196,6 +10355,7 @@ impl StmtDelete { { let StmtDelete { targets, + runtime_targets: _, range: _, node_index: _, } = self; @@ -10236,6 +10396,9 @@ impl StmtAssign { let StmtAssign { targets, value, + runtime_targets: _, + runtime_type_comment: _, + runtime_type_comment_bytes: _, range: _, node_index: _, } = self; @@ -10275,6 +10438,7 @@ impl StmtAnnAssign { annotation, value, simple: _, + runtime_simple: _, range: _, node_index: _, } = self; @@ -10298,6 +10462,10 @@ impl StmtFor { iter, body, orelse, + runtime_type_comment: _, + runtime_type_comment_bytes: _, + runtime_body: _, + runtime_orelse: _, range: _, node_index: _, } = self; @@ -10317,6 +10485,8 @@ impl StmtWhile { test, body, orelse, + runtime_body: _, + runtime_orelse: _, range: _, node_index: _, } = self; @@ -10335,6 +10505,7 @@ impl StmtIf { test, body, elif_else_clauses, + runtime_body: _, range: _, node_index: _, } = self; @@ -10356,6 +10527,9 @@ impl StmtWith { is_async: _, items, body, + runtime_type_comment: _, + runtime_type_comment_bytes: _, + runtime_body: _, range: _, node_index: _, } = self; @@ -10419,6 +10593,10 @@ impl StmtTry { orelse, finalbody, is_star: _, + runtime_body: _, + runtime_handlers: _, + runtime_orelse: _, + runtime_finalbody: _, range: _, node_index: _, } = self; @@ -10479,6 +10657,7 @@ impl StmtImportFrom { names, level: _, is_lazy: _, + runtime_level: _, range: _, node_index: _, } = self; @@ -10686,6 +10865,7 @@ impl ExprSet { { let ExprSet { elts, + runtime_elts: _, range: _, node_index: _, } = self; @@ -10890,6 +11070,21 @@ impl ExprEllipsisLiteral { } } +impl ExprConstant { + pub(crate) fn visit_source_order<'a, V>(&'a self, _: &mut V) + where + V: SourceOrderVisitor<'a> + ?Sized, + { + let ExprConstant { + value: _, + kind: _, + invalid_type: _, + range: _, + node_index: _, + } = self; + } +} + impl ExprAttribute { pub(crate) fn visit_source_order<'a, V>(&'a self, visitor: &mut V) where @@ -10961,6 +11156,7 @@ impl ExprList { let ExprList { elts, ctx: _, + runtime_elts: _, range: _, node_index: _, } = self; @@ -10980,6 +11176,7 @@ impl ExprTuple { elts, ctx: _, parenthesized: _, + runtime_elts: _, range: _, node_index: _, } = self; @@ -11066,6 +11263,7 @@ impl PatternMatchSequence { { let PatternMatchSequence { patterns, + runtime_patterns: _, range: _, node_index: _, } = self; @@ -11084,6 +11282,9 @@ impl PatternMatchClass { let PatternMatchClass { cls, arguments, + runtime_patterns: _, + runtime_kwd_attrs: _, + runtime_kwd_patterns: _, range: _, node_index: _, } = self; @@ -11138,6 +11339,7 @@ impl PatternMatchOr { { let PatternMatchOr { patterns, + runtime_patterns: _, range: _, node_index: _, } = self; diff --git a/crates/ruff_python_ast/src/helpers.rs b/crates/ruff_python_ast/src/helpers.rs index a0b7885a716ac..fadf36a01430e 100644 --- a/crates/ruff_python_ast/src/helpers.rs +++ b/crates/ruff_python_ast/src/helpers.rs @@ -13,8 +13,8 @@ use crate::token::Tokens; use crate::token::parenthesized_range; use crate::visitor::Visitor; use crate::{ - self as ast, Arguments, AtomicNodeIndex, CmpOp, DictItem, ExceptHandler, Expr, ExprNoneLiteral, - InterpolatedStringElement, MatchCase, Operator, Pattern, Stmt, TypeParam, + self as ast, Arguments, AtomicNodeIndex, CmpOp, ConstantValue, DictItem, ExceptHandler, Expr, + ExprNoneLiteral, InterpolatedStringElement, MatchCase, Operator, Pattern, Stmt, TypeParam, }; use crate::{AnyNodeRef, ExprContext}; @@ -143,6 +143,7 @@ impl SideEffect { | Expr::StringLiteral(_) | Expr::BytesLiteral(_) | Expr::NumberLiteral(_) + | Expr::Constant(_) | Expr::BooleanLiteral(_) | Expr::NoneLiteral(_) | Expr::EllipsisLiteral(_) => Self::Absent, @@ -155,6 +156,7 @@ const fn is_known_safe_binop_operand(expr: &Expr) -> bool { Expr::StringLiteral(_) | Expr::BytesLiteral(_) | Expr::NumberLiteral(_) + | Expr::Constant(_) | Expr::BooleanLiteral(_) | Expr::NoneLiteral(_) | Expr::EllipsisLiteral(_) @@ -193,6 +195,7 @@ fn is_definitely_side_effect_free_interpolation_expr(expr: &Expr) -> bool { matches!( expr, Expr::NumberLiteral(_) + | Expr::Constant(_) | Expr::BooleanLiteral(_) | Expr::NoneLiteral(_) | Expr::EllipsisLiteral(_) @@ -304,21 +307,15 @@ where || any_over_expr(body, &mut *func) || any_over_expr(orelse, &mut *func) } - Expr::Dict(ast::ExprDict { - items, - range: _, - node_index: _, - }) => items.iter().any(|ast::DictItem { key, value }| { - any_over_expr(value, &mut *func) - || key - .as_ref() - .is_some_and(|key| any_over_expr(key, &mut *func)) - }), - Expr::Set(ast::ExprSet { - elts, - range: _, - node_index: _, - }) + Expr::Dict(ast::ExprDict { items, .. }) => { + items.iter().any(|ast::DictItem { key, value }| { + any_over_expr(value, &mut *func) + || key + .as_ref() + .is_some_and(|key| any_over_expr(key, &mut *func)) + }) + } + Expr::Set(ast::ExprSet { elts, .. }) | Expr::List(ast::ExprList { elts, .. }) | Expr::Tuple(ast::ExprTuple { elts, .. }) => { elts.iter().any(|expr| any_over_expr(expr, &mut *func)) @@ -440,6 +437,7 @@ where | Expr::StringLiteral(_) | Expr::BytesLiteral(_) | Expr::NumberLiteral(_) + | Expr::Constant(_) | Expr::BooleanLiteral(_) | Expr::NoneLiteral(_) | Expr::EllipsisLiteral(_) @@ -477,11 +475,7 @@ fn any_over_pattern(pattern: &Pattern, func: &mut dyn FnMut(&Expr) -> bool) -> b node_index: _, }) => any_over_expr(value, func), Pattern::MatchSingleton(_) => false, - Pattern::MatchSequence(ast::PatternMatchSequence { - patterns, - range: _, - node_index: _, - }) => patterns + Pattern::MatchSequence(ast::PatternMatchSequence { patterns, .. }) => patterns .iter() .any(|pattern| any_over_pattern(pattern, &mut *func)), Pattern::MatchMapping(ast::PatternMatchMapping { keys, patterns, .. }) => { @@ -505,11 +499,7 @@ fn any_over_pattern(pattern: &Pattern, func: &mut dyn FnMut(&Expr) -> bool) -> b Pattern::MatchAs(ast::PatternMatchAs { pattern, .. }) => pattern .as_ref() .is_some_and(|pattern| any_over_pattern(pattern, func)), - Pattern::MatchOr(ast::PatternMatchOr { - patterns, - range: _, - node_index: _, - }) => patterns + Pattern::MatchOr(ast::PatternMatchOr { patterns, .. }) => patterns .iter() .any(|pattern| any_over_pattern(pattern, &mut *func)), } @@ -603,11 +593,9 @@ where }) => value .as_ref() .is_some_and(|value| any_over_expr(value, func)), - Stmt::Delete(ast::StmtDelete { - targets, - range: _, - node_index: _, - }) => targets.iter().any(|expr| any_over_expr(expr, &mut *func)), + Stmt::Delete(ast::StmtDelete { targets, .. }) => { + targets.iter().any(|expr| any_over_expr(expr, &mut *func)) + } Stmt::TypeAlias(ast::StmtTypeAlias { name, type_params, @@ -654,11 +642,7 @@ where || any_over_body(orelse, &mut *func) } Stmt::While(ast::StmtWhile { - test, - body, - orelse, - range: _, - node_index: _, + test, body, orelse, .. }) => { any_over_expr(test, &mut *func) || any_over_body(body, &mut *func) @@ -668,8 +652,7 @@ where test, body, elif_else_clauses, - range: _, - node_index: _, + .. }) => { any_over_expr(test, &mut *func) || any_over_body(body, &mut *func) @@ -707,9 +690,7 @@ where handlers, orelse, finalbody, - is_star: _, - range: _, - node_index: _, + .. }) => { any_over_body(body, &mut *func) || handlers.iter().any(|handler| { @@ -749,8 +730,7 @@ where pattern, guard, body, - range: _, - node_index: _, + .. } = case; any_over_pattern(pattern, &mut *func) || guard @@ -822,7 +802,13 @@ pub fn is_assignment_to_a_dunder(stmt: &Stmt) -> bool { const fn is_singleton(expr: &Expr) -> bool { matches!( expr, - Expr::NoneLiteral(_) | Expr::BooleanLiteral(_) | Expr::EllipsisLiteral(_) + Expr::NoneLiteral(_) + | Expr::BooleanLiteral(_) + | Expr::EllipsisLiteral(_) + | Expr::Constant(ast::ExprConstant { + value: ConstantValue::None | ConstantValue::Boolean(_) | ConstantValue::Ellipsis, + .. + }) ) } @@ -1565,6 +1551,7 @@ fn is_non_empty_f_string(expr: &ast::ExprFString) -> bool { Expr::SetComp(_) => true, Expr::DictComp(_) => true, Expr::NumberLiteral(_) => true, + Expr::Constant(_) => true, Expr::BooleanLiteral(_) => true, Expr::NoneLiteral(_) => true, Expr::EllipsisLiteral(_) => true, @@ -1724,6 +1711,7 @@ pub fn pep_604_union(elts: &[Expr]) -> Expr { range: TextRange::default(), node_index: AtomicNodeIndex::NONE, parenthesized: true, + runtime_elts: None, }), [Expr::Tuple(ast::ExprTuple { elts, .. })] => pep_604_union(elts), [elt] => elt.clone(), @@ -1771,6 +1759,7 @@ pub fn typing_union(elts: &[Expr], binding: Name) -> Expr { elts: elts.to_vec(), ctx: ExprContext::Load, parenthesized: false, + runtime_elts: None, })), ctx: ExprContext::Load, range: TextRange::default(), @@ -1953,6 +1942,7 @@ mod tests { type_params: vec![type_var_one, type_var_two], range: TextRange::default(), node_index: AtomicNodeIndex::NONE, + runtime_type_params: None, })), value: Box::new(constant_three.clone()), range: TextRange::default(), diff --git a/crates/ruff_python_ast/src/node.rs b/crates/ruff_python_ast/src/node.rs index 34e7b4c55a93a..f459f4d17d3fa 100644 --- a/crates/ruff_python_ast/src/node.rs +++ b/crates/ruff_python_ast/src/node.rs @@ -15,6 +15,7 @@ impl ast::ElifElseClause { node_index: _, test, body, + .. } = self; if let Some(test) = test { visitor.visit_expr(test); @@ -28,11 +29,7 @@ impl ast::ExprDict { where V: SourceOrderVisitor<'a> + ?Sized, { - let ast::ExprDict { - items, - range: _, - node_index: _, - } = self; + let ast::ExprDict { items, .. } = self; for ast::DictItem { key, value } in items { if let Some(key) = key { @@ -48,12 +45,7 @@ impl ast::ExprBoolOp { where V: SourceOrderVisitor<'a> + ?Sized, { - let ast::ExprBoolOp { - op, - values, - range: _, - node_index: _, - } = self; + let ast::ExprBoolOp { op, values, .. } = self; match values.as_slice() { [left, rest @ ..] => { visitor.visit_expr(left); @@ -78,8 +70,7 @@ impl ast::ExprCompare { left, ops, comparators, - range: _, - node_index: _, + .. } = self; visitor.visit_expr(left); @@ -140,11 +131,7 @@ impl ast::ExprFString { where V: SourceOrderVisitor<'a> + ?Sized, { - let ast::ExprFString { - value, - range: _, - node_index: _, - } = self; + let ast::ExprFString { value, .. } = self; for f_string_part in value { match f_string_part { @@ -164,11 +151,7 @@ impl ast::ExprTString { where V: SourceOrderVisitor<'a> + ?Sized, { - let ast::ExprTString { - value, - range: _, - node_index: _, - } = self; + let ast::ExprTString { value, .. } = self; for t_string in value { visitor.visit_t_string(t_string); @@ -181,11 +164,7 @@ impl ast::ExprStringLiteral { where V: SourceOrderVisitor<'a> + ?Sized, { - let ast::ExprStringLiteral { - value, - range: _, - node_index: _, - } = self; + let ast::ExprStringLiteral { value, .. } = self; for string_literal in value { visitor.visit_string_literal(string_literal); @@ -198,11 +177,7 @@ impl ast::ExprBytesLiteral { where V: SourceOrderVisitor<'a> + ?Sized, { - let ast::ExprBytesLiteral { - value, - range: _, - node_index: _, - } = self; + let ast::ExprBytesLiteral { value, .. } = self; for bytes_literal in value { visitor.visit_bytes_literal(bytes_literal); @@ -221,6 +196,7 @@ impl ast::ExceptHandlerExceptHandler { type_, name, body, + .. } = self; if let Some(expr) = type_ { visitor.visit_expr(expr); @@ -243,8 +219,7 @@ impl ast::PatternMatchMapping { keys, patterns, rest, - range: _, - node_index: _, + .. } = self; let mut rest = rest.as_ref(); @@ -310,7 +285,7 @@ impl ast::Comprehension { target, iter, ifs, - is_async: _, + .. } = self; visitor.visit_expr(target); visitor.visit_expr(iter); @@ -361,6 +336,7 @@ impl ast::Parameter { node_index: _, name, annotation, + .. } = self; visitor.visit_identifier(name); @@ -457,6 +433,7 @@ impl ast::MatchCase { pattern, guard, body, + .. } = self; visitor.visit_pattern(pattern); @@ -491,6 +468,7 @@ impl ast::TypeParams { range: _, node_index: _, type_params, + .. } = self; for type_param in type_params { diff --git a/crates/ruff_python_ast/src/nodes.rs b/crates/ruff_python_ast/src/nodes.rs index adc581243d94a..ed6d378401dea 100644 --- a/crates/ruff_python_ast/src/nodes.rs +++ b/crates/ruff_python_ast/src/nodes.rs @@ -28,6 +28,21 @@ use crate::{ str::{Quote, TripleQuotes}, }; +#[derive(Clone, Debug, PartialEq)] +#[cfg_attr(feature = "get-size", derive(get_size2::GetSize))] +pub enum ConstantValue { + None, + Boolean(bool), + Str(Box), + Bytes(Box<[u8]>), + Integer(Box), + Tuple(Vec), + Frozenset(Vec), + Float(f64), + Complex { real: f64, imag: f64 }, + Ellipsis, +} + impl StmtClassDef { /// Return an iterator over the bases of the class. pub fn bases(&self) -> &[Expr] { @@ -53,6 +68,8 @@ pub struct ElifElseClause { pub node_index: AtomicNodeIndex, pub test: Option, pub body: Suite, + pub runtime_body: Option>>, + pub runtime_orelse: Option>>, } impl Expr { @@ -66,6 +83,7 @@ impl Expr { Expr::StringLiteral(_) | Expr::BytesLiteral(_) | Expr::NumberLiteral(_) + | Expr::Constant(_) | Expr::BooleanLiteral(_) | Expr::NoneLiteral(_) | Expr::EllipsisLiteral(_) @@ -346,6 +364,9 @@ pub struct InterpolatedElement { pub debug_text: Option, pub conversion: ConversionFlag, pub format_spec: Option>, + pub runtime_str: Option, + pub runtime_interpolation_format_spec: Option>, + pub runtime_formatted_value_format_spec: Option>, } /// An `FStringLiteralElement` with an empty `value` is an invalid f-string element. @@ -1220,6 +1241,8 @@ impl From for Expr { node_index: payload.node_index.clone(), range: payload.range, value: FStringValue::single(payload), + runtime_joined_str: None, + runtime_values: None, } .into() } @@ -1312,6 +1335,8 @@ impl From for Expr { node_index: payload.node_index.clone(), range: payload.range, value: TStringValue::single(payload), + runtime_template_str: None, + runtime_values: None, } .into() } @@ -2814,6 +2839,8 @@ pub struct Comprehension { pub iter: Expr, pub ifs: Vec, pub is_async: bool, + pub runtime_ifs: Option>>, + pub runtime_is_async: Option, } /// See also [ExceptHandler](https://docs.python.org/3/library/ast.html#ast.ExceptHandler) @@ -2825,6 +2852,7 @@ pub struct ExceptHandlerExceptHandler { pub type_: Option>, pub name: Option, pub body: Suite, + pub runtime_body: Option>>, } /// See also [arg](https://docs.python.org/3/library/ast.html#ast.arg) @@ -2835,6 +2863,8 @@ pub struct Parameter { pub node_index: AtomicNodeIndex, pub name: Identifier, pub annotation: Option>, + pub runtime_type_comment: Option>, + pub runtime_type_comment_bytes: Option>, } impl Parameter { @@ -2886,6 +2916,7 @@ pub struct MatchCase { pub pattern: Pattern, pub guard: Option>, pub body: Suite, + pub runtime_body: Option>>, } impl Pattern { @@ -3144,6 +3175,7 @@ pub struct Parameters { pub vararg: Option>, pub kwonlyargs: ThinVec, pub kwarg: Option>, + pub runtime_defaults: Option>>, } impl Parameters { @@ -3185,6 +3217,7 @@ impl Parameters { vararg, kwonlyargs, kwarg, + .. } = self; // Safety: a Python function can have an arbitrary number of parameters, // so theoretically this could be a number that wouldn't fit into a usize, @@ -3255,6 +3288,7 @@ impl<'a> ParametersIterator<'a> { vararg, kwonlyargs, kwarg, + .. } = parameters; Self { posonlyargs: posonlyargs.iter(), @@ -3503,6 +3537,8 @@ pub struct Arguments { pub node_index: AtomicNodeIndex, pub args: Box<[Expr]>, pub keywords: ThinVec, + pub runtime_args: Option>>, + pub runtime_bases: Option>>, } /// An entry in the argument list of a function call. @@ -3709,6 +3745,7 @@ pub struct TypeParams { pub range: TextRange, pub node_index: AtomicNodeIndex, pub type_params: Vec, + pub runtime_type_params: Option>>, } impl Deref for TypeParams { @@ -3938,44 +3975,44 @@ mod tests { #[test] #[cfg(target_pointer_width = "64")] fn size() { - assert_eq!(std::mem::size_of::(), 88); - assert_eq!(std::mem::size_of::(), 88); - assert_eq!(std::mem::size_of::(), 80); - assert_eq!(std::mem::size_of::(), 64); - assert_eq!(std::mem::size_of::(), 32); - assert_eq!(std::mem::size_of::(), 72); - assert_eq!(std::mem::size_of::(), 56); - assert_eq!(std::mem::size_of::(), 40); - assert_eq!(std::mem::size_of::(), 64); + assert_eq!(std::mem::size_of::(), 176); + assert_eq!(std::mem::size_of::(), 176); + assert_eq!(std::mem::size_of::(), 128); + assert_eq!(std::mem::size_of::(), 160); + assert_eq!(std::mem::size_of::(), 48); + assert_eq!(std::mem::size_of::(), 144); + assert_eq!(std::mem::size_of::(), 80); + assert_eq!(std::mem::size_of::(), 88); + assert_eq!(std::mem::size_of::(), 112); assert_eq!(std::mem::size_of::(), 56); assert_eq!(std::mem::size_of::(), 24); assert_eq!(std::mem::size_of::(), 32); - assert_eq!(std::mem::size_of::(), 40); + assert_eq!(std::mem::size_of::(), 64); assert_eq!(std::mem::size_of::(), 16); assert_eq!(std::mem::size_of::(), 48); - assert_eq!(std::mem::size_of::(), 56); - assert_eq!(std::mem::size_of::(), 56); - assert_eq!(std::mem::size_of::(), 40); + assert_eq!(std::mem::size_of::(), 104); + assert_eq!(std::mem::size_of::(), 80); + assert_eq!(std::mem::size_of::(), 64); assert_eq!(std::mem::size_of::(), 56); assert_eq!(std::mem::size_of::(), 12); - assert_eq!(std::mem::size_of::(), 56); + assert_eq!(std::mem::size_of::(), 104); assert_eq!(std::mem::size_of::(), 48); assert_eq!(std::mem::size_of::(), 40); assert_eq!(std::mem::size_of::(), 32); assert_eq!(std::mem::size_of::(), 32); - assert_eq!(std::mem::size_of::(), 40); + assert_eq!(std::mem::size_of::(), 64); assert_eq!(std::mem::size_of::(), 48); assert_eq!(std::mem::size_of::(), 32); assert_eq!(std::mem::size_of::(), 32); assert_eq!(std::mem::size_of::(), 12); assert_eq!(std::mem::size_of::(), 40); - assert_eq!(std::mem::size_of::(), 40); + assert_eq!(std::mem::size_of::(), 64); assert_eq!(std::mem::size_of::(), 48); assert_eq!(std::mem::size_of::(), 40); assert_eq!(std::mem::size_of::(), 24); assert_eq!(std::mem::size_of::(), 48); assert_eq!(std::mem::size_of::(), 32); - assert_eq!(std::mem::size_of::(), 40); + assert_eq!(std::mem::size_of::(), 64); assert_eq!(std::mem::size_of::(), 24); assert_eq!(std::mem::size_of::(), 24); assert_eq!(std::mem::size_of::(), 24); diff --git a/crates/ruff_python_ast/src/operator_precedence.rs b/crates/ruff_python_ast/src/operator_precedence.rs index 8fba7184af605..51c79ce198426 100644 --- a/crates/ruff_python_ast/src/operator_precedence.rs +++ b/crates/ruff_python_ast/src/operator_precedence.rs @@ -69,6 +69,7 @@ impl OperatorPrecedence { | ExprRef::StringLiteral(_) | ExprRef::BytesLiteral(_) | ExprRef::NumberLiteral(_) + | ExprRef::Constant(_) | ExprRef::BooleanLiteral(_) | ExprRef::NoneLiteral(_) | ExprRef::EllipsisLiteral(_) diff --git a/crates/ruff_python_ast/src/relocate.rs b/crates/ruff_python_ast/src/relocate.rs index 64fd01bed9d5c..75bfc04c23500 100644 --- a/crates/ruff_python_ast/src/relocate.rs +++ b/crates/ruff_python_ast/src/relocate.rs @@ -89,6 +89,9 @@ impl Transformer for Relocator { Expr::NumberLiteral(ast::ExprNumberLiteral { range, .. }) => { *range = self.range; } + Expr::Constant(ast::ExprConstant { range, .. }) => { + *range = self.range; + } Expr::BooleanLiteral(ast::ExprBooleanLiteral { range, .. }) => { *range = self.range; } diff --git a/crates/ruff_python_ast/src/visitor.rs b/crates/ruff_python_ast/src/visitor.rs index d7a985a804269..3771703b107fb 100644 --- a/crates/ruff_python_ast/src/visitor.rs +++ b/crates/ruff_python_ast/src/visitor.rs @@ -172,20 +172,12 @@ pub fn walk_stmt<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, stmt: &'a Stmt) { } visitor.visit_body(body); } - Stmt::Return(ast::StmtReturn { - value, - range: _, - node_index: _, - }) => { + Stmt::Return(ast::StmtReturn { value, .. }) => { if let Some(expr) = value { visitor.visit_expr(expr); } } - Stmt::Delete(ast::StmtDelete { - targets, - range: _, - node_index: _, - }) => { + Stmt::Delete(ast::StmtDelete { targets, .. }) => { for expr in targets { visitor.visit_expr(expr); } @@ -210,11 +202,7 @@ pub fn walk_stmt<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, stmt: &'a Stmt) { } } Stmt::AugAssign(ast::StmtAugAssign { - target, - op, - value, - range: _, - node_index: _, + target, op, value, .. }) => { visitor.visit_expr(value); visitor.visit_operator(op); @@ -245,11 +233,7 @@ pub fn walk_stmt<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, stmt: &'a Stmt) { visitor.visit_body(orelse); } Stmt::While(ast::StmtWhile { - test, - body, - orelse, - range: _, - node_index: _, + test, body, orelse, .. }) => { visitor.visit_expr(test); visitor.visit_body(body); @@ -259,8 +243,7 @@ pub fn walk_stmt<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, stmt: &'a Stmt) { test, body, elif_else_clauses, - range: _, - node_index: _, + .. }) => { visitor.visit_expr(test); visitor.visit_body(body); @@ -274,23 +257,13 @@ pub fn walk_stmt<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, stmt: &'a Stmt) { } visitor.visit_body(body); } - Stmt::Match(ast::StmtMatch { - subject, - cases, - range: _, - node_index: _, - }) => { + Stmt::Match(ast::StmtMatch { subject, cases, .. }) => { visitor.visit_expr(subject); for match_case in cases { visitor.visit_match_case(match_case); } } - Stmt::Raise(ast::StmtRaise { - exc, - cause, - range: _, - node_index: _, - }) => { + Stmt::Raise(ast::StmtRaise { exc, cause, .. }) => { if let Some(expr) = exc { visitor.visit_expr(expr); } @@ -303,9 +276,7 @@ pub fn walk_stmt<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, stmt: &'a Stmt) { handlers, orelse, finalbody, - is_star: _, - range: _, - node_index: _, + .. }) => { visitor.visit_body(body); for except_handler in handlers { @@ -314,23 +285,13 @@ pub fn walk_stmt<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, stmt: &'a Stmt) { visitor.visit_body(orelse); visitor.visit_body(finalbody); } - Stmt::Assert(ast::StmtAssert { - test, - msg, - range: _, - node_index: _, - }) => { + Stmt::Assert(ast::StmtAssert { test, msg, .. }) => { visitor.visit_expr(test); if let Some(expr) = msg { visitor.visit_expr(expr); } } - Stmt::Import(ast::StmtImport { - names, - is_lazy: _, - range: _, - node_index: _, - }) => { + Stmt::Import(ast::StmtImport { names, .. }) => { for alias in names { visitor.visit_alias(alias); } @@ -342,11 +303,7 @@ pub fn walk_stmt<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, stmt: &'a Stmt) { } Stmt::Global(_) => {} Stmt::Nonlocal(_) => {} - Stmt::Expr(ast::StmtExpr { - value, - range: _, - node_index: _, - }) => visitor.visit_expr(value), + Stmt::Expr(ast::StmtExpr { value, .. }) => visitor.visit_expr(value), Stmt::Pass(_) | Stmt::Break(_) | Stmt::Continue(_) | Stmt::IpyEscapeCommand(_) => {} } } @@ -361,51 +318,29 @@ pub fn walk_decorator<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, decorator: & pub fn walk_expr<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, expr: &'a Expr) { match expr { - Expr::BoolOp(ast::ExprBoolOp { - op, - values, - range: _, - node_index: _, - }) => { + Expr::BoolOp(ast::ExprBoolOp { op, values, .. }) => { visitor.visit_bool_op(op); for expr in values { visitor.visit_expr(expr); } } - Expr::Named(ast::ExprNamed { - target, - value, - range: _, - node_index: _, - }) => { + Expr::Named(ast::ExprNamed { target, value, .. }) => { visitor.visit_expr(value); visitor.visit_expr(target); } Expr::BinOp(ast::ExprBinOp { - left, - op, - right, - range: _, - node_index: _, + left, op, right, .. }) => { visitor.visit_expr(left); visitor.visit_operator(op); visitor.visit_expr(right); } - Expr::UnaryOp(ast::ExprUnaryOp { - op, - operand, - range: _, - node_index: _, - }) => { + Expr::UnaryOp(ast::ExprUnaryOp { op, operand, .. }) => { visitor.visit_unary_op(op); visitor.visit_expr(operand); } Expr::Lambda(ast::ExprLambda { - parameters, - body, - range: _, - node_index: _, + parameters, body, .. }) => { if let Some(parameters) = parameters { visitor.visit_parameters(parameters); @@ -413,21 +348,13 @@ pub fn walk_expr<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, expr: &'a Expr) { visitor.visit_expr(body); } Expr::If(ast::ExprIf { - test, - body, - orelse, - range: _, - node_index: _, + test, body, orelse, .. }) => { visitor.visit_expr(test); visitor.visit_expr(body); visitor.visit_expr(orelse); } - Expr::Dict(ast::ExprDict { - items, - range: _, - node_index: _, - }) => { + Expr::Dict(ast::ExprDict { items, .. }) => { for ast::DictItem { key, value } in items { if let Some(key) = key { visitor.visit_expr(key); @@ -435,20 +362,13 @@ pub fn walk_expr<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, expr: &'a Expr) { visitor.visit_expr(value); } } - Expr::Set(ast::ExprSet { - elts, - range: _, - node_index: _, - }) => { + Expr::Set(ast::ExprSet { elts, .. }) => { for expr in elts { visitor.visit_expr(expr); } } Expr::ListComp(ast::ExprListComp { - elt, - generators, - range: _, - node_index: _, + elt, generators, .. }) => { for comprehension in generators { visitor.visit_comprehension(comprehension); @@ -456,10 +376,7 @@ pub fn walk_expr<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, expr: &'a Expr) { visitor.visit_expr(elt); } Expr::SetComp(ast::ExprSetComp { - elt, - generators, - range: _, - node_index: _, + elt, generators, .. }) => { for comprehension in generators { visitor.visit_comprehension(comprehension); @@ -470,8 +387,7 @@ pub fn walk_expr<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, expr: &'a Expr) { key, value, generators, - range: _, - node_index: _, + .. }) => { for comprehension in generators { visitor.visit_comprehension(comprehension); @@ -482,42 +398,25 @@ pub fn walk_expr<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, expr: &'a Expr) { visitor.visit_expr(value); } Expr::Generator(ast::ExprGenerator { - elt, - generators, - range: _, - node_index: _, - parenthesized: _, + elt, generators, .. }) => { for comprehension in generators { visitor.visit_comprehension(comprehension); } visitor.visit_expr(elt); } - Expr::Await(ast::ExprAwait { - value, - range: _, - node_index: _, - }) => visitor.visit_expr(value), - Expr::Yield(ast::ExprYield { - value, - range: _, - node_index: _, - }) => { + Expr::Await(ast::ExprAwait { value, .. }) => visitor.visit_expr(value), + Expr::Yield(ast::ExprYield { value, .. }) => { if let Some(expr) = value { visitor.visit_expr(expr); } } - Expr::YieldFrom(ast::ExprYieldFrom { - value, - range: _, - node_index: _, - }) => visitor.visit_expr(value), + Expr::YieldFrom(ast::ExprYieldFrom { value, .. }) => visitor.visit_expr(value), Expr::Compare(ast::ExprCompare { left, ops, comparators, - range: _, - node_index: _, + .. }) => { visitor.visit_expr(left); for cmp_op in ops { @@ -528,10 +427,7 @@ pub fn walk_expr<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, expr: &'a Expr) { } } Expr::Call(ast::ExprCall { - func, - arguments, - range_start: _, - node_index: _, + func, arguments, .. }) => { visitor.visit_expr(func); visitor.visit_arguments(arguments); @@ -562,6 +458,7 @@ pub fn walk_expr<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, expr: &'a Expr) { } } Expr::NumberLiteral(_) + | Expr::Constant(_) | Expr::BooleanLiteral(_) | Expr::NoneLiteral(_) | Expr::EllipsisLiteral(_) => {} @@ -570,57 +467,33 @@ pub fn walk_expr<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, expr: &'a Expr) { visitor.visit_expr_context(ctx); } Expr::Subscript(ast::ExprSubscript { - value, - slice, - ctx, - range: _, - node_index: _, + value, slice, ctx, .. }) => { visitor.visit_expr(value); visitor.visit_expr(slice); visitor.visit_expr_context(ctx); } - Expr::Starred(ast::ExprStarred { - value, - ctx, - range: _, - node_index: _, - }) => { + Expr::Starred(ast::ExprStarred { value, ctx, .. }) => { visitor.visit_expr(value); visitor.visit_expr_context(ctx); } Expr::Name(ast::ExprName { ctx, .. }) => { visitor.visit_expr_context(ctx); } - Expr::List(ast::ExprList { - elts, - ctx, - range: _, - node_index: _, - }) => { + Expr::List(ast::ExprList { elts, ctx, .. }) => { for expr in elts { visitor.visit_expr(expr); } visitor.visit_expr_context(ctx); } - Expr::Tuple(ast::ExprTuple { - elts, - ctx, - range: _, - node_index: _, - parenthesized: _, - }) => { + Expr::Tuple(ast::ExprTuple { elts, ctx, .. }) => { for expr in elts { visitor.visit_expr(expr); } visitor.visit_expr_context(ctx); } Expr::Slice(ast::ExprSlice { - lower, - upper, - step, - range: _, - node_index: _, + lower, upper, step, .. }) => { if let Some(expr) = lower { visitor.visit_expr(expr); @@ -712,13 +585,7 @@ pub fn walk_type_params<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, type_param pub fn walk_type_param<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, type_param: &'a TypeParam) { match type_param { - TypeParam::TypeVar(TypeParamTypeVar { - bound, - default, - name: _, - range: _, - node_index: _, - }) => { + TypeParam::TypeVar(TypeParamTypeVar { bound, default, .. }) => { if let Some(expr) = bound { visitor.visit_expr(expr); } @@ -726,22 +593,12 @@ pub fn walk_type_param<'a, V: Visitor<'a> + ?Sized>(visitor: &mut V, type_param: visitor.visit_expr(expr); } } - TypeParam::TypeVarTuple(TypeParamTypeVarTuple { - default, - name: _, - range: _, - node_index: _, - }) => { + TypeParam::TypeVarTuple(TypeParamTypeVarTuple { default, .. }) => { if let Some(expr) = default { visitor.visit_expr(expr); } } - TypeParam::ParamSpec(TypeParamParamSpec { - default, - name: _, - range: _, - node_index: _, - }) => { + TypeParam::ParamSpec(TypeParamParamSpec { default, .. }) => { if let Some(expr) = default { visitor.visit_expr(expr); } diff --git a/crates/ruff_python_ast/src/visitor/source_order.rs b/crates/ruff_python_ast/src/visitor/source_order.rs index 9c74f53146804..97934844d6a62 100644 --- a/crates/ruff_python_ast/src/visitor/source_order.rs +++ b/crates/ruff_python_ast/src/visitor/source_order.rs @@ -290,6 +290,7 @@ where Expr::StringLiteral(expr) => expr.visit_source_order(visitor), Expr::BytesLiteral(expr) => expr.visit_source_order(visitor), Expr::NumberLiteral(expr) => expr.visit_source_order(visitor), + Expr::Constant(expr) => expr.visit_source_order(visitor), Expr::BooleanLiteral(expr) => expr.visit_source_order(visitor), Expr::NoneLiteral(expr) => expr.visit_source_order(visitor), Expr::EllipsisLiteral(expr) => expr.visit_source_order(visitor), diff --git a/crates/ruff_python_ast/src/visitor/transformer.rs b/crates/ruff_python_ast/src/visitor/transformer.rs index 9f037ee23f2bd..4da4fdddc1929 100644 --- a/crates/ruff_python_ast/src/visitor/transformer.rs +++ b/crates/ruff_python_ast/src/visitor/transformer.rs @@ -159,20 +159,12 @@ pub fn walk_stmt(visitor: &V, stmt: &mut Stmt) { } visitor.visit_body(body); } - Stmt::Return(ast::StmtReturn { - value, - range: _, - node_index: _, - }) => { + Stmt::Return(ast::StmtReturn { value, .. }) => { if let Some(expr) = value { visitor.visit_expr(expr); } } - Stmt::Delete(ast::StmtDelete { - targets, - range: _, - node_index: _, - }) => { + Stmt::Delete(ast::StmtDelete { targets, .. }) => { for expr in targets { visitor.visit_expr(expr); } @@ -197,11 +189,7 @@ pub fn walk_stmt(visitor: &V, stmt: &mut Stmt) { } } Stmt::AugAssign(ast::StmtAugAssign { - target, - op, - value, - range: _, - node_index: _, + target, op, value, .. }) => { visitor.visit_expr(value); visitor.visit_operator(op); @@ -232,11 +220,7 @@ pub fn walk_stmt(visitor: &V, stmt: &mut Stmt) { visitor.visit_body(orelse); } Stmt::While(ast::StmtWhile { - test, - body, - orelse, - range: _, - node_index: _, + test, body, orelse, .. }) => { visitor.visit_expr(test); visitor.visit_body(body); @@ -246,8 +230,7 @@ pub fn walk_stmt(visitor: &V, stmt: &mut Stmt) { test, body, elif_else_clauses, - range: _, - node_index: _, + .. }) => { visitor.visit_expr(test); visitor.visit_body(body); @@ -261,23 +244,13 @@ pub fn walk_stmt(visitor: &V, stmt: &mut Stmt) { } visitor.visit_body(body); } - Stmt::Match(ast::StmtMatch { - subject, - cases, - range: _, - node_index: _, - }) => { + Stmt::Match(ast::StmtMatch { subject, cases, .. }) => { visitor.visit_expr(subject); for match_case in cases { visitor.visit_match_case(match_case); } } - Stmt::Raise(ast::StmtRaise { - exc, - cause, - range: _, - node_index: _, - }) => { + Stmt::Raise(ast::StmtRaise { exc, cause, .. }) => { if let Some(expr) = exc { visitor.visit_expr(expr); } @@ -290,9 +263,7 @@ pub fn walk_stmt(visitor: &V, stmt: &mut Stmt) { handlers, orelse, finalbody, - is_star: _, - range: _, - node_index: _, + .. }) => { visitor.visit_body(body); for except_handler in handlers { @@ -301,23 +272,13 @@ pub fn walk_stmt(visitor: &V, stmt: &mut Stmt) { visitor.visit_body(orelse); visitor.visit_body(finalbody); } - Stmt::Assert(ast::StmtAssert { - test, - msg, - range: _, - node_index: _, - }) => { + Stmt::Assert(ast::StmtAssert { test, msg, .. }) => { visitor.visit_expr(test); if let Some(expr) = msg { visitor.visit_expr(expr); } } - Stmt::Import(ast::StmtImport { - names, - is_lazy: _, - range: _, - node_index: _, - }) => { + Stmt::Import(ast::StmtImport { names, .. }) => { for alias in names { visitor.visit_alias(alias); } @@ -329,11 +290,7 @@ pub fn walk_stmt(visitor: &V, stmt: &mut Stmt) { } Stmt::Global(_) => {} Stmt::Nonlocal(_) => {} - Stmt::Expr(ast::StmtExpr { - value, - range: _, - node_index: _, - }) => visitor.visit_expr(value), + Stmt::Expr(ast::StmtExpr { value, .. }) => visitor.visit_expr(value), Stmt::Pass(_) | Stmt::Break(_) | Stmt::Continue(_) | Stmt::IpyEscapeCommand(_) => {} } } @@ -348,51 +305,29 @@ pub fn walk_decorator(visitor: &V, decorator: &mut Deco pub fn walk_expr(visitor: &V, expr: &mut Expr) { match expr { - Expr::BoolOp(ast::ExprBoolOp { - op, - values, - range: _, - node_index: _, - }) => { + Expr::BoolOp(ast::ExprBoolOp { op, values, .. }) => { visitor.visit_bool_op(op); for expr in values { visitor.visit_expr(expr); } } - Expr::Named(ast::ExprNamed { - target, - value, - range: _, - node_index: _, - }) => { + Expr::Named(ast::ExprNamed { target, value, .. }) => { visitor.visit_expr(value); visitor.visit_expr(target); } Expr::BinOp(ast::ExprBinOp { - left, - op, - right, - range: _, - node_index: _, + left, op, right, .. }) => { visitor.visit_expr(left); visitor.visit_operator(op); visitor.visit_expr(right); } - Expr::UnaryOp(ast::ExprUnaryOp { - op, - operand, - range: _, - node_index: _, - }) => { + Expr::UnaryOp(ast::ExprUnaryOp { op, operand, .. }) => { visitor.visit_unary_op(op); visitor.visit_expr(operand); } Expr::Lambda(ast::ExprLambda { - parameters, - body, - range: _, - node_index: _, + parameters, body, .. }) => { if let Some(parameters) = parameters { visitor.visit_parameters(parameters); @@ -400,21 +335,13 @@ pub fn walk_expr(visitor: &V, expr: &mut Expr) { visitor.visit_expr(body); } Expr::If(ast::ExprIf { - test, - body, - orelse, - range: _, - node_index: _, + test, body, orelse, .. }) => { visitor.visit_expr(test); visitor.visit_expr(body); visitor.visit_expr(orelse); } - Expr::Dict(ast::ExprDict { - items, - range: _, - node_index: _, - }) => { + Expr::Dict(ast::ExprDict { items, .. }) => { for ast::DictItem { key, value } in items { if let Some(key) = key { visitor.visit_expr(key); @@ -422,20 +349,13 @@ pub fn walk_expr(visitor: &V, expr: &mut Expr) { visitor.visit_expr(value); } } - Expr::Set(ast::ExprSet { - elts, - range: _, - node_index: _, - }) => { + Expr::Set(ast::ExprSet { elts, .. }) => { for expr in elts { visitor.visit_expr(expr); } } Expr::ListComp(ast::ExprListComp { - elt, - generators, - range: _, - node_index: _, + elt, generators, .. }) => { for comprehension in generators { visitor.visit_comprehension(comprehension); @@ -443,10 +363,7 @@ pub fn walk_expr(visitor: &V, expr: &mut Expr) { visitor.visit_expr(elt); } Expr::SetComp(ast::ExprSetComp { - elt, - generators, - range: _, - node_index: _, + elt, generators, .. }) => { for comprehension in generators { visitor.visit_comprehension(comprehension); @@ -457,8 +374,7 @@ pub fn walk_expr(visitor: &V, expr: &mut Expr) { key, value, generators, - range: _, - node_index: _, + .. }) => { for comprehension in generators { visitor.visit_comprehension(comprehension); @@ -469,42 +385,25 @@ pub fn walk_expr(visitor: &V, expr: &mut Expr) { visitor.visit_expr(value); } Expr::Generator(ast::ExprGenerator { - elt, - generators, - range: _, - node_index: _, - parenthesized: _, + elt, generators, .. }) => { for comprehension in generators { visitor.visit_comprehension(comprehension); } visitor.visit_expr(elt); } - Expr::Await(ast::ExprAwait { - value, - range: _, - node_index: _, - }) => visitor.visit_expr(value), - Expr::Yield(ast::ExprYield { - value, - range: _, - node_index: _, - }) => { + Expr::Await(ast::ExprAwait { value, .. }) => visitor.visit_expr(value), + Expr::Yield(ast::ExprYield { value, .. }) => { if let Some(expr) = value { visitor.visit_expr(expr); } } - Expr::YieldFrom(ast::ExprYieldFrom { - value, - range: _, - node_index: _, - }) => visitor.visit_expr(value), + Expr::YieldFrom(ast::ExprYieldFrom { value, .. }) => visitor.visit_expr(value), Expr::Compare(ast::ExprCompare { left, ops, comparators, - range: _, - node_index: _, + .. }) => { visitor.visit_expr(left); for cmp_op in &mut **ops { @@ -515,10 +414,7 @@ pub fn walk_expr(visitor: &V, expr: &mut Expr) { } } Expr::Call(ast::ExprCall { - func, - arguments, - range_start: _, - node_index: _, + func, arguments, .. }) => { visitor.visit_expr(func); visitor.visit_arguments(arguments); @@ -551,6 +447,7 @@ pub fn walk_expr(visitor: &V, expr: &mut Expr) { } } Expr::NumberLiteral(_) + | Expr::Constant(_) | Expr::BooleanLiteral(_) | Expr::NoneLiteral(_) | Expr::EllipsisLiteral(_) => {} @@ -559,57 +456,33 @@ pub fn walk_expr(visitor: &V, expr: &mut Expr) { visitor.visit_expr_context(ctx); } Expr::Subscript(ast::ExprSubscript { - value, - slice, - ctx, - range: _, - node_index: _, + value, slice, ctx, .. }) => { visitor.visit_expr(value); visitor.visit_expr(slice); visitor.visit_expr_context(ctx); } - Expr::Starred(ast::ExprStarred { - value, - ctx, - range: _, - node_index: _, - }) => { + Expr::Starred(ast::ExprStarred { value, ctx, .. }) => { visitor.visit_expr(value); visitor.visit_expr_context(ctx); } Expr::Name(ast::ExprName { ctx, .. }) => { visitor.visit_expr_context(ctx); } - Expr::List(ast::ExprList { - elts, - ctx, - range: _, - node_index: _, - }) => { + Expr::List(ast::ExprList { elts, ctx, .. }) => { for expr in elts { visitor.visit_expr(expr); } visitor.visit_expr_context(ctx); } - Expr::Tuple(ast::ExprTuple { - elts, - ctx, - range: _, - node_index: _, - parenthesized: _, - }) => { + Expr::Tuple(ast::ExprTuple { elts, ctx, .. }) => { for expr in elts { visitor.visit_expr(expr); } visitor.visit_expr_context(ctx); } Expr::Slice(ast::ExprSlice { - lower, - upper, - step, - range: _, - node_index: _, + lower, upper, step, .. }) => { if let Some(expr) = lower { visitor.visit_expr(expr); @@ -719,13 +592,7 @@ pub fn walk_type_params(visitor: &V, type_params: &mut pub fn walk_type_param(visitor: &V, type_param: &mut TypeParam) { match type_param { - TypeParam::TypeVar(TypeParamTypeVar { - bound, - default, - name: _, - range: _, - node_index: _, - }) => { + TypeParam::TypeVar(TypeParamTypeVar { bound, default, .. }) => { if let Some(expr) = bound { visitor.visit_expr(expr); } @@ -733,22 +600,12 @@ pub fn walk_type_param(visitor: &V, type_param: &mut Ty visitor.visit_expr(expr); } } - TypeParam::TypeVarTuple(TypeParamTypeVarTuple { - default, - name: _, - range: _, - node_index: _, - }) => { + TypeParam::TypeVarTuple(TypeParamTypeVarTuple { default, .. }) => { if let Some(expr) = default { visitor.visit_expr(expr); } } - TypeParam::ParamSpec(TypeParamParamSpec { - default, - name: _, - range: _, - node_index: _, - }) => { + TypeParam::ParamSpec(TypeParamParamSpec { default, .. }) => { if let Some(expr) = default { visitor.visit_expr(expr); } diff --git a/crates/ruff_python_ast_integration_tests/tests/visitor.rs b/crates/ruff_python_ast_integration_tests/tests/visitor.rs index 5f1d01f071b3c..27ae76b60e30d 100644 --- a/crates/ruff_python_ast_integration_tests/tests/visitor.rs +++ b/crates/ruff_python_ast_integration_tests/tests/visitor.rs @@ -182,6 +182,7 @@ where body, range: _, node_index: _, + runtime_body: _, }) => { visitor.visit_body(body); } diff --git a/crates/ruff_python_codegen/src/generator.rs b/crates/ruff_python_codegen/src/generator.rs index 9154a0807ec60..42145ab8c48f2 100644 --- a/crates/ruff_python_codegen/src/generator.rs +++ b/crates/ruff_python_codegen/src/generator.rs @@ -304,6 +304,8 @@ impl<'a> Generator<'a> { type_params, range: _, node_index: _, + runtime_decorator_list: _, + runtime_body: _, }) => { self.newlines(if self.indent_depth == 0 { 2 } else { 1 }); for decorator in decorator_list { @@ -366,6 +368,7 @@ impl<'a> Generator<'a> { targets, range: _, node_index: _, + runtime_targets: _, }) => { statement!({ self.p("del "); @@ -421,6 +424,7 @@ impl<'a> Generator<'a> { simple, range: _, node_index: _, + runtime_simple: _, }) => { statement!({ let need_parens = matches!(target.as_ref(), Expr::Name(_)) && !simple; @@ -467,6 +471,8 @@ impl<'a> Generator<'a> { orelse, range: _, node_index: _, + runtime_body: _, + runtime_orelse: _, }) => { statement!({ self.p("while "); @@ -487,6 +493,7 @@ impl<'a> Generator<'a> { elif_else_clauses, range: _, node_index: _, + runtime_body: _, }) => { statement!({ self.p("if "); @@ -592,6 +599,10 @@ impl<'a> Generator<'a> { is_star, range: _, node_index: _, + runtime_body: _, + runtime_handlers: _, + runtime_orelse: _, + runtime_finalbody: _, }) => { statement!({ self.p("try:"); @@ -657,6 +668,7 @@ impl<'a> Generator<'a> { is_lazy, range: _, node_index: _, + runtime_level: _, }) => { statement!({ if *is_lazy { @@ -747,6 +759,7 @@ impl<'a> Generator<'a> { body, range: _, node_index: _, + runtime_body: _, }) => { self.p("except"); if star { @@ -786,6 +799,7 @@ impl<'a> Generator<'a> { patterns, range: _, node_index: _, + runtime_patterns: _, }) => { self.p("["); let mut first = true; @@ -801,6 +815,8 @@ impl<'a> Generator<'a> { rest, range: _, node_index: _, + runtime_keys: _, + runtime_patterns: _, }) => { self.p("{"); let mut first = true; @@ -850,6 +866,7 @@ impl<'a> Generator<'a> { patterns, range: _, node_index: _, + runtime_patterns: _, }) => { let mut first = true; for pattern in patterns { @@ -947,6 +964,7 @@ impl<'a> Generator<'a> { values, range: _, node_index: _, + runtime_values: _, }) => { let (op, prec) = opprec!(bin, op, BoolOp, And("and", AND), Or("or", OR)); group_if!(prec, { @@ -1172,6 +1190,7 @@ impl<'a> Generator<'a> { comparators, range: _, node_index: _, + runtime_comparators: _, }) => { group_if!(precedence::CMP, { let new_lvl = precedence::CMP + 1; @@ -1373,6 +1392,7 @@ impl<'a> Generator<'a> { Expr::IpyEscapeCommand(ast::ExprIpyEscapeCommand { kind, value, .. }) => { self.p(&format!("{kind}{value}")); } + Expr::Constant(_) => unreachable!("RustPython-only AST node"), } } @@ -1546,6 +1566,9 @@ impl<'a> Generator<'a> { format_spec, range: _, node_index: _, + runtime_str: _, + runtime_interpolation_format_spec: _, + runtime_formatted_value_format_spec: _, }) => self.unparse_interpolated_element( expression, debug_text.as_ref(), diff --git a/crates/ruff_python_formatter/generate.py b/crates/ruff_python_formatter/generate.py index ded6ae5b00718..cab8c8954c2ee 100755 --- a/crates/ruff_python_formatter/generate.py +++ b/crates/ruff_python_formatter/generate.py @@ -102,7 +102,7 @@ def to_camel_case(node: str) -> str: code = f""" use ruff_formatter::write; use ruff_python_ast::{node}; - use crate::verbatim_text; + use crate::verbatim::verbatim_text; use crate::prelude::*; #[derive(Default)] diff --git a/crates/ruff_python_formatter/src/expression/expr_constant.rs b/crates/ruff_python_formatter/src/expression/expr_constant.rs new file mode 100644 index 0000000000000..a3402037f6e20 --- /dev/null +++ b/crates/ruff_python_formatter/src/expression/expr_constant.rs @@ -0,0 +1,13 @@ +use crate::prelude::*; +use crate::verbatim::verbatim_text; +use ruff_formatter::write; +use ruff_python_ast::ExprConstant; + +#[derive(Default)] +pub struct FormatExprConstant; + +impl FormatNodeRule for FormatExprConstant { + fn fmt_fields(&self, item: &ExprConstant, f: &mut PyFormatter) -> FormatResult<()> { + write!(f, [verbatim_text(item)]) + } +} diff --git a/crates/ruff_python_formatter/src/expression/expr_dict.rs b/crates/ruff_python_formatter/src/expression/expr_dict.rs index 9e5b4f111225b..20c41a1b0ba09 100644 --- a/crates/ruff_python_formatter/src/expression/expr_dict.rs +++ b/crates/ruff_python_formatter/src/expression/expr_dict.rs @@ -17,6 +17,7 @@ impl FormatNodeRule for FormatExprDict { range: _, node_index: _, items, + runtime_values: _, } = item; let comments = f.context().comments().clone(); diff --git a/crates/ruff_python_formatter/src/expression/expr_list.rs b/crates/ruff_python_formatter/src/expression/expr_list.rs index 4e295001d3865..0c04fc1e8cada 100644 --- a/crates/ruff_python_formatter/src/expression/expr_list.rs +++ b/crates/ruff_python_formatter/src/expression/expr_list.rs @@ -18,6 +18,7 @@ impl FormatNodeRule for FormatExprList { node_index: _, elts, ctx: _, + runtime_elts: _, } = item; let comments = f.context().comments().clone(); diff --git a/crates/ruff_python_formatter/src/expression/expr_set.rs b/crates/ruff_python_formatter/src/expression/expr_set.rs index 45d7f2f170187..8913879e10d17 100644 --- a/crates/ruff_python_formatter/src/expression/expr_set.rs +++ b/crates/ruff_python_formatter/src/expression/expr_set.rs @@ -14,6 +14,7 @@ impl FormatNodeRule for FormatExprSet { range: _, node_index: _, elts, + runtime_elts: _, } = item; // That would be a dict expression assert!(!elts.is_empty()); diff --git a/crates/ruff_python_formatter/src/expression/expr_tuple.rs b/crates/ruff_python_formatter/src/expression/expr_tuple.rs index 8eba63a2ac23f..f0100a22291fe 100644 --- a/crates/ruff_python_formatter/src/expression/expr_tuple.rs +++ b/crates/ruff_python_formatter/src/expression/expr_tuple.rs @@ -118,6 +118,7 @@ impl FormatNodeRule for FormatExprTuple { range: _, node_index: _, parenthesized: is_parenthesized, + runtime_elts: _, } = item; let comments = f.context().comments().clone(); diff --git a/crates/ruff_python_formatter/src/expression/mod.rs b/crates/ruff_python_formatter/src/expression/mod.rs index 9819038d62df4..cad4cea88d810 100644 --- a/crates/ruff_python_formatter/src/expression/mod.rs +++ b/crates/ruff_python_formatter/src/expression/mod.rs @@ -30,6 +30,7 @@ pub(crate) mod expr_boolean_literal; pub(crate) mod expr_bytes_literal; pub(crate) mod expr_call; pub(crate) mod expr_compare; +pub(crate) mod expr_constant; pub(crate) mod expr_dict; pub(crate) mod expr_dict_comp; pub(crate) mod expr_ellipsis_literal; @@ -110,6 +111,7 @@ impl FormatRule> for FormatExpr { Expr::Tuple(expr) => expr.format().fmt(f), Expr::Slice(expr) => expr.format().fmt(f), Expr::IpyEscapeCommand(expr) => expr.format().fmt(f), + Expr::Constant(expr) => expr.format().fmt(f), }); let parenthesize = match parentheses { Parentheses::Preserve => f.context().is_expression_parenthesized(expression.into()), @@ -290,6 +292,7 @@ fn format_with_parentheses_comments( Expr::Tuple(expr) => FormatNodeRule::fmt_fields(expr.format().rule(), expr, f), Expr::Slice(expr) => FormatNodeRule::fmt_fields(expr.format().rule(), expr, f), Expr::IpyEscapeCommand(expr) => FormatNodeRule::fmt_fields(expr.format().rule(), expr, f), + Expr::Constant(_) => unreachable!("RustPython-only AST node"), }); leading_comments(leading_outer).fmt(f)?; @@ -486,6 +489,7 @@ impl NeedsParentheses for Expr { Expr::Tuple(expr) => expr.needs_parentheses(parent, context), Expr::Slice(expr) => expr.needs_parentheses(parent, context), Expr::IpyEscapeCommand(expr) => expr.needs_parentheses(parent, context), + Expr::Constant(_) => OptionalParentheses::Never, } } } @@ -676,6 +680,7 @@ impl<'input> CanOmitOptionalParenthesesVisitor<'input> { node_index: _, op: _, values, + runtime_values: _, }) => self.update_max_precedence_with_count( OperatorPrecedence::BooleanOperation, values.len().saturating_sub(1) as u32, @@ -702,6 +707,7 @@ impl<'input> CanOmitOptionalParenthesesVisitor<'input> { left: _, ops, comparators: _, + runtime_comparators: _, }) => { self.update_max_precedence_with_count( OperatorPrecedence::Comparator, @@ -782,6 +788,7 @@ impl<'input> CanOmitOptionalParenthesesVisitor<'input> { | Expr::EllipsisLiteral(_) | Expr::Name(_) | Expr::Slice(_) + | Expr::Constant(_) | Expr::IpyEscapeCommand(_) => { return; } @@ -1301,6 +1308,7 @@ pub(crate) fn is_expression_huggable(expr: &Expr, context: &PyFormatContext) -> | Expr::BytesLiteral(_) | Expr::FString(_) | Expr::TString(_) + | Expr::Constant(_) | Expr::EllipsisLiteral(_) => false, } } @@ -1358,6 +1366,7 @@ pub(crate) fn is_splittable_expression(expr: &Expr, context: &PyFormatContext) - | Expr::BooleanLiteral(_) | Expr::NoneLiteral(_) | Expr::EllipsisLiteral(_) + | Expr::Constant(_) | Expr::Slice(_) | Expr::IpyEscapeCommand(_) => false, @@ -1468,6 +1477,7 @@ pub(crate) fn left_most<'expr>(expression: &'expr Expr, trivia: &TriviaRanges) - | Expr::Lambda(_) | Expr::Named(_) | Expr::IpyEscapeCommand(_) + | Expr::Constant(_) | Expr::Generator(_) => None, }; diff --git a/crates/ruff_python_formatter/src/generated.rs b/crates/ruff_python_formatter/src/generated.rs index 3abc77a538819..dfae88f53295a 100644 --- a/crates/ruff_python_formatter/src/generated.rs +++ b/crates/ruff_python_formatter/src/generated.rs @@ -1814,6 +1814,42 @@ impl<'ast> IntoFormat> for ast::ExprEllipsisLiteral { } } +impl FormatRule> + for crate::expression::expr_constant::FormatExprConstant +{ + #[inline] + fn fmt(&self, node: &ast::ExprConstant, f: &mut PyFormatter) -> FormatResult<()> { + FormatNodeRule::::fmt(self, node, f) + } +} +impl<'ast> AsFormat> for ast::ExprConstant { + type Format<'a> = FormatRefWithRule< + 'a, + ast::ExprConstant, + crate::expression::expr_constant::FormatExprConstant, + PyFormatContext<'ast>, + >; + fn format(&self) -> Self::Format<'_> { + FormatRefWithRule::new( + self, + crate::expression::expr_constant::FormatExprConstant::default(), + ) + } +} +impl<'ast> IntoFormat> for ast::ExprConstant { + type Format = FormatOwnedWithRule< + ast::ExprConstant, + crate::expression::expr_constant::FormatExprConstant, + PyFormatContext<'ast>, + >; + fn into_format(self) -> Self::Format { + FormatOwnedWithRule::new( + self, + crate::expression::expr_constant::FormatExprConstant::default(), + ) + } +} + impl FormatRule> for crate::expression::expr_attribute::FormatExprAttribute { diff --git a/crates/ruff_python_formatter/src/module/mod_module.rs b/crates/ruff_python_formatter/src/module/mod_module.rs index f24eb90429159..89eeb0eaae136 100644 --- a/crates/ruff_python_formatter/src/module/mod_module.rs +++ b/crates/ruff_python_formatter/src/module/mod_module.rs @@ -15,6 +15,7 @@ impl FormatNodeRule for FormatModModule { range, body, node_index: _, + runtime_body: _, } = item; if body.is_empty() { diff --git a/crates/ruff_python_formatter/src/other/arguments.rs b/crates/ruff_python_formatter/src/other/arguments.rs index 04c702cb5cf23..4702d645a4069 100644 --- a/crates/ruff_python_formatter/src/other/arguments.rs +++ b/crates/ruff_python_formatter/src/other/arguments.rs @@ -20,6 +20,8 @@ impl FormatNodeRule for FormatArguments { args, keywords, node_index: _, + runtime_args: _, + runtime_bases: _, } = item; // We have a case with `f()` without any argument, which is a special case because we can // have a comment with no node attachment inside: diff --git a/crates/ruff_python_formatter/src/other/comprehension.rs b/crates/ruff_python_formatter/src/other/comprehension.rs index 597b8182b7f75..32b077fb29922 100644 --- a/crates/ruff_python_formatter/src/other/comprehension.rs +++ b/crates/ruff_python_formatter/src/other/comprehension.rs @@ -53,6 +53,8 @@ impl FormatNodeRule for FormatComprehension { iter, ifs, is_async, + runtime_ifs: _, + runtime_is_async: _, } = item; if *is_async { diff --git a/crates/ruff_python_formatter/src/other/except_handler_except_handler.rs b/crates/ruff_python_formatter/src/other/except_handler_except_handler.rs index bcb972032961c..28218ad1c9f1f 100644 --- a/crates/ruff_python_formatter/src/other/except_handler_except_handler.rs +++ b/crates/ruff_python_formatter/src/other/except_handler_except_handler.rs @@ -47,6 +47,7 @@ impl FormatNodeRule for FormatExceptHandlerExceptHan type_, name, body, + runtime_body: _, } = item; let comments_info = f.context().comments().clone(); diff --git a/crates/ruff_python_formatter/src/other/match_case.rs b/crates/ruff_python_formatter/src/other/match_case.rs index 3221f133dbf15..baa7365873756 100644 --- a/crates/ruff_python_formatter/src/other/match_case.rs +++ b/crates/ruff_python_formatter/src/other/match_case.rs @@ -30,6 +30,7 @@ impl FormatNodeRule for FormatMatchCase { pattern, guard, body, + runtime_body: _, } = item; let comments = f.context().comments().clone(); diff --git a/crates/ruff_python_formatter/src/other/parameter.rs b/crates/ruff_python_formatter/src/other/parameter.rs index c2eeb6aa6a21a..686af9f7f259f 100644 --- a/crates/ruff_python_formatter/src/other/parameter.rs +++ b/crates/ruff_python_formatter/src/other/parameter.rs @@ -11,6 +11,8 @@ impl FormatNodeRule for FormatParameter { node_index: _, name, annotation, + runtime_type_comment: _, + runtime_type_comment_bytes: _, } = item; name.format().fmt(f)?; diff --git a/crates/ruff_python_formatter/src/other/parameters.rs b/crates/ruff_python_formatter/src/other/parameters.rs index 89338226ebf5c..0c02acb680acb 100644 --- a/crates/ruff_python_formatter/src/other/parameters.rs +++ b/crates/ruff_python_formatter/src/other/parameters.rs @@ -57,6 +57,7 @@ impl FormatNodeRule for FormatParameters { vararg, kwonlyargs, kwarg, + runtime_defaults: _, } = item; let (slash, star) = find_parameter_separators(f.context().source(), item); diff --git a/crates/ruff_python_formatter/src/pattern/pattern_match_class.rs b/crates/ruff_python_formatter/src/pattern/pattern_match_class.rs index ce1583049406b..f8cdf82a1f434 100644 --- a/crates/ruff_python_formatter/src/pattern/pattern_match_class.rs +++ b/crates/ruff_python_formatter/src/pattern/pattern_match_class.rs @@ -16,6 +16,9 @@ impl FormatNodeRule for FormatPatternMatchClass { node_index: _, cls, arguments, + runtime_patterns: _, + runtime_kwd_attrs: _, + runtime_kwd_patterns: _, } = item; let comments = f.context().comments().clone(); diff --git a/crates/ruff_python_formatter/src/pattern/pattern_match_mapping.rs b/crates/ruff_python_formatter/src/pattern/pattern_match_mapping.rs index cb5568f707035..7b5fe88176fdd 100644 --- a/crates/ruff_python_formatter/src/pattern/pattern_match_mapping.rs +++ b/crates/ruff_python_formatter/src/pattern/pattern_match_mapping.rs @@ -22,6 +22,8 @@ impl FormatNodeRule for FormatPatternMatchMapping { rest, range: _, node_index: _, + runtime_keys: _, + runtime_patterns: _, } = item; debug_assert_eq!(keys.len(), patterns.len()); @@ -165,6 +167,8 @@ fn find_double_star(pattern: &PatternMatchMapping, source: &str) -> Option<(Text rest, range: _, node_index: _, + runtime_keys: _, + runtime_patterns: _, } = pattern; // If there's no `rest` element, there's no `**`. diff --git a/crates/ruff_python_formatter/src/pattern/pattern_match_or.rs b/crates/ruff_python_formatter/src/pattern/pattern_match_or.rs index b0b21f49e902a..232cab59fb1cf 100644 --- a/crates/ruff_python_formatter/src/pattern/pattern_match_or.rs +++ b/crates/ruff_python_formatter/src/pattern/pattern_match_or.rs @@ -18,6 +18,7 @@ impl FormatNodeRule for FormatPatternMatchOr { range: _, node_index: _, patterns, + runtime_patterns: _, } = item; let inner = format_with(|f: &mut PyFormatter| { let mut patterns = patterns.iter(); diff --git a/crates/ruff_python_formatter/src/pattern/pattern_match_sequence.rs b/crates/ruff_python_formatter/src/pattern/pattern_match_sequence.rs index 8753760ec6912..fc03828008225 100644 --- a/crates/ruff_python_formatter/src/pattern/pattern_match_sequence.rs +++ b/crates/ruff_python_formatter/src/pattern/pattern_match_sequence.rs @@ -18,6 +18,7 @@ impl FormatNodeRule for FormatPatternMatchSequence { patterns, range, node_index: _, + runtime_patterns: _, } = item; let comments = f.context().comments().clone(); diff --git a/crates/ruff_python_formatter/src/range.rs b/crates/ruff_python_formatter/src/range.rs index 47266fb53431f..26bd414435446 100644 --- a/crates/ruff_python_formatter/src/range.rs +++ b/crates/ruff_python_formatter/src/range.rs @@ -418,6 +418,10 @@ impl SourceOrderVisitor<'_> for NarrowRange<'_> { is_star: _, range: _, node_index: _, + runtime_body: _, + runtime_handlers: _, + runtime_orelse: _, + runtime_finalbody: _, }) => { self.visit_body(body); if let Some(except_handler_saved) = @@ -703,6 +707,7 @@ impl Format> for FormatEnclosingNode<'_> { | AnyNodeRef::ExprTuple(_) | AnyNodeRef::ExprSlice(_) | AnyNodeRef::ExprIpyEscapeCommand(_) + | AnyNodeRef::ExprConstant(_) | AnyNodeRef::FString(_) | AnyNodeRef::StringLiteral(_) | AnyNodeRef::TString(_) diff --git a/crates/ruff_python_formatter/src/statement/clause.rs b/crates/ruff_python_formatter/src/statement/clause.rs index b4320bcab360c..ba10764bd2bec 100644 --- a/crates/ruff_python_formatter/src/statement/clause.rs +++ b/crates/ruff_python_formatter/src/statement/clause.rs @@ -126,6 +126,8 @@ impl<'a> ClauseHeader<'a> { decorator_list: _, name: _, body: _, + runtime_decorator_list: _, + runtime_body: _, }) => { if let Some(type_params) = type_params.as_deref() { visit(type_params, visitor); @@ -145,6 +147,10 @@ impl<'a> ClauseHeader<'a> { name: _, returns, body: _, + runtime_decorator_list: _, + runtime_type_comment: _, + runtime_type_comment_bytes: _, + runtime_body: _, }) => { if let Some(type_params) = type_params.as_deref() { visit(type_params, visitor); @@ -161,6 +167,7 @@ impl<'a> ClauseHeader<'a> { node_index: _, body: _, elif_else_clauses: _, + runtime_body: _, }) => { visit(test.as_ref(), visitor); } @@ -169,6 +176,8 @@ impl<'a> ClauseHeader<'a> { range: _, node_index: _, body: _, + runtime_body: _, + runtime_orelse: _, }) => { if let Some(test) = test.as_ref() { visit(test, visitor); @@ -181,6 +190,7 @@ impl<'a> ClauseHeader<'a> { node_index: _, name: _, body: _, + runtime_body: _, }) => { if let Some(type_expr) = type_expr.as_deref() { visit(type_expr, visitor); @@ -200,6 +210,7 @@ impl<'a> ClauseHeader<'a> { range: _, node_index: _, body: _, + runtime_body: _, }) => { visit(pattern, visitor); @@ -215,6 +226,10 @@ impl<'a> ClauseHeader<'a> { is_async: _, body: _, orelse: _, + runtime_type_comment: _, + runtime_type_comment_bytes: _, + runtime_body: _, + runtime_orelse: _, }) => { visit(target.as_ref(), visitor); visit(iter.as_ref(), visitor); @@ -225,6 +240,8 @@ impl<'a> ClauseHeader<'a> { node_index: _, body: _, orelse: _, + runtime_body: _, + runtime_orelse: _, }) => { visit(test.as_ref(), visitor); } @@ -234,6 +251,9 @@ impl<'a> ClauseHeader<'a> { node_index: _, is_async: _, body: _, + runtime_type_comment: _, + runtime_type_comment_bytes: _, + runtime_body: _, }) => { for item in items { visit(item, visitor); diff --git a/crates/ruff_python_formatter/src/statement/stmt_ann_assign.rs b/crates/ruff_python_formatter/src/statement/stmt_ann_assign.rs index 09ad3240a9f03..4646480c0f356 100644 --- a/crates/ruff_python_formatter/src/statement/stmt_ann_assign.rs +++ b/crates/ruff_python_formatter/src/statement/stmt_ann_assign.rs @@ -21,6 +21,7 @@ impl FormatNodeRule for FormatStmtAnnAssign { annotation, value, simple: _, + runtime_simple: _, } = item; let comments = f.context().comments().clone(); let annotation_parentheses = annotation diff --git a/crates/ruff_python_formatter/src/statement/stmt_assign.rs b/crates/ruff_python_formatter/src/statement/stmt_assign.rs index 16bbb1dfe6441..b008df406283c 100644 --- a/crates/ruff_python_formatter/src/statement/stmt_assign.rs +++ b/crates/ruff_python_formatter/src/statement/stmt_assign.rs @@ -36,6 +36,9 @@ impl FormatNodeRule for FormatStmtAssign { node_index: _, targets, value, + runtime_targets: _, + runtime_type_comment: _, + runtime_type_comment_bytes: _, } = item; let (first, rest) = targets.split_first().ok_or(FormatError::syntax_error( diff --git a/crates/ruff_python_formatter/src/statement/stmt_class_def.rs b/crates/ruff_python_formatter/src/statement/stmt_class_def.rs index 941fc43aa38f6..7de3a7fd8e084 100644 --- a/crates/ruff_python_formatter/src/statement/stmt_class_def.rs +++ b/crates/ruff_python_formatter/src/statement/stmt_class_def.rs @@ -24,6 +24,8 @@ impl FormatNodeRule for FormatStmtClassDef { body, type_params, decorator_list, + runtime_decorator_list: _, + runtime_body: _, } = item; let comments = f.context().comments().clone(); diff --git a/crates/ruff_python_formatter/src/statement/stmt_delete.rs b/crates/ruff_python_formatter/src/statement/stmt_delete.rs index 0f66beb403de8..1bbc3458f217d 100644 --- a/crates/ruff_python_formatter/src/statement/stmt_delete.rs +++ b/crates/ruff_python_formatter/src/statement/stmt_delete.rs @@ -17,6 +17,7 @@ impl FormatNodeRule for FormatStmtDelete { range: _, node_index: _, targets, + runtime_targets: _, } = item; write!(f, [token("del"), space()])?; diff --git a/crates/ruff_python_formatter/src/statement/stmt_for.rs b/crates/ruff_python_formatter/src/statement/stmt_for.rs index d8e1cd082e554..a969542a9066b 100644 --- a/crates/ruff_python_formatter/src/statement/stmt_for.rs +++ b/crates/ruff_python_formatter/src/statement/stmt_for.rs @@ -37,6 +37,10 @@ impl FormatNodeRule for FormatStmtFor { orelse, range: _, node_index: _, + runtime_type_comment: _, + runtime_type_comment_bytes: _, + runtime_body: _, + runtime_orelse: _, } = item; let comments = f.context().comments().clone(); diff --git a/crates/ruff_python_formatter/src/statement/stmt_function_def.rs b/crates/ruff_python_formatter/src/statement/stmt_function_def.rs index 61b333c72dbdb..2dfbcbcea7985 100644 --- a/crates/ruff_python_formatter/src/statement/stmt_function_def.rs +++ b/crates/ruff_python_formatter/src/statement/stmt_function_def.rs @@ -102,6 +102,10 @@ fn format_function_header(f: &mut PyFormatter, item: &StmtFunctionDef) -> Format parameters, returns, body: _, + runtime_decorator_list: _, + runtime_type_comment: _, + runtime_type_comment_bytes: _, + runtime_body: _, } = item; let comments = f.context().comments().clone(); diff --git a/crates/ruff_python_formatter/src/statement/stmt_if.rs b/crates/ruff_python_formatter/src/statement/stmt_if.rs index 899c03c054cac..c4a5bb638a0a9 100644 --- a/crates/ruff_python_formatter/src/statement/stmt_if.rs +++ b/crates/ruff_python_formatter/src/statement/stmt_if.rs @@ -19,6 +19,7 @@ impl FormatNodeRule for FormatStmtIf { test, body, elif_else_clauses, + runtime_body: _, } = item; let comments = f.context().comments().clone(); @@ -67,6 +68,8 @@ pub(crate) fn format_elif_else_clause( node_index: _, test, body, + runtime_body: _, + runtime_orelse: _, } = item; let comments = f.context().comments().clone(); diff --git a/crates/ruff_python_formatter/src/statement/stmt_import_from.rs b/crates/ruff_python_formatter/src/statement/stmt_import_from.rs index 6b715eab830dd..e1aeae80f8b87 100644 --- a/crates/ruff_python_formatter/src/statement/stmt_import_from.rs +++ b/crates/ruff_python_formatter/src/statement/stmt_import_from.rs @@ -19,6 +19,7 @@ impl FormatNodeRule for FormatStmtImportFrom { is_lazy, range: _, node_index: _, + runtime_level: _, } = item; if *is_lazy { diff --git a/crates/ruff_python_formatter/src/statement/stmt_try.rs b/crates/ruff_python_formatter/src/statement/stmt_try.rs index 2ea085b67d35d..b4ff67842c7db 100644 --- a/crates/ruff_python_formatter/src/statement/stmt_try.rs +++ b/crates/ruff_python_formatter/src/statement/stmt_try.rs @@ -67,6 +67,10 @@ impl FormatNodeRule for FormatStmtTry { is_star, range: _, node_index: _, + runtime_body: _, + runtime_handlers: _, + runtime_orelse: _, + runtime_finalbody: _, } = item; let comments_info = f.context().comments().clone(); diff --git a/crates/ruff_python_formatter/src/statement/stmt_while.rs b/crates/ruff_python_formatter/src/statement/stmt_while.rs index fdcc2e4c9a31e..1a233b84c01f8 100644 --- a/crates/ruff_python_formatter/src/statement/stmt_while.rs +++ b/crates/ruff_python_formatter/src/statement/stmt_while.rs @@ -19,6 +19,8 @@ impl FormatNodeRule for FormatStmtWhile { test, body, orelse, + runtime_body: _, + runtime_orelse: _, } = item; let comments = f.context().comments().clone(); diff --git a/crates/ruff_python_parser/Cargo.toml b/crates/ruff_python_parser/Cargo.toml index d4232a3054e6c..a5f7d60aa6fec 100644 --- a/crates/ruff_python_parser/Cargo.toml +++ b/crates/ruff_python_parser/Cargo.toml @@ -1,7 +1,7 @@ [package] -name = "ruff_python_parser" -version = "0.0.11" -description = "This is an internal component crate of Ruff" +description = "Unofficial fork for RustPython" +name = "rustpython-ruff_python_parser" +version = "0.16.5" authors = ["Charlie Marsh ", "RustPython Team"] edition = { workspace = true } rust-version = { workspace = true } @@ -11,6 +11,7 @@ repository = { workspace = true } license = { workspace = true } [lib] +name = "ruff_python_parser" [dependencies] ruff_python_ast = { workspace = true, features = ["get-size"] } diff --git a/crates/ruff_python_parser/src/lib.rs b/crates/ruff_python_parser/src/lib.rs index 49beaf37b58a1..a6066bda687cf 100644 --- a/crates/ruff_python_parser/src/lib.rs +++ b/crates/ruff_python_parser/src/lib.rs @@ -375,6 +375,7 @@ pub fn parse_cells_unchecked( node_index: AtomicNodeIndex::NONE, range: module_range.unwrap_or_default(), body, + runtime_body: None, }, tokens: Tokens::new(tokens), errors, diff --git a/crates/ruff_python_parser/src/parser/expression.rs b/crates/ruff_python_parser/src/parser/expression.rs index 2084cacf34c88..a90d18c2a7ba9 100644 --- a/crates/ruff_python_parser/src/parser/expression.rs +++ b/crates/ruff_python_parser/src/parser/expression.rs @@ -736,6 +736,8 @@ impl<'src> Parser<'src> { node_index: AtomicNodeIndex::NONE, args: Box::default(), keywords: ThinVec::default(), + runtime_args: None, + runtime_bases: None, }; } @@ -873,6 +875,8 @@ impl<'src> Parser<'src> { node_index: AtomicNodeIndex::NONE, args: self.expr_scratch.take(args_snapshot), keywords, + runtime_args: None, + runtime_bases: None, }; self.validate_arguments(&arguments, has_trailing_comma, context); @@ -939,6 +943,7 @@ impl<'src> Parser<'src> { range: self.node_range(slice_start), parenthesized: false, node_index: AtomicNodeIndex::NONE, + runtime_elts: None, }); } else if slice.is_starred_expr() { // If the only slice element is a starred expression, that is represented @@ -950,6 +955,7 @@ impl<'src> Parser<'src> { range: self.node_range(slice_start), parenthesized: false, node_index: AtomicNodeIndex::NONE, + runtime_elts: None, }); } @@ -1195,6 +1201,7 @@ impl<'src> Parser<'src> { op, range: self.node_range(start), node_index: AtomicNodeIndex::NONE, + runtime_values: None, } } @@ -1277,6 +1284,7 @@ impl<'src> Parser<'src> { comparators: self.expr_scratch.take(comparators_snapshot), range: self.node_range(start), node_index: AtomicNodeIndex::NONE, + runtime_comparators: None, } } @@ -1438,6 +1446,8 @@ impl<'src> Parser<'src> { value: ast::TStringValue::concatenated(values), range, node_index: AtomicNodeIndex::NONE, + runtime_template_str: None, + runtime_values: None, }); } } @@ -1500,6 +1510,8 @@ impl<'src> Parser<'src> { value: ast::FStringValue::concatenated(parts), range, node_index: AtomicNodeIndex::NONE, + runtime_joined_str: None, + runtime_values: None, }) } @@ -2025,6 +2037,9 @@ impl<'src> Parser<'src> { format_spec, range, node_index: AtomicNodeIndex::NONE, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, } } @@ -2055,6 +2070,7 @@ impl<'src> Parser<'src> { ctx: ExprContext::Load, range: self.node_range(start), node_index: AtomicNodeIndex::NONE, + runtime_elts: None, }); } @@ -2146,6 +2162,7 @@ impl<'src> Parser<'src> { items: vec![], range: self.node_range(start), node_index: AtomicNodeIndex::NONE, + runtime_values: None, }); } @@ -2309,6 +2326,7 @@ impl<'src> Parser<'src> { range: self.node_range(start), node_index: AtomicNodeIndex::NONE, parenthesized: true, + runtime_elts: None, }) .into(); } @@ -2403,6 +2421,7 @@ impl<'src> Parser<'src> { range: self.node_range(start), node_index: AtomicNodeIndex::NONE, parenthesized: parenthesized.is_yes(), + runtime_elts: None, } } @@ -2431,6 +2450,7 @@ impl<'src> Parser<'src> { ctx: ExprContext::Load, range: self.node_range(start), node_index: AtomicNodeIndex::NONE, + runtime_elts: None, } } @@ -2482,6 +2502,7 @@ impl<'src> Parser<'src> { range: self.node_range(start), node_index: AtomicNodeIndex::NONE, elts: self.expr_scratch.take(elts_snapshot), + runtime_elts: None, } } @@ -2527,6 +2548,7 @@ impl<'src> Parser<'src> { range: self.node_range(start), node_index: AtomicNodeIndex::NONE, items, + runtime_values: None, } } @@ -2600,6 +2622,8 @@ impl<'src> Parser<'src> { iter: iter.expr, ifs: self.expr_scratch.take(ifs_snapshot), is_async, + runtime_ifs: None, + runtime_is_async: None, } } diff --git a/crates/ruff_python_parser/src/parser/helpers.rs b/crates/ruff_python_parser/src/parser/helpers.rs index 4024eadb1dd43..562cf0fc48b6e 100644 --- a/crates/ruff_python_parser/src/parser/helpers.rs +++ b/crates/ruff_python_parser/src/parser/helpers.rs @@ -75,6 +75,7 @@ pub(super) fn detect_invalid_pre_py39_decorator_node( Number::Float(_) => "a float literal", Number::Complex { .. } => "a complex literal", }, + Expr::Constant(_) => "a constant literal", Expr::BoolOp(_) => "boolean expression", Expr::BinOp(_) => "binary-operation expression", diff --git a/crates/ruff_python_parser/src/parser/mod.rs b/crates/ruff_python_parser/src/parser/mod.rs index 7f59aa1ab8022..60a3ab4846657 100644 --- a/crates/ruff_python_parser/src/parser/mod.rs +++ b/crates/ruff_python_parser/src/parser/mod.rs @@ -246,6 +246,7 @@ impl<'src> Parser<'src> { body, range: TextRange::new(self.start_offset, self.current_token_range().end()), node_index: AtomicNodeIndex::NONE, + runtime_body: None, } } diff --git a/crates/ruff_python_parser/src/parser/pattern.rs b/crates/ruff_python_parser/src/parser/pattern.rs index bde2fd478a900..3aaad9d2bfbc2 100644 --- a/crates/ruff_python_parser/src/parser/pattern.rs +++ b/crates/ruff_python_parser/src/parser/pattern.rs @@ -114,6 +114,7 @@ impl Parser<'_> { range: self.node_range(start), patterns, node_index: AtomicNodeIndex::NONE, + runtime_patterns: None, }); } @@ -261,6 +262,8 @@ impl Parser<'_> { patterns, rest, node_index: AtomicNodeIndex::NONE, + runtime_keys: None, + runtime_patterns: None, } } @@ -339,6 +342,7 @@ impl Parser<'_> { patterns: Vec::new(), range: self.node_range(start), node_index: AtomicNodeIndex::NONE, + runtime_patterns: None, }); } @@ -394,6 +398,7 @@ impl Parser<'_> { range: self.node_range(start), patterns, node_index: AtomicNodeIndex::NONE, + runtime_patterns: None, } } @@ -764,6 +769,9 @@ impl Parser<'_> { }, range: self.node_range(start), node_index: AtomicNodeIndex::NONE, + runtime_patterns: None, + runtime_kwd_attrs: None, + runtime_kwd_patterns: None, } } } diff --git a/crates/ruff_python_parser/src/parser/recovery.rs b/crates/ruff_python_parser/src/parser/recovery.rs index 22b8e120b1b44..0f9fc3edf0394 100644 --- a/crates/ruff_python_parser/src/parser/recovery.rs +++ b/crates/ruff_python_parser/src/parser/recovery.rs @@ -50,11 +50,13 @@ pub(super) fn pattern_to_expr(pattern: Pattern) -> Expr { range, node_index, patterns, + .. }) => Expr::List(ast::ExprList { elts: patterns.into_iter().map(pattern_to_expr).collect(), ctx: ExprContext::Store, range, node_index, + runtime_elts: None, }), Pattern::MatchMapping(ast::PatternMatchMapping { range, @@ -62,6 +64,7 @@ pub(super) fn pattern_to_expr(pattern: Pattern) -> Expr { keys, patterns, rest, + .. }) => { let mut items: Vec = keys .into_iter() @@ -86,6 +89,7 @@ pub(super) fn pattern_to_expr(pattern: Pattern) -> Expr { range, node_index, items, + runtime_values: None, }) } Pattern::MatchClass(ast::PatternMatchClass { @@ -93,6 +97,7 @@ pub(super) fn pattern_to_expr(pattern: Pattern) -> Expr { node_index, cls, arguments, + .. }) => { debug_assert_eq!(range.end(), arguments.end()); @@ -118,6 +123,8 @@ pub(super) fn pattern_to_expr(pattern: Pattern) -> Expr { value: pattern_to_expr(keyword_pattern.pattern), }) .collect(), + runtime_args: None, + runtime_bases: None, }, }) } diff --git a/crates/ruff_python_parser/src/parser/snapshots/ruff_python_parser__parser__tests__ipython_escape_commands.snap b/crates/ruff_python_parser/src/parser/snapshots/ruff_python_parser__parser__tests__ipython_escape_commands.snap index 9851c7123b2f7..2a4e9eaad1f4f 100644 --- a/crates/ruff_python_parser/src/parser/snapshots/ruff_python_parser__parser__tests__ipython_escape_commands.snap +++ b/crates/ruff_python_parser/src/parser/snapshots/ruff_python_parser__parser__tests__ipython_escape_commands.snap @@ -160,6 +160,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -193,12 +194,17 @@ Module( }, ), ], + runtime_comparators: None, }, ), ), }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), IpyEscapeCommand( @@ -265,6 +271,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -279,6 +287,10 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), Assign( @@ -303,6 +315,9 @@ Module( value: "pwd", }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), AnnAssign( @@ -336,6 +351,7 @@ Module( ), ), simple: true, + runtime_simple: None, }, ), Assign( @@ -360,6 +376,9 @@ Module( value: "foo bar", }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -384,6 +403,9 @@ Module( value: "foo?", }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -408,6 +430,9 @@ Module( value: "pwd?", }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), IpyEscapeCommand( @@ -440,6 +465,9 @@ Module( value: "foo # comment", }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), IpyEscapeCommand( @@ -499,5 +527,6 @@ Module( }, ), ], + runtime_body: None, }, ) diff --git a/crates/ruff_python_parser/src/parser/snapshots/ruff_python_parser__parser__tests__unicode_aliases.snap b/crates/ruff_python_parser/src/parser/snapshots/ruff_python_parser__parser__tests__unicode_aliases.snap index 08e3e1b4f3d6a..5824cc5f4fcc1 100644 --- a/crates/ruff_python_parser/src/parser/snapshots/ruff_python_parser__parser__tests__unicode_aliases.snap +++ b/crates/ruff_python_parser/src/parser/snapshots/ruff_python_parser__parser__tests__unicode_aliases.snap @@ -38,6 +38,9 @@ expression: suite }, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ] diff --git a/crates/ruff_python_parser/src/parser/statement.rs b/crates/ruff_python_parser/src/parser/statement.rs index 8fd22dec69b64..8c091288b5056 100644 --- a/crates/ruff_python_parser/src/parser/statement.rs +++ b/crates/ruff_python_parser/src/parser/statement.rs @@ -439,6 +439,7 @@ impl<'src> Parser<'src> { targets, range: self.node_range(start), node_index: AtomicNodeIndex::NONE, + runtime_targets: None, } } @@ -764,6 +765,7 @@ impl<'src> Parser<'src> { is_lazy, range: self.node_range(start), node_index: AtomicNodeIndex::NONE, + runtime_level: None, } } @@ -1284,6 +1286,9 @@ impl<'src> Parser<'src> { value: Box::new(value.expr), range: self.node_range(start), node_index: AtomicNodeIndex::NONE, + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, } } @@ -1364,6 +1369,7 @@ impl<'src> Parser<'src> { simple, range: self.node_range(start), node_index: AtomicNodeIndex::NONE, + runtime_simple: None, } } @@ -1478,6 +1484,7 @@ impl<'src> Parser<'src> { elif_else_clauses: self.elif_else_scratch.take(elif_else_snapshot), range: self.node_range(start), node_index: AtomicNodeIndex::NONE, + runtime_body: None, } } @@ -1522,6 +1529,8 @@ impl<'src> Parser<'src> { body, range: self.node_range(start), node_index: AtomicNodeIndex::NONE, + runtime_body: None, + runtime_orelse: None, } } @@ -1678,6 +1687,10 @@ impl<'src> Parser<'src> { is_star, range: self.node_range(try_start), node_index: AtomicNodeIndex::NONE, + runtime_body: None, + runtime_handlers: None, + runtime_orelse: None, + runtime_finalbody: None, } } @@ -1828,6 +1841,7 @@ impl<'src> Parser<'src> { body: except_body, range: self.node_range(start), node_index: AtomicNodeIndex::NONE, + runtime_body: None, }), block_kind, ) @@ -1940,6 +1954,10 @@ impl<'src> Parser<'src> { orelse, range: self.node_range(start), node_index: AtomicNodeIndex::NONE, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, } } @@ -1988,6 +2006,8 @@ impl<'src> Parser<'src> { orelse, range: self.node_range(start), node_index: AtomicNodeIndex::NONE, + runtime_body: None, + runtime_orelse: None, } } @@ -2118,6 +2138,10 @@ impl<'src> Parser<'src> { returns, range: self.node_range(start), node_index: AtomicNodeIndex::NONE, + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, } } @@ -2193,6 +2217,8 @@ impl<'src> Parser<'src> { arguments, body, node_index: AtomicNodeIndex::NONE, + runtime_decorator_list: None, + runtime_body: None, } } @@ -2222,6 +2248,9 @@ impl<'src> Parser<'src> { is_async: false, range: self.node_range(start), node_index: AtomicNodeIndex::NONE, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, } } @@ -2829,6 +2858,7 @@ impl<'src> Parser<'src> { body, range: self.node_range(start), node_index: AtomicNodeIndex::NONE, + runtime_body: None, } } @@ -3065,6 +3095,10 @@ impl<'src> Parser<'src> { }), returns: None, body: Suite::new(), + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, } .into() } @@ -3237,6 +3271,8 @@ impl<'src> Parser<'src> { name, annotation, node_index: AtomicNodeIndex::NONE, + runtime_type_comment: None, + runtime_type_comment_bytes: None, } } @@ -3626,6 +3662,7 @@ impl<'src> Parser<'src> { range: self.node_range(start), type_params, node_index: AtomicNodeIndex::NONE, + runtime_type_params: None, } } diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__dont_panic_on_8_in_octal_escape.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__dont_panic_on_8_in_octal_escape.snap index 5e04b08423c13..3e4f0b217a649 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__dont_panic_on_8_in_octal_escape.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__dont_panic_on_8_in_octal_escape.snap @@ -38,6 +38,9 @@ expression: suite }, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ] diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_constant_range.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_constant_range.snap index a04a2f411896d..ac88720bc493d 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_constant_range.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_constant_range.snap @@ -40,6 +40,9 @@ expression: suite debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -64,6 +67,9 @@ expression: suite debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -84,6 +90,8 @@ expression: suite ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_escaped_character.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_escaped_character.snap index c356bd1c08648..b7b41741a63c6 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_escaped_character.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_escaped_character.snap @@ -40,6 +40,9 @@ expression: suite debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -53,6 +56,8 @@ expression: suite ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_escaped_newline.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_escaped_newline.snap index 998a2269edd29..4b7b69b28723b 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_escaped_newline.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_escaped_newline.snap @@ -40,6 +40,9 @@ expression: suite debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -53,6 +56,8 @@ expression: suite ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_line_continuation.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_line_continuation.snap index 44540b29c379c..1ff70329b687c 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_line_continuation.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_line_continuation.snap @@ -40,6 +40,9 @@ expression: suite debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -55,6 +58,8 @@ expression: suite ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_parse_self_documenting_base.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_parse_self_documenting_base.snap index 09118051d291f..a620379c6d6b9 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_parse_self_documenting_base.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_parse_self_documenting_base.snap @@ -39,6 +39,9 @@ expression: suite ), conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -52,6 +55,8 @@ expression: suite ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_parse_self_documenting_base_more.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_parse_self_documenting_base_more.snap index 455bb9c133a9f..c0ff992bbc80a 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_parse_self_documenting_base_more.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_parse_self_documenting_base_more.snap @@ -46,6 +46,9 @@ expression: suite ), conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -76,6 +79,9 @@ expression: suite ), conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -89,6 +95,8 @@ expression: suite ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_parse_self_documenting_format.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_parse_self_documenting_format.snap index e38ddc5944013..b00bbd92fcb9f 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_parse_self_documenting_format.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_parse_self_documenting_format.snap @@ -53,6 +53,9 @@ expression: suite ], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -66,6 +69,8 @@ expression: suite ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_unescaped_newline.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_unescaped_newline.snap index 0e871901fced3..3aff2c4be63eb 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_unescaped_newline.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_unescaped_newline.snap @@ -40,6 +40,9 @@ expression: suite debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -53,6 +56,8 @@ expression: suite ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_empty_fstring.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_empty_fstring.snap index db0275af326a0..ee8ecee741399 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_empty_fstring.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_empty_fstring.snap @@ -28,6 +28,8 @@ expression: suite ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_empty_tstring.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_empty_tstring.snap index bfb2d6218a802..a7917162060ec 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_empty_tstring.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_empty_tstring.snap @@ -26,6 +26,8 @@ expression: suite }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_f_string_concat_1.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_f_string_concat_1.snap index b5a212b25bcae..96f03262afac8 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_f_string_concat_1.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_f_string_concat_1.snap @@ -51,6 +51,8 @@ expression: suite ], ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_f_string_concat_2.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_f_string_concat_2.snap index b5a212b25bcae..96f03262afac8 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_f_string_concat_2.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_f_string_concat_2.snap @@ -51,6 +51,8 @@ expression: suite ], ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_f_string_concat_3.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_f_string_concat_3.snap index c0997152c4372..f0c4625a0d437 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_f_string_concat_3.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_f_string_concat_3.snap @@ -67,6 +67,9 @@ expression: suite debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -81,6 +84,8 @@ expression: suite ], ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_f_string_concat_4.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_f_string_concat_4.snap index e9634e20e36e4..2b1936fb46b02 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_f_string_concat_4.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_f_string_concat_4.snap @@ -67,6 +67,9 @@ expression: suite debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -94,6 +97,8 @@ expression: suite ], ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring.snap index 7123b8431c95a..64914e65d499f 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring.snap @@ -33,6 +33,9 @@ expression: suite debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Interpolation( @@ -50,6 +53,9 @@ expression: suite debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -70,6 +76,8 @@ expression: suite ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_equals.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_equals.snap index 7a9edf207fd3c..d199aaca36a01 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_equals.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_equals.snap @@ -49,11 +49,15 @@ expression: suite }, ), ], + runtime_comparators: None, }, ), debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -67,6 +71,8 @@ expression: suite ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_nested_concatenation_string_spec.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_nested_concatenation_string_spec.snap index 7bfb2a5b22925..0846795fece14 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_nested_concatenation_string_spec.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_nested_concatenation_string_spec.snap @@ -81,11 +81,17 @@ expression: suite debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -99,6 +105,8 @@ expression: suite ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_nested_spec.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_nested_spec.snap index f938542df6de3..287e6e2492e68 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_nested_spec.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_nested_spec.snap @@ -52,11 +52,17 @@ expression: suite debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -70,6 +76,8 @@ expression: suite ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_nested_string_spec.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_nested_string_spec.snap index 66f2aecbecc90..98c3b2545aa4f 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_nested_string_spec.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_nested_string_spec.snap @@ -65,11 +65,17 @@ expression: suite debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -83,6 +89,8 @@ expression: suite ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_not_equals.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_not_equals.snap index 3ab964282e17c..ae3c3555097df 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_not_equals.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_not_equals.snap @@ -49,11 +49,15 @@ expression: suite }, ), ], + runtime_comparators: None, }, ), debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -67,6 +71,8 @@ expression: suite ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_not_nested_spec.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_not_nested_spec.snap index b9a22296269d7..4604d69f9c766 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_not_nested_spec.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_not_nested_spec.snap @@ -47,6 +47,9 @@ expression: suite ], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -60,6 +63,8 @@ expression: suite ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_self_doc_prec_space.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_self_doc_prec_space.snap index e4eed4b579e7d..be4a948614cf5 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_self_doc_prec_space.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_self_doc_prec_space.snap @@ -39,6 +39,9 @@ expression: suite ), conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -52,6 +55,8 @@ expression: suite ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_self_doc_trailing_space.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_self_doc_trailing_space.snap index 8981652d97de2..8e84f5d48a1f1 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_self_doc_trailing_space.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_self_doc_trailing_space.snap @@ -39,6 +39,9 @@ expression: suite ), conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -52,6 +55,8 @@ expression: suite ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_yield_expr.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_yield_expr.snap index 1f59b2a5ba6e9..1d1eec779ae6d 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_yield_expr.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_yield_expr.snap @@ -32,6 +32,9 @@ expression: suite debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -45,6 +48,8 @@ expression: suite ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring.snap index 67b4c413655bf..37afbe0a60594 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring.snap @@ -32,6 +32,9 @@ expression: suite debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Interpolation( @@ -49,6 +52,9 @@ expression: suite debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -68,6 +74,8 @@ expression: suite }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_equals.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_equals.snap index c7baa8a513e02..dd7dc8e01fad2 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_equals.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_equals.snap @@ -48,11 +48,15 @@ expression: suite }, ), ], + runtime_comparators: None, }, ), debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -65,6 +69,8 @@ expression: suite }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_nested_concatenation_string_spec.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_nested_concatenation_string_spec.snap index 93cfa48dd1b63..50203d0862fe1 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_nested_concatenation_string_spec.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_nested_concatenation_string_spec.snap @@ -80,11 +80,17 @@ expression: suite debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -97,6 +103,8 @@ expression: suite }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_nested_spec.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_nested_spec.snap index 70f42c31394d2..4744dd172bbd4 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_nested_spec.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_nested_spec.snap @@ -51,11 +51,17 @@ expression: suite debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -68,6 +74,8 @@ expression: suite }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_nested_string_spec.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_nested_string_spec.snap index 38b4e902ba18c..0925628ab1ce0 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_nested_string_spec.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_nested_string_spec.snap @@ -64,11 +64,17 @@ expression: suite debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -81,6 +87,8 @@ expression: suite }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_not_equals.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_not_equals.snap index bf1180fe07224..ff6291fe1c88b 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_not_equals.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_not_equals.snap @@ -48,11 +48,15 @@ expression: suite }, ), ], + runtime_comparators: None, }, ), debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -65,6 +69,8 @@ expression: suite }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_not_nested_spec.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_not_nested_spec.snap index 32d1997a5ace0..b8eecfca360e3 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_not_nested_spec.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_not_nested_spec.snap @@ -46,6 +46,9 @@ expression: suite ], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -58,6 +61,8 @@ expression: suite }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_self_doc_prec_space.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_self_doc_prec_space.snap index 128940b1be93b..15b2b4222a062 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_self_doc_prec_space.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_self_doc_prec_space.snap @@ -38,6 +38,9 @@ expression: suite ), conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -50,6 +53,8 @@ expression: suite }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_self_doc_trailing_space.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_self_doc_trailing_space.snap index 704d367b6cc0e..b1591af5fd31d 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_self_doc_trailing_space.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_self_doc_trailing_space.snap @@ -38,6 +38,9 @@ expression: suite ), conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -50,6 +53,8 @@ expression: suite }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_yield_expr.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_yield_expr.snap index b16d33cefbb30..8196e9d5318ce 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_yield_expr.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_tstring_yield_expr.snap @@ -31,6 +31,9 @@ expression: suite debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -43,6 +46,8 @@ expression: suite }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_u_f_string_concat_1.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_u_f_string_concat_1.snap index ac951c2811091..a4c3363a0c4d1 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_u_f_string_concat_1.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_u_f_string_concat_1.snap @@ -51,6 +51,8 @@ expression: suite ], ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_u_f_string_concat_2.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_u_f_string_concat_2.snap index 21f69ed5ed3eb..6492750da0701 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_u_f_string_concat_2.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_u_f_string_concat_2.snap @@ -64,6 +64,8 @@ expression: suite ], ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__raw_fstring.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__raw_fstring.snap index eb8b1a3e6d878..0cbcdd9c3a93e 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__raw_fstring.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__raw_fstring.snap @@ -33,6 +33,9 @@ expression: suite debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -48,6 +51,8 @@ expression: suite ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__raw_tstring.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__raw_tstring.snap index b97792d742323..fedb90aea312a 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__raw_tstring.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__raw_tstring.snap @@ -32,6 +32,9 @@ expression: suite debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -46,6 +49,8 @@ expression: suite }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__triple_quoted_raw_fstring.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__triple_quoted_raw_fstring.snap index 8877e5956fd1d..98d881f05e5f6 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__triple_quoted_raw_fstring.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__triple_quoted_raw_fstring.snap @@ -33,6 +33,9 @@ expression: suite debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -48,6 +51,8 @@ expression: suite ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__triple_quoted_raw_tstring.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__triple_quoted_raw_tstring.snap index 4cf02baf483ed..07931097aac2c 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__triple_quoted_raw_tstring.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__triple_quoted_raw_tstring.snap @@ -32,6 +32,9 @@ expression: suite debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -46,6 +49,8 @@ expression: suite }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_constant_range.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_constant_range.snap index f8825a1412205..416126ca54ddc 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_constant_range.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_constant_range.snap @@ -39,6 +39,9 @@ expression: suite debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -63,6 +66,9 @@ expression: suite debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -82,6 +88,8 @@ expression: suite }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_escaped_character.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_escaped_character.snap index a10e0fc9967d2..665defa674aaf 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_escaped_character.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_escaped_character.snap @@ -39,6 +39,9 @@ expression: suite debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -51,6 +54,8 @@ expression: suite }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_escaped_newline.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_escaped_newline.snap index 071d5af2c4d5a..50db1e54f3859 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_escaped_newline.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_escaped_newline.snap @@ -39,6 +39,9 @@ expression: suite debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -51,6 +54,8 @@ expression: suite }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_line_continuation.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_line_continuation.snap index ae7da0c069f82..61e3bd112b37c 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_line_continuation.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_line_continuation.snap @@ -39,6 +39,9 @@ expression: suite debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -53,6 +56,8 @@ expression: suite }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_parse_self_documenting_base.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_parse_self_documenting_base.snap index 335cdf29d2734..8983d383432d6 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_parse_self_documenting_base.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_parse_self_documenting_base.snap @@ -38,6 +38,9 @@ expression: suite ), conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -50,6 +53,8 @@ expression: suite }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_parse_self_documenting_base_more.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_parse_self_documenting_base_more.snap index 4f8ad69bb6965..8c0dd4e135ce3 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_parse_self_documenting_base_more.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_parse_self_documenting_base_more.snap @@ -45,6 +45,9 @@ expression: suite ), conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -75,6 +78,9 @@ expression: suite ), conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -87,6 +93,8 @@ expression: suite }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_parse_self_documenting_format.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_parse_self_documenting_format.snap index 3c18324acdc8c..d906b82413d64 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_parse_self_documenting_format.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_parse_self_documenting_format.snap @@ -52,6 +52,9 @@ expression: suite ], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -64,6 +67,8 @@ expression: suite }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, diff --git a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_unescaped_newline.snap b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_unescaped_newline.snap index 2c5a1b47c4372..988c2f8ec66d1 100644 --- a/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_unescaped_newline.snap +++ b/crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__tstring_unescaped_newline.snap @@ -39,6 +39,9 @@ expression: suite debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -51,6 +54,8 @@ expression: suite }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_invalid_annotation.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_invalid_annotation.py.snap index 32da2cab8d10f..7e0bffaec4579 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_invalid_annotation.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_invalid_annotation.py.snap @@ -49,6 +49,7 @@ Module( ), ), simple: true, + runtime_simple: None, }, ), AnnAssign( @@ -91,6 +92,7 @@ Module( ), ), simple: true, + runtime_simple: None, }, ), AnnAssign( @@ -131,6 +133,7 @@ Module( ), ), simple: true, + runtime_simple: None, }, ), AnnAssign( @@ -155,6 +158,7 @@ Module( ), value: None, simple: true, + runtime_simple: None, }, ), Assign( @@ -180,9 +184,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_invalid_target.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_invalid_target.py.snap index 12e797e812168..31092c4e4d7a1 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_invalid_target.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_invalid_target.py.snap @@ -67,6 +67,7 @@ Module( ), ), simple: false, + runtime_simple: None, }, ), AnnAssign( @@ -90,6 +91,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -125,6 +128,7 @@ Module( ), ), simple: false, + runtime_simple: None, }, ), AnnAssign( @@ -181,10 +185,12 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ), simple: false, + runtime_simple: None, }, ), AnnAssign( @@ -207,6 +213,7 @@ Module( ], ctx: Store, parenthesized: false, + runtime_elts: None, }, ), annotation: Name( @@ -229,6 +236,7 @@ Module( ), ), simple: false, + runtime_simple: None, }, ), AnnAssign( @@ -259,6 +267,7 @@ Module( ], ctx: Store, parenthesized: false, + runtime_elts: None, }, ), annotation: Name( @@ -296,10 +305,12 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ), simple: false, + runtime_simple: None, }, ), AnnAssign( @@ -330,6 +341,7 @@ Module( ], ctx: Store, parenthesized: true, + runtime_elts: None, }, ), annotation: Name( @@ -367,10 +379,12 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ), simple: false, + runtime_simple: None, }, ), AnnAssign( @@ -392,6 +406,7 @@ Module( ), ], ctx: Store, + runtime_elts: None, }, ), annotation: Name( @@ -414,6 +429,7 @@ Module( ), ), simple: false, + runtime_simple: None, }, ), AnnAssign( @@ -443,6 +459,7 @@ Module( ), ], ctx: Store, + runtime_elts: None, }, ), annotation: Name( @@ -480,13 +497,16 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ), simple: false, + runtime_simple: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_invalid_value.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_invalid_value.py.snap index 2123f14a29a38..06460f9b667f6 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_invalid_value.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_invalid_value.py.snap @@ -58,6 +58,7 @@ Module( }, ), ], + runtime_values: None, }, ), ctx: Load, @@ -65,6 +66,7 @@ Module( ), ), simple: true, + runtime_simple: None, }, ), AnnAssign( @@ -98,6 +100,7 @@ Module( ), ), simple: true, + runtime_simple: None, }, ), Expr( @@ -206,6 +209,7 @@ Module( }, ), ], + runtime_values: None, }, ), ctx: Load, @@ -213,13 +217,16 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), ), simple: true, + runtime_simple: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_missing_rhs.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_missing_rhs.py.snap index db6d7e8c2d1c5..fe6cc24a22d5f 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_missing_rhs.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_missing_rhs.py.snap @@ -32,9 +32,11 @@ Module( ), value: None, simple: true, + runtime_simple: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_type_alias_annotation.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_type_alias_annotation.py.snap index 0b9892d0bff58..71d670e65a0e5 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_type_alias_annotation.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ann_assign_stmt_type_alias_annotation.py.snap @@ -32,6 +32,7 @@ Module( ), value: None, simple: true, + runtime_simple: None, }, ), Assign( @@ -56,6 +57,9 @@ Module( ctx: Load, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Expr( @@ -101,9 +105,13 @@ Module( ctx: Load, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@args_unparenthesized_generator.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@args_unparenthesized_generator.py.snap index 49270f2b3893e..02a77c22f577a 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@args_unparenthesized_generator.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@args_unparenthesized_generator.py.snap @@ -81,11 +81,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], parenthesized: false, @@ -102,6 +106,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -196,11 +202,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], parenthesized: false, @@ -217,6 +227,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -293,11 +305,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], parenthesized: false, @@ -305,12 +321,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assert_empty_msg.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assert_empty_msg.py.snap index 2b647a18873d3..4f6c6c2e3396e 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assert_empty_msg.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assert_empty_msg.py.snap @@ -26,6 +26,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assert_empty_test.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assert_empty_test.py.snap index 14a4dd1844f5a..c19f27da4ad1a 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assert_empty_test.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assert_empty_test.py.snap @@ -26,6 +26,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assert_invalid_msg_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assert_invalid_msg_expr.py.snap index b8edfb474b04f..97293b6d4d3a7 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assert_invalid_msg_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assert_invalid_msg_expr.py.snap @@ -139,6 +139,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assert_invalid_test_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assert_invalid_test_expr.py.snap index 23311b018ff27..d8b43159b8a0c 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assert_invalid_test_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assert_invalid_test_expr.py.snap @@ -115,6 +115,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_invalid_target.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_invalid_target.py.snap index 1b06e85b42d5b..7870b203c98ca 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_invalid_target.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_invalid_target.py.snap @@ -34,6 +34,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -68,6 +71,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -118,6 +124,9 @@ Module( ctx: Load, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -174,6 +183,7 @@ Module( ), ], ctx: Store, + runtime_elts: None, }, ), ], @@ -226,11 +236,16 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_invalid_value_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_invalid_value_expr.py.snap index 65b3b025729c7..9f235c545a65d 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_invalid_value_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_invalid_value_expr.py.snap @@ -56,6 +56,7 @@ Module( }, ), ], + runtime_values: None, }, ), ctx: Load, @@ -64,8 +65,12 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -122,8 +127,12 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -178,8 +187,12 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -227,6 +240,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -234,6 +249,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -252,8 +268,12 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -278,6 +298,9 @@ Module( ctx: Load, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Expr( @@ -296,6 +319,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_keyword_target.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_keyword_target.py.snap index e59c71cea880d..74e150b4b2b59 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_keyword_target.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_keyword_target.py.snap @@ -40,6 +40,9 @@ Module( ctx: Load, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Expr( @@ -109,6 +112,9 @@ Module( ctx: Load, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Expr( @@ -141,6 +147,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_missing_rhs.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_missing_rhs.py.snap index 8a1f0505336c5..1dfbced4fb626 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_missing_rhs.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_missing_rhs.py.snap @@ -32,6 +32,9 @@ Module( ctx: Invalid, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Expr( @@ -95,6 +98,9 @@ Module( ctx: Invalid, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Expr( @@ -158,6 +164,9 @@ Module( ctx: Load, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Expr( @@ -192,6 +201,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_starred_expr_value.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_starred_expr_value.py.snap index 186eb41f69fe4..648ca38efcb83 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_starred_expr_value.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@assign_stmt_starred_expr_value.py.snap @@ -44,11 +44,15 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), ctx: Load, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -84,11 +88,15 @@ Module( }, ), ], + runtime_elts: None, }, ), ctx: Load, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -126,12 +134,17 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ctx: Load, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -178,9 +191,13 @@ Module( ctx: Load, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@async_unexpected_token.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@async_unexpected_token.py.snap index dc62f1b4469c6..0510c312653d7 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@async_unexpected_token.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@async_unexpected_token.py.snap @@ -36,6 +36,8 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), While( @@ -65,6 +67,8 @@ Module( ), ], orelse: [], + runtime_body: None, + runtime_orelse: None, }, ), Assign( @@ -90,6 +94,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), FunctionDef( @@ -112,6 +119,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -128,6 +136,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), Match( @@ -169,11 +181,13 @@ Module( }, ), ], + runtime_body: None, }, ], }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@aug_assign_stmt_invalid_target.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@aug_assign_stmt_invalid_target.py.snap index 4fd519628a094..d84f95d27220e 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@aug_assign_stmt_invalid_target.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@aug_assign_stmt_invalid_target.py.snap @@ -199,6 +199,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@aug_assign_stmt_invalid_value.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@aug_assign_stmt_invalid_value.py.snap index 02e8bdd44765f..b2fefb390b9d7 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@aug_assign_stmt_invalid_value.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@aug_assign_stmt_invalid_value.py.snap @@ -50,6 +50,7 @@ Module( }, ), ], + runtime_values: None, }, ), ctx: Load, @@ -170,6 +171,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -177,6 +180,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -233,6 +237,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@aug_assign_stmt_missing_rhs.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@aug_assign_stmt_missing_rhs.py.snap index f367265ec79e8..5df76ca8fec13 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@aug_assign_stmt_missing_rhs.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@aug_assign_stmt_missing_rhs.py.snap @@ -119,6 +119,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@backslash_continuation_indentation_error.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@backslash_continuation_indentation_error.py.snap index d32ea7bf469d1..5bd5bb17aba6d 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@backslash_continuation_indentation_error.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@backslash_continuation_indentation_error.py.snap @@ -54,9 +54,11 @@ Module( ), ], elif_else_clauses: [], + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@case_expect_indented_block.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@case_expect_indented_block.py.snap index 5b757520e6503..1596207cb4787 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@case_expect_indented_block.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@case_expect_indented_block.py.snap @@ -43,6 +43,7 @@ Module( ), guard: None, body: [], + runtime_body: None, }, MatchCase { range: 31..42, @@ -77,11 +78,13 @@ Module( }, ), ], + runtime_body: None, }, ], }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@class_def_empty_body.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@class_def_empty_body.py.snap index 7a88362450c6c..cf5e90eb9a254 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@class_def_empty_body.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@class_def_empty_body.py.snap @@ -23,6 +23,8 @@ Module( type_params: None, arguments: None, body: [], + runtime_decorator_list: None, + runtime_body: None, }, ), ClassDef( @@ -42,9 +44,13 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, ), body: [], + runtime_decorator_list: None, + runtime_body: None, }, ), Assign( @@ -70,9 +76,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@class_def_missing_name.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@class_def_missing_name.py.snap index ffb66e8ee6a12..ff33234e31651 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@class_def_missing_name.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@class_def_missing_name.py.snap @@ -36,6 +36,8 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), ClassDef( @@ -55,6 +57,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, ), body: [ @@ -71,6 +75,8 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), ClassDef( @@ -110,6 +116,8 @@ Module( ), }, ], + runtime_args: None, + runtime_bases: None, }, ), body: [ @@ -126,9 +134,12 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@class_def_unclosed_type_param_list.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@class_def_unclosed_type_param_list.py.snap index 515534ed26c79..4dc456924ebd8 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@class_def_unclosed_type_param_list.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@class_def_unclosed_type_param_list.py.snap @@ -51,6 +51,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), arguments: Some( @@ -76,6 +77,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, ), body: [ @@ -86,6 +89,8 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), Assign( @@ -111,9 +116,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@class_def_unparenthesized_generator_argument.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@class_def_unparenthesized_generator_argument.py.snap index 6a5ebeb17cd60..5b2f3d6882144 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@class_def_unparenthesized_generator_argument.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@class_def_unparenthesized_generator_argument.py.snap @@ -60,6 +60,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], parenthesized: false, @@ -67,6 +69,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, ), body: [ @@ -83,9 +87,12 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@class_type_params_py311.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@class_type_params_py311.py.snap index b24904e9ac128..f6eade3000613 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@class_type_params_py311.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@class_type_params_py311.py.snap @@ -59,6 +59,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), ), @@ -112,6 +113,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), arguments: None, @@ -129,6 +131,8 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), ClassDef( @@ -146,6 +150,7 @@ Module( range: 105..107, node_index: NodeIndex(None), type_params: [], + runtime_type_params: None, }, ), arguments: None, @@ -163,9 +168,12 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@clause_expect_indented_block.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@clause_expect_indented_block.py.snap index e38fc337b0893..10161b4220a0f 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@clause_expect_indented_block.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@clause_expect_indented_block.py.snap @@ -23,6 +23,7 @@ Module( ), body: [], elif_else_clauses: [], + runtime_body: None, }, ), Pass( @@ -44,9 +45,11 @@ Module( ), body: [], elif_else_clauses: [], + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@clause_expect_single_statement.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@clause_expect_single_statement.py.snap index fbcd78eef2c24..c9934eb6ff119 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@clause_expect_single_statement.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@clause_expect_single_statement.py.snap @@ -23,6 +23,7 @@ Module( ), body: [], elif_else_clauses: [], + runtime_body: None, }, ), If( @@ -45,9 +46,11 @@ Module( ), ], elif_else_clauses: [], + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comma_separated_missing_comma.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comma_separated_missing_comma.py.snap index d5cb24b9ffb29..aeeb4d643fda0 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comma_separated_missing_comma.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comma_separated_missing_comma.py.snap @@ -55,12 +55,15 @@ Module( ), }, ], + runtime_args: None, + runtime_bases: None, }, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comma_separated_missing_comma_between_elements.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comma_separated_missing_comma_between_elements.py.snap index 69e493cafcbc2..8171e5fb5f0c1 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comma_separated_missing_comma_between_elements.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comma_separated_missing_comma_between_elements.py.snap @@ -48,11 +48,13 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comma_separated_missing_element_between_commas.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comma_separated_missing_element_between_commas.py.snap index 2c50e8d7c59f0..e7a6d1ee0a86a 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comma_separated_missing_element_between_commas.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comma_separated_missing_element_between_commas.py.snap @@ -48,11 +48,13 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comma_separated_missing_first_element.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comma_separated_missing_first_element.py.snap index 48bd834ed4e68..a3b6e67d189ef 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comma_separated_missing_first_element.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comma_separated_missing_first_element.py.snap @@ -41,12 +41,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comprehension_missing_for_after_async.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comprehension_missing_for_after_async.py.snap index dc0abcd271e83..d457077ad8cd4 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comprehension_missing_for_after_async.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@comprehension_missing_for_after_async.py.snap @@ -62,6 +62,8 @@ Module( ), ifs: [], is_async: true, + runtime_ifs: None, + runtime_is_async: None, }, ], parenthesized: true, @@ -70,6 +72,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_class.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_class.py.snap index b12ab21adc57d..a8fcb597e3823 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_class.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_class.py.snap @@ -36,6 +36,8 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), ClassDef( @@ -67,6 +69,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), arguments: None, @@ -84,9 +87,12 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_function.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_function.py.snap index 0b94a57f9d220..122f174d2950b 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_function.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_function.py.snap @@ -30,6 +30,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -46,6 +47,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -78,6 +83,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), parameters: Parameters { @@ -88,6 +94,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -104,6 +111,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -135,6 +146,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -142,6 +155,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -158,6 +172,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), Expr( @@ -186,6 +204,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -193,6 +213,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: NumberLiteral( @@ -209,6 +230,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_import.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_import.py.snap index 870b0b879363a..32084a1744213 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_import.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_import.py.snap @@ -79,6 +79,7 @@ Module( ], level: 0, is_lazy: false, + runtime_level: None, }, ), ImportFrom( @@ -112,9 +113,11 @@ Module( ], level: 0, is_lazy: false, + runtime_level: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_match.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_match.py.snap index 6d47e009d455e..a1051a5fef3c6 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_match.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_match.py.snap @@ -55,11 +55,13 @@ Module( }, ), ], + runtime_body: None, }, ], }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_try.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_try.py.snap index 827e2c62acb92..6851dccea0eff 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_try.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_try.py.snap @@ -64,15 +64,21 @@ Module( }, ), ], + runtime_body: None, }, ), ], orelse: [], finalbody: [], is_star: false, + runtime_body: None, + runtime_handlers: None, + runtime_orelse: None, + runtime_finalbody: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_type_alias.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_type_alias.py.snap index e0d4739946ad5..f6f32478b9ed5 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_type_alias.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_type_alias.py.snap @@ -79,6 +79,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -92,6 +93,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_with.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_with.py.snap index c0e68ac262e1d..97b6883594313 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_with.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@debug_shadow_with.py.snap @@ -58,6 +58,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -87,9 +89,13 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_await_expression_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_await_expression_py38.py.snap index 7ca2868d31107..74504f1d8b22b 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_await_expression_py38.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_await_expression_py38.py.snap @@ -30,6 +30,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -72,6 +73,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -88,12 +90,21 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_dict_literal_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_dict_literal_py38.py.snap index 0dd32e14c7e49..a9ef37e493b63 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_dict_literal_py38.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_dict_literal_py38.py.snap @@ -47,6 +47,7 @@ Module( ), }, ], + runtime_values: None, }, ), }, @@ -65,6 +66,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -81,9 +83,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_expression_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_expression_py38.py.snap index b277f5a73af3f..e76d1393a9b58 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_expression_py38.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_expression_py38.py.snap @@ -83,6 +83,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -99,9 +100,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_float_literal_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_float_literal_py38.py.snap index fe245de447767..d58e143d03a04 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_float_literal_py38.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_float_literal_py38.py.snap @@ -44,6 +44,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -60,9 +61,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_invalid_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_invalid_expression.py.snap index b43a2254b9197..e1ba4a8db2407 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_invalid_expression.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_invalid_expression.py.snap @@ -126,6 +126,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -142,9 +143,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_missing_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_missing_expression.py.snap index dca904baa9149..61580d9ae4f7e 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_missing_expression.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_missing_expression.py.snap @@ -43,6 +43,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -59,6 +60,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -94,6 +99,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -110,6 +116,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -160,6 +170,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -176,6 +187,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ClassDef( @@ -216,9 +231,12 @@ Module( type_params: None, arguments: None, body: [], + runtime_decorator_list: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_missing_newline.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_missing_newline.py.snap index 30cf842b3c50f..5d38b5aa91d77 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_missing_newline.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_missing_newline.py.snap @@ -43,6 +43,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -59,6 +60,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -94,6 +99,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -110,6 +116,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ClassDef( @@ -151,9 +161,12 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_named_expression_py37.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_named_expression_py37.py.snap index b852c0911595e..978e905a0feeb 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_named_expression_py37.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_named_expression_py37.py.snap @@ -57,6 +57,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -64,6 +66,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -92,6 +95,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -111,6 +116,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -127,9 +133,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_non_toplevel_call_expression_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_non_toplevel_call_expression_py38.py.snap index 2429e4f3fd19e..2facf25cdd585 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_non_toplevel_call_expression_py38.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_non_toplevel_call_expression_py38.py.snap @@ -44,6 +44,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -60,6 +62,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -79,6 +83,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -95,9 +100,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_unexpected_token.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_unexpected_token.py.snap index be98f7c3ada66..4ad6b22b50c68 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_unexpected_token.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@decorator_unexpected_token.py.snap @@ -43,9 +43,14 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -82,6 +87,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -117,9 +125,14 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), Assign( @@ -145,9 +158,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@del_debug_py39.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@del_debug_py39.py.snap index dbb86fe82298f..5260297d16e74 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@del_debug_py39.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@del_debug_py39.py.snap @@ -24,9 +24,11 @@ Module( }, ), ], + runtime_targets: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@del_incomplete_target.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@del_incomplete_target.py.snap index e8a391037c30b..c0b2b380aa555 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@del_incomplete_target.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@del_incomplete_target.py.snap @@ -44,6 +44,7 @@ Module( }, ), ], + runtime_targets: None, }, ), Expr( @@ -116,9 +117,11 @@ Module( }, ), ], + runtime_targets: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@del_stmt_empty.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@del_stmt_empty.py.snap index 28619bfea2588..cc7e8d9b49945 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@del_stmt_empty.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@del_stmt_empty.py.snap @@ -15,9 +15,11 @@ Module( node_index: NodeIndex(None), range: 0..3, targets: [], + runtime_targets: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@different_match_pattern_bindings.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@different_match_pattern_bindings.py.snap index 9f689a303d11f..0fd6a5d410fa4 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@different_match_pattern_bindings.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@different_match_pattern_bindings.py.snap @@ -51,6 +51,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), MatchSequence( @@ -73,9 +74,11 @@ Module( }, ), ], + runtime_patterns: None, }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -93,6 +96,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 37..55, @@ -122,6 +126,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), MatchSequence( @@ -129,9 +134,11 @@ Module( node_index: NodeIndex(None), range: 48..50, patterns: [], + runtime_patterns: None, }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -149,6 +156,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 60..83, @@ -192,6 +200,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), MatchSequence( @@ -214,9 +223,11 @@ Module( }, ), ], + runtime_patterns: None, }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -234,6 +245,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 88..113, @@ -271,6 +283,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), MatchSequence( @@ -307,9 +320,11 @@ Module( }, ), ], + runtime_patterns: None, }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -327,6 +342,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 118..140, @@ -384,9 +400,11 @@ Module( }, ), ], + runtime_patterns: None, }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -404,6 +422,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 145..170, @@ -433,6 +452,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), MatchSequence( @@ -455,6 +475,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), MatchSequence( @@ -477,9 +498,11 @@ Module( }, ), ], + runtime_patterns: None, }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -497,6 +520,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 175..193, @@ -511,6 +535,7 @@ Module( node_index: NodeIndex(None), range: 180..182, patterns: [], + runtime_patterns: None, }, ), MatchSequence( @@ -533,9 +558,11 @@ Module( }, ), ], + runtime_patterns: None, }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -553,6 +580,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 198..220, @@ -582,6 +610,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), MatchSequence( @@ -622,12 +651,17 @@ Module( ], keywords: [], }, + runtime_patterns: None, + runtime_kwd_attrs: None, + runtime_kwd_patterns: None, }, ), ], + runtime_patterns: None, }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -645,6 +679,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 225..246, @@ -679,6 +714,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), MatchSequence( @@ -701,12 +737,15 @@ Module( }, ), ], + runtime_patterns: None, }, ), ], + runtime_patterns: None, }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -724,6 +763,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 251..276, @@ -771,9 +811,13 @@ Module( ], keywords: [], }, + runtime_patterns: None, + runtime_kwd_attrs: None, + runtime_kwd_patterns: None, }, ), ], + runtime_patterns: None, }, ), MatchSequence( @@ -814,12 +858,17 @@ Module( ], keywords: [], }, + runtime_patterns: None, + runtime_kwd_attrs: None, + runtime_kwd_patterns: None, }, ), ], + runtime_patterns: None, }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -837,6 +886,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 281..312, @@ -900,14 +950,21 @@ Module( ], keywords: [], }, + runtime_patterns: None, + runtime_kwd_attrs: None, + runtime_kwd_patterns: None, }, ), ], keywords: [], }, + runtime_patterns: None, + runtime_kwd_attrs: None, + runtime_kwd_patterns: None, }, ), ], + runtime_patterns: None, }, ), MatchSequence( @@ -964,17 +1021,25 @@ Module( ], keywords: [], }, + runtime_patterns: None, + runtime_kwd_attrs: None, + runtime_kwd_patterns: None, }, ), ], keywords: [], }, + runtime_patterns: None, + runtime_kwd_attrs: None, + runtime_kwd_patterns: None, }, ), ], + runtime_patterns: None, }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -992,6 +1057,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 317..346, @@ -1040,9 +1106,11 @@ Module( }, ), ], + runtime_patterns: None, }, ), ], + runtime_patterns: None, }, ), MatchSequence( @@ -1084,12 +1152,15 @@ Module( }, ), ], + runtime_patterns: None, }, ), ], + runtime_patterns: None, }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -1107,11 +1178,13 @@ Module( }, ), ], + runtime_body: None, }, ], }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@dotted_name_multiple_dots.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@dotted_name_multiple_dots.py.snap index ebad60ec0ace0..fec5589f5aa9a 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@dotted_name_multiple_dots.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@dotted_name_multiple_dots.py.snap @@ -75,6 +75,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@duplicate_keyword_args.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@duplicate_keyword_args.py.snap index b43bfde962ae2..7ba0dbb4b9f4a 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@duplicate_keyword_args.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@duplicate_keyword_args.py.snap @@ -39,6 +39,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -46,6 +48,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -62,6 +65,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), Expr( @@ -126,6 +133,8 @@ Module( ), }, ], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -160,6 +169,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -175,6 +186,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -190,6 +203,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -197,6 +212,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -213,6 +229,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), Expr( @@ -306,12 +326,15 @@ Module( ), }, ], + runtime_args: None, + runtime_bases: None, }, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@duplicate_match_class_attr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@duplicate_match_class_attr.py.snap index 94f9ad317cc20..cb15319d42d7d 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@duplicate_match_class_attr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@duplicate_match_class_attr.py.snap @@ -93,6 +93,9 @@ Module( }, ], }, + runtime_patterns: None, + runtime_kwd_attrs: None, + runtime_kwd_patterns: None, }, ), guard: None, @@ -110,6 +113,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 43..70, @@ -186,9 +190,13 @@ Module( }, ], }, + runtime_patterns: None, + runtime_kwd_attrs: None, + runtime_kwd_patterns: None, }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -206,6 +214,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 75..113, @@ -340,10 +349,15 @@ Module( }, ], }, + runtime_patterns: None, + runtime_kwd_attrs: None, + runtime_kwd_patterns: None, }, ), ], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), guard: None, @@ -361,6 +375,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 118..162, @@ -377,6 +392,8 @@ Module( keys: [], patterns: [], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), MatchMapping( @@ -509,13 +526,19 @@ Module( }, ], }, + runtime_patterns: None, + runtime_kwd_attrs: None, + runtime_kwd_patterns: None, }, ), ], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -533,6 +556,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 167..230, @@ -667,6 +691,8 @@ Module( ), ], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), }, @@ -745,11 +771,17 @@ Module( }, ], }, + runtime_patterns: None, + runtime_kwd_attrs: None, + runtime_kwd_patterns: None, }, ), }, ], }, + runtime_patterns: None, + runtime_kwd_attrs: None, + runtime_kwd_patterns: None, }, ), guard: None, @@ -767,11 +799,13 @@ Module( }, ), ], + runtime_body: None, }, ], }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@duplicate_match_key.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@duplicate_match_key.py.snap index e1eca42184f6c..0dd10252fa968 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@duplicate_match_key.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@duplicate_match_key.py.snap @@ -107,6 +107,8 @@ Module( ), ], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), guard: None, @@ -124,6 +126,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 44..72, @@ -213,6 +216,8 @@ Module( ), ], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), guard: None, @@ -230,6 +235,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 77..99, @@ -291,6 +297,8 @@ Module( ), ], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), guard: None, @@ -308,6 +316,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 104..130, @@ -369,6 +378,8 @@ Module( ), ], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), guard: None, @@ -386,6 +397,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 135..171, @@ -481,6 +493,8 @@ Module( ), ], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), guard: None, @@ -498,6 +512,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 176..204, @@ -555,6 +570,8 @@ Module( ), ], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), guard: None, @@ -572,6 +589,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 209..237, @@ -627,6 +645,8 @@ Module( ), ], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), guard: None, @@ -644,6 +664,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 242..268, @@ -703,6 +724,8 @@ Module( ), ], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), guard: None, @@ -720,6 +743,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 273..300, @@ -779,6 +803,8 @@ Module( ), ], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), guard: None, @@ -796,6 +822,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 305..332, @@ -862,6 +889,8 @@ Module( ), ], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), guard: None, @@ -879,6 +908,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 337..367, @@ -955,6 +985,8 @@ Module( ), ], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), guard: None, @@ -972,6 +1004,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 372..449, @@ -1057,6 +1090,8 @@ Module( ), ], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), guard: None, @@ -1074,6 +1109,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 454..488, @@ -1195,6 +1231,8 @@ Module( ), ], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), guard: None, @@ -1212,6 +1250,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 493..531, @@ -1345,6 +1384,8 @@ Module( ), ], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), guard: None, @@ -1362,6 +1403,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 536..564, @@ -1452,9 +1494,12 @@ Module( ), ], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -1472,6 +1517,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 569..607, @@ -1606,11 +1652,16 @@ Module( ), ], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), }, ], }, + runtime_patterns: None, + runtime_kwd_attrs: None, + runtime_kwd_patterns: None, }, ), guard: None, @@ -1628,6 +1679,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 612..662, @@ -1680,6 +1732,9 @@ Module( }, ], }, + runtime_patterns: None, + runtime_kwd_attrs: None, + runtime_kwd_patterns: None, }, ), MatchClass( @@ -1812,14 +1867,20 @@ Module( ), ], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), }, ], }, + runtime_patterns: None, + runtime_kwd_attrs: None, + runtime_kwd_patterns: None, }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -1837,6 +1898,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 667..691, @@ -1898,6 +1960,8 @@ Module( ), ], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), guard: None, @@ -1915,6 +1979,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 696..753, @@ -1993,6 +2058,8 @@ Module( ), ], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), guard: None, @@ -2010,11 +2077,13 @@ Module( }, ), ], + runtime_body: None, }, ], }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@duplicate_type_parameter_names.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@duplicate_type_parameter_names.py.snap index ffbe7baa874fc..04674a7ad4e7e 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@duplicate_type_parameter_names.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@duplicate_type_parameter_names.py.snap @@ -54,6 +54,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: EllipsisLiteral( @@ -107,6 +108,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), parameters: Parameters { @@ -135,6 +137,8 @@ Module( }, ), ), + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -142,6 +146,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -158,6 +163,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ClassDef( @@ -202,6 +211,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), arguments: None, @@ -219,6 +229,8 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), TypeAlias( @@ -307,6 +319,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), ), @@ -360,6 +373,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: EllipsisLiteral( @@ -426,6 +440,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), parameters: Parameters { @@ -436,6 +451,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -452,6 +468,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -496,6 +516,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), parameters: Parameters { @@ -506,6 +527,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -522,6 +544,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -566,6 +592,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), parameters: Parameters { @@ -576,6 +603,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -592,9 +620,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_star_py310.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_star_py310.py.snap index 56a1931678e7d..f3d98a565eefb 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_star_py310.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_star_py310.py.snap @@ -58,6 +58,7 @@ Module( }, ), ], + runtime_body: None, }, ), ExceptHandler( @@ -89,6 +90,7 @@ Module( }, ), ], + runtime_body: None, }, ), ExceptHandler( @@ -120,15 +122,21 @@ Module( }, ), ], + runtime_body: None, }, ), ], orelse: [], finalbody: [], is_star: true, + runtime_body: None, + runtime_handlers: None, + runtime_orelse: None, + runtime_finalbody: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_invalid_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_invalid_expression.py.snap index 475b5a7e2caed..a6bfe57bb47ee 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_invalid_expression.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_invalid_expression.py.snap @@ -54,12 +54,17 @@ Module( }, ), ], + runtime_body: None, }, ), ], orelse: [], finalbody: [], is_star: false, + runtime_body: None, + runtime_handlers: None, + runtime_orelse: None, + runtime_finalbody: None, }, ), Try( @@ -105,15 +110,21 @@ Module( }, ), ], + runtime_body: None, }, ), ], orelse: [], finalbody: [], is_star: true, + runtime_body: None, + runtime_handlers: None, + runtime_orelse: None, + runtime_finalbody: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_missing_as_name.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_missing_as_name.py.snap index bdc389bfcd5e4..8b7ce868b76f2 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_missing_as_name.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_missing_as_name.py.snap @@ -46,6 +46,7 @@ Module( }, ), ], + runtime_body: None, }, ), ExceptHandler( @@ -71,15 +72,21 @@ Module( }, ), ], + runtime_body: None, }, ), ], orelse: [], finalbody: [], is_star: false, + runtime_body: None, + runtime_handlers: None, + runtime_orelse: None, + runtime_finalbody: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_missing_exception.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_missing_exception.py.snap index e3f602dd2463e..21f7b322ed3bb 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_missing_exception.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_missing_exception.py.snap @@ -43,12 +43,17 @@ Module( }, ), ], + runtime_body: None, }, ), ], orelse: [], finalbody: [], is_star: false, + runtime_body: None, + runtime_handlers: None, + runtime_orelse: None, + runtime_finalbody: None, }, ), Try( @@ -78,6 +83,7 @@ Module( }, ), ], + runtime_body: None, }, ), ExceptHandler( @@ -94,6 +100,7 @@ Module( }, ), ], + runtime_body: None, }, ), ExceptHandler( @@ -116,15 +123,21 @@ Module( }, ), ], + runtime_body: None, }, ), ], orelse: [], finalbody: [], is_star: true, + runtime_body: None, + runtime_handlers: None, + runtime_orelse: None, + runtime_finalbody: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_missing_exception_and_as_name.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_missing_exception_and_as_name.py.snap index fe8b15dd88aea..2d54c4846f236 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_missing_exception_and_as_name.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_missing_exception_and_as_name.py.snap @@ -37,15 +37,21 @@ Module( }, ), ], + runtime_body: None, }, ), ], orelse: [], finalbody: [], is_star: false, + runtime_body: None, + runtime_handlers: None, + runtime_orelse: None, + runtime_finalbody: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_unparenthesized_tuple_as.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_unparenthesized_tuple_as.py.snap index 153f50e02ed8e..1d284e28ec6ff 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_unparenthesized_tuple_as.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_unparenthesized_tuple_as.py.snap @@ -52,6 +52,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ), @@ -70,12 +71,17 @@ Module( }, ), ], + runtime_body: None, }, ), ], orelse: [], finalbody: [], is_star: false, + runtime_body: None, + runtime_handlers: None, + runtime_orelse: None, + runtime_finalbody: None, }, ), Try( @@ -120,6 +126,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ), @@ -138,15 +145,21 @@ Module( }, ), ], + runtime_body: None, }, ), ], orelse: [], finalbody: [], is_star: true, + runtime_body: None, + runtime_handlers: None, + runtime_orelse: None, + runtime_finalbody: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_unparenthesized_tuple_no_as_py313.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_unparenthesized_tuple_no_as_py313.py.snap index 671eed373c07d..27b43a43eb2ff 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_unparenthesized_tuple_no_as_py313.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@except_stmt_unparenthesized_tuple_no_as_py313.py.snap @@ -52,6 +52,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ), @@ -64,12 +65,17 @@ Module( }, ), ], + runtime_body: None, }, ), ], orelse: [], finalbody: [], is_star: false, + runtime_body: None, + runtime_handlers: None, + runtime_orelse: None, + runtime_finalbody: None, }, ), Try( @@ -114,6 +120,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ), @@ -126,15 +133,21 @@ Module( }, ), ], + runtime_body: None, }, ), ], orelse: [], finalbody: [], is_star: true, + runtime_body: None, + runtime_handlers: None, + runtime_orelse: None, + runtime_finalbody: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__double_starred.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__double_starred.py.snap index 58d3cd2c1c9d4..d6cfc32f6184b 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__double_starred.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__double_starred.py.snap @@ -53,6 +53,8 @@ Module( ), }, ], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -100,6 +102,8 @@ Module( ), }, ], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -147,6 +151,8 @@ Module( ), }, ], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -197,12 +203,15 @@ Module( ), }, ], + runtime_args: None, + runtime_bases: None, }, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__duplicate_keyword_arguments.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__duplicate_keyword_arguments.py.snap index 182ca169e029c..6b4ec1ea9c514 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__duplicate_keyword_arguments.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__duplicate_keyword_arguments.py.snap @@ -132,12 +132,15 @@ Module( ), }, ], + runtime_args: None, + runtime_bases: None, }, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__invalid_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__invalid_expression.py.snap index b444c4d79d791..dac3238ebb766 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__invalid_expression.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__invalid_expression.py.snap @@ -52,6 +52,8 @@ Module( ), }, ], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -99,6 +101,8 @@ Module( ), }, ], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -142,6 +146,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -183,12 +189,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__invalid_keyword_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__invalid_keyword_expression.py.snap index 551521976d0d8..28f4690d34518 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__invalid_keyword_expression.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__invalid_keyword_expression.py.snap @@ -59,6 +59,8 @@ Module( ), }, ], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -111,6 +113,8 @@ Module( ), }, ], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -164,6 +168,8 @@ Module( ), }, ], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -217,12 +223,15 @@ Module( ), }, ], + runtime_args: None, + runtime_bases: None, }, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__invalid_order.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__invalid_order.py.snap index 9ccc48a63065e..a669334924f7f 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__invalid_order.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__invalid_order.py.snap @@ -54,6 +54,8 @@ Module( ), }, ], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -110,6 +112,8 @@ Module( ), }, ], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -179,6 +183,8 @@ Module( ), }, ], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -235,6 +241,8 @@ Module( ), }, ], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -291,12 +299,15 @@ Module( ), }, ], + runtime_args: None, + runtime_bases: None, }, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__missing_argument.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__missing_argument.py.snap index 9525b67f768d1..633e02742087b 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__missing_argument.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__missing_argument.py.snap @@ -48,12 +48,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__missing_comma.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__missing_comma.py.snap index 33b40228411b7..95dccf5224f9f 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__missing_comma.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__missing_comma.py.snap @@ -48,12 +48,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__missing_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__missing_expression.py.snap index 83e062828f786..e7f64870ed7d9 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__missing_expression.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__missing_expression.py.snap @@ -41,6 +41,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -87,6 +89,8 @@ Module( ), }, ], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -137,6 +141,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -157,6 +163,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__starred.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__starred.py.snap index f74d95974caf9..81b1487c68f2e 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__starred.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__starred.py.snap @@ -71,6 +71,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], parenthesized: false, @@ -78,6 +80,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -128,6 +132,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -176,12 +182,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__unclosed_0.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__unclosed_0.py.snap index cc6fba138b768..6ae17dd5ae542 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__unclosed_0.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__unclosed_0.py.snap @@ -31,6 +31,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -56,6 +58,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -66,9 +69,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__unclosed_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__unclosed_1.py.snap index cdb11a8ebcddd..7e6c53e1fe1ff 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__unclosed_1.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__unclosed_1.py.snap @@ -40,6 +40,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -65,6 +67,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -75,9 +78,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__unclosed_2.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__unclosed_2.py.snap index e28cecdd9f058..356e2a3f16223 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__unclosed_2.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__arguments__unclosed_2.py.snap @@ -40,6 +40,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -65,6 +67,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -75,9 +78,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__attribute__invalid_member.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__attribute__invalid_member.py.snap index 40b4cb4fe1776..3355b7300f772 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__attribute__invalid_member.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__attribute__invalid_member.py.snap @@ -126,6 +126,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__attribute__multiple_dots.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__attribute__multiple_dots.py.snap index ee5946cf597b1..74451a7731c44 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__attribute__multiple_dots.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__attribute__multiple_dots.py.snap @@ -137,6 +137,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__attribute__no_member.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__attribute__no_member.py.snap index f23c09e43450b..6c28085cdb812 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__attribute__no_member.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__attribute__no_member.py.snap @@ -77,6 +77,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__await__no_expression_0.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__await__no_expression_0.py.snap index f9683c9fe628d..c7a05ce70a601 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__await__no_expression_0.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__await__no_expression_0.py.snap @@ -60,6 +60,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__await__no_expression_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__await__no_expression_1.py.snap index 10da259bcc75b..7ff63f861dd3f 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__await__no_expression_1.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__await__no_expression_1.py.snap @@ -50,6 +50,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -60,9 +61,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__await__recover.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__await__recover.py.snap index e3f5cb4807966..739751c4288f1 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__await__recover.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__await__recover.py.snap @@ -148,6 +148,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -155,6 +157,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -280,6 +283,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__invalid_rhs_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__invalid_rhs_expression.py.snap index 2d828a4ea5917..637ceb217ea14 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__invalid_rhs_expression.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__invalid_rhs_expression.py.snap @@ -49,6 +49,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -56,6 +58,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -110,6 +113,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__missing_lhs.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__missing_lhs.py.snap index 1ba50a5e827f1..9840e01b6096d 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__missing_lhs.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__missing_lhs.py.snap @@ -56,6 +56,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__missing_rhs_0.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__missing_rhs_0.py.snap index baf12f2136939..036b4e805d4b4 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__missing_rhs_0.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__missing_rhs_0.py.snap @@ -72,6 +72,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__missing_rhs_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__missing_rhs_1.py.snap index 1b39f2bac0dba..599a62211545a 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__missing_rhs_1.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__missing_rhs_1.py.snap @@ -104,6 +104,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__multiple_ops.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__multiple_ops.py.snap index cf81983e851c7..a335ad0bf8a27 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__multiple_ops.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__multiple_ops.py.snap @@ -145,6 +145,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__named_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__named_expression.py.snap index 47e26dcc60e23..06988f7f14aaa 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__named_expression.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__named_expression.py.snap @@ -69,6 +69,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), }, @@ -118,6 +119,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__starred_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__starred_expression.py.snap index 2e97b80a96d49..27d711fd5585d 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__starred_expression.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bin_op__starred_expression.py.snap @@ -83,6 +83,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__invalid_rhs_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__invalid_rhs_expression.py.snap index 151ded376121c..91f94d09f2607 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__invalid_rhs_expression.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__invalid_rhs_expression.py.snap @@ -50,6 +50,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -57,6 +59,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -70,6 +73,7 @@ Module( }, ), ], + runtime_values: None, }, ), }, @@ -109,11 +113,13 @@ Module( }, ), ], + runtime_values: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__missing_lhs.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__missing_lhs.py.snap index 1a9fd282135fc..56091fe1c53b3 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__missing_lhs.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__missing_lhs.py.snap @@ -25,6 +25,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__missing_rhs.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__missing_rhs.py.snap index d40859437fe92..20ee8ce3f0380 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__missing_rhs.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__missing_rhs.py.snap @@ -37,6 +37,7 @@ Module( }, ), ], + runtime_values: None, }, ), }, @@ -73,6 +74,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__named_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__named_expression.py.snap index 4b0e330e7f1eb..f3a6c5100d04f 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__named_expression.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__named_expression.py.snap @@ -37,6 +37,7 @@ Module( }, ), ], + runtime_values: None, }, ), }, @@ -82,6 +83,7 @@ Module( }, ), ], + runtime_values: None, }, ), }, @@ -101,6 +103,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__starred_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__starred_expression.py.snap index c9ef42bbbdcf1..569714154c834 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__starred_expression.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__bool_op__starred_expression.py.snap @@ -44,6 +44,7 @@ Module( }, ), ], + runtime_values: None, }, ), }, @@ -82,11 +83,13 @@ Module( }, ), ], + runtime_values: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__invalid_order.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__invalid_order.py.snap index ff77fb79c97aa..deab3e15cd9d0 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__invalid_order.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__invalid_order.py.snap @@ -46,6 +46,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), }, @@ -89,8 +90,12 @@ Module( }, ), ], + runtime_comparators: None, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Expr( @@ -143,6 +148,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__invalid_rhs_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__invalid_rhs_expression.py.snap index 49de0166982da..d24a5261b5a54 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__invalid_rhs_expression.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__invalid_rhs_expression.py.snap @@ -52,6 +52,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -59,6 +61,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -72,6 +75,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), }, @@ -113,11 +117,13 @@ Module( }, ), ], + runtime_comparators: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__missing_lhs.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__missing_lhs.py.snap index 4ca152d200eef..f58a622b75ba8 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__missing_lhs.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__missing_lhs.py.snap @@ -56,6 +56,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__missing_rhs_0.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__missing_rhs_0.py.snap index b40badc953b11..d5666fd9b14ec 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__missing_rhs_0.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__missing_rhs_0.py.snap @@ -39,6 +39,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), }, @@ -75,6 +76,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__missing_rhs_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__missing_rhs_1.py.snap index d51319b5b9d2a..81f95ea93424e 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__missing_rhs_1.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__missing_rhs_1.py.snap @@ -77,6 +77,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__missing_rhs_2.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__missing_rhs_2.py.snap index a9019dc09ea8c..8e9ce757dd7dd 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__missing_rhs_2.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__missing_rhs_2.py.snap @@ -39,6 +39,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), }, @@ -75,6 +76,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__multiple_equals.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__multiple_equals.py.snap index 170fba27dcc85..f4b6d7946c444 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__multiple_equals.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__multiple_equals.py.snap @@ -40,6 +40,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), ], @@ -51,6 +52,9 @@ Module( ctx: Load, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -83,6 +87,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), ], @@ -94,9 +99,13 @@ Module( ctx: Load, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__named_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__named_expression.py.snap index bbdd158554021..493a30e67ba83 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__named_expression.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__named_expression.py.snap @@ -39,6 +39,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), }, @@ -73,6 +74,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), }, @@ -106,6 +108,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), }, @@ -126,6 +129,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__starred_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__starred_expression.py.snap index 4b546bf98cbfc..d5d77790cbb3b 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__starred_expression.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__compare__starred_expression.py.snap @@ -46,6 +46,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), }, @@ -86,6 +87,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), }, @@ -123,6 +125,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), ctx: Load, @@ -163,6 +166,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), ctx: Load, @@ -171,6 +175,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__comprehension.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__comprehension.py.snap index 2bec92c3f3bf1..8552da90cc272 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__comprehension.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__comprehension.py.snap @@ -59,6 +59,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -126,6 +128,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -179,6 +183,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -192,6 +198,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -250,6 +258,7 @@ Module( }, ), ], + runtime_elts: None, }, ), iter: Name( @@ -262,6 +271,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -323,6 +334,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -385,6 +398,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -445,6 +460,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -511,6 +528,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -518,6 +537,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -532,6 +552,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -602,6 +624,8 @@ Module( ), ], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -673,6 +697,8 @@ Module( ), ], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -742,6 +768,8 @@ Module( ), ], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -817,6 +845,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -824,6 +854,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -838,6 +869,8 @@ Module( ), ], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -845,6 +878,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__double_star.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__double_star.py.snap index 0be18e9338e61..e25312945444b 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__double_star.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__double_star.py.snap @@ -52,6 +52,7 @@ Module( ), }, ], + runtime_values: None, }, ), }, @@ -119,6 +120,7 @@ Module( ), }, ], + runtime_values: None, }, ), }, @@ -156,6 +158,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -163,6 +167,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -198,6 +203,7 @@ Module( ), }, ], + runtime_values: None, }, ), }, @@ -257,10 +263,12 @@ Module( }, ), ], + runtime_values: None, }, ), }, ], + runtime_values: None, }, ), }, @@ -299,6 +307,7 @@ Module( }, ), ], + runtime_values: None, }, ), }, @@ -324,6 +333,7 @@ Module( ), }, ], + runtime_values: None, }, ), }, @@ -398,6 +408,7 @@ Module( ), }, ], + runtime_values: None, }, ), }, @@ -438,10 +449,12 @@ Module( }, ), ], + runtime_comparators: None, }, ), }, ], + runtime_values: None, }, ), }, @@ -482,10 +495,12 @@ Module( }, ), ], + runtime_comparators: None, }, ), }, ], + runtime_values: None, }, ), }, @@ -526,15 +541,18 @@ Module( }, ), ], + runtime_comparators: None, }, ), }, ], + runtime_values: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__double_star_comprehension.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__double_star_comprehension.py.snap index 0bed84d934731..00fb1cccf5ede 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__double_star_comprehension.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__double_star_comprehension.py.snap @@ -64,6 +64,7 @@ Module( ], ctx: Store, parenthesized: false, + runtime_elts: None, }, ), iter: Name( @@ -76,6 +77,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -83,6 +86,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__missing_closing_brace_0.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__missing_closing_brace_0.py.snap index a72d48175c0ec..7402b19770158 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__missing_closing_brace_0.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__missing_closing_brace_0.py.snap @@ -58,6 +58,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -72,11 +74,13 @@ Module( ), }, ], + runtime_values: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__missing_closing_brace_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__missing_closing_brace_1.py.snap index 3fda1e1433bc8..8f3e3fa390f4e 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__missing_closing_brace_1.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__missing_closing_brace_1.py.snap @@ -57,11 +57,13 @@ Module( ), }, ], + runtime_values: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__missing_closing_brace_2.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__missing_closing_brace_2.py.snap index a54264becd34b..7db2a6203d51e 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__missing_closing_brace_2.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__missing_closing_brace_2.py.snap @@ -41,6 +41,7 @@ Module( ), }, ], + runtime_values: None, }, ), }, @@ -65,6 +66,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -75,9 +77,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__named_expression_0.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__named_expression_0.py.snap index 824f3261f754d..bbae05b830d89 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__named_expression_0.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__named_expression_0.py.snap @@ -96,6 +96,7 @@ Module( ), }, ], + runtime_values: None, }, ), }, @@ -130,6 +131,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__named_expression_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__named_expression_1.py.snap index ccf8ead1b9b91..b30ab101a6126 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__named_expression_1.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__named_expression_1.py.snap @@ -102,6 +102,7 @@ Module( ), }, ], + runtime_values: None, }, ), }, @@ -136,6 +137,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__recover.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__recover.py.snap index c26c1b247d592..09d87681a1ba6 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__recover.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__dict__recover.py.snap @@ -28,6 +28,7 @@ Module( }, ), ], + runtime_elts: None, }, ), }, @@ -86,6 +87,7 @@ Module( ), }, ], + runtime_values: None, }, ), }, @@ -122,6 +124,7 @@ Module( ), }, ], + runtime_values: None, }, ), }, @@ -180,6 +183,7 @@ Module( ), }, ], + runtime_values: None, }, ), }, @@ -215,6 +219,7 @@ Module( ), }, ], + runtime_values: None, }, ), }, @@ -240,6 +245,7 @@ Module( ), }, ], + runtime_values: None, }, ), }, @@ -305,6 +311,7 @@ Module( ), }, ], + runtime_values: None, }, ), }, @@ -393,6 +400,7 @@ Module( ), }, ], + runtime_values: None, }, ), }, @@ -461,11 +469,13 @@ Module( ), }, ], + runtime_values: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__emoji_identifiers.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__emoji_identifiers.py.snap index 52729b5c7a0bf..4c5393effbee6 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__emoji_identifiers.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__emoji_identifiers.py.snap @@ -32,6 +32,9 @@ Module( ctx: Invalid, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -56,6 +59,9 @@ Module( ctx: Invalid, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Expr( @@ -80,6 +86,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__emoji_statement.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__emoji_statement.py.snap index 6b0e5ccbb99c5..b798ab9885a8c 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__emoji_statement.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__emoji_statement.py.snap @@ -10,6 +10,7 @@ Module( node_index: NodeIndex(None), range: 0..5, body: [], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__missing_orelse_expr_0.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__missing_orelse_expr_0.py.snap index 766ec9bebc257..ab55b69092d41 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__missing_orelse_expr_0.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__missing_orelse_expr_0.py.snap @@ -66,6 +66,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -76,9 +77,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__missing_orelse_expr_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__missing_orelse_expr_1.py.snap index 20584cc80bbae..8262008c39f05 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__missing_orelse_expr_1.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__missing_orelse_expr_1.py.snap @@ -78,6 +78,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__missing_test_expr_0.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__missing_test_expr_0.py.snap index 38246f51553da..eed6f0fba2057 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__missing_test_expr_0.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__missing_test_expr_0.py.snap @@ -66,6 +66,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -76,9 +77,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__missing_test_expr_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__missing_test_expr_1.py.snap index 9ea573657dae3..da6fdb72a6ddb 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__missing_test_expr_1.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__missing_test_expr_1.py.snap @@ -78,6 +78,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__recover.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__recover.py.snap index 8e25a9ff448b4..084c2168e6a8c 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__recover.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__if__recover.py.snap @@ -83,6 +83,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -90,6 +92,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -338,6 +341,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__lambda_default_parameters.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__lambda_default_parameters.py.snap index 73de71b4d091e..be2996d8ace0c 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__lambda_default_parameters.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__lambda_default_parameters.py.snap @@ -36,6 +36,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -51,6 +53,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -76,6 +80,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -83,6 +89,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: NumberLiteral( @@ -99,6 +106,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__lambda_duplicate_parameters.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__lambda_duplicate_parameters.py.snap index b81032db425c6..f44abf6dff0d4 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__lambda_duplicate_parameters.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__lambda_duplicate_parameters.py.snap @@ -36,6 +36,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -51,6 +53,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -58,6 +62,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: NumberLiteral( @@ -99,6 +104,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -117,11 +124,14 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, ], kwarg: None, + runtime_defaults: None, }, ), body: NumberLiteral( @@ -163,6 +173,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -178,6 +190,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -195,6 +209,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: NumberLiteral( @@ -236,6 +251,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -250,10 +267,13 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: NumberLiteral( @@ -295,6 +315,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -311,8 +333,11 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), + runtime_defaults: None, }, ), body: NumberLiteral( @@ -329,6 +354,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__comprehension.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__comprehension.py.snap index 63a9049b312fd..53f578e796f93 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__comprehension.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__comprehension.py.snap @@ -49,6 +49,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -106,6 +108,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -149,6 +153,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -162,6 +168,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -210,6 +218,7 @@ Module( }, ), ], + runtime_elts: None, }, ), iter: Name( @@ -222,6 +231,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -273,6 +284,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -325,6 +338,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -375,6 +390,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -431,6 +448,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -438,6 +457,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -452,6 +472,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -534,14 +556,18 @@ Module( ), }, ], + runtime_values: None, }, ), ], ctx: Load, + runtime_elts: None, }, ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -574,6 +600,7 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), }, @@ -601,6 +628,10 @@ Module( ), body: [], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), Expr( @@ -644,6 +675,7 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), }, @@ -671,6 +703,10 @@ Module( ), body: [], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), Expr( @@ -727,6 +763,8 @@ Module( ), ], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -788,6 +826,8 @@ Module( ), ], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -847,6 +887,8 @@ Module( ), ], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -912,6 +954,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -919,6 +963,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -933,6 +978,8 @@ Module( ), ], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -1006,6 +1053,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -1079,6 +1128,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -1086,6 +1137,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__missing_closing_bracket_0.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__missing_closing_bracket_0.py.snap index 1129c6f661cbf..f5a0011be6862 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__missing_closing_bracket_0.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__missing_closing_bracket_0.py.snap @@ -29,11 +29,13 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__missing_closing_bracket_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__missing_closing_bracket_1.py.snap index 8ac3aa77ce3e3..8ed3312ef99cb 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__missing_closing_bracket_1.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__missing_closing_bracket_1.py.snap @@ -44,11 +44,13 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__missing_closing_bracket_2.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__missing_closing_bracket_2.py.snap index 347768333c58e..5011545c94ebc 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__missing_closing_bracket_2.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__missing_closing_bracket_2.py.snap @@ -53,11 +53,13 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__missing_closing_bracket_3.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__missing_closing_bracket_3.py.snap index 1870af8aa0ab1..0ed2e8acf5259 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__missing_closing_bracket_3.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__missing_closing_bracket_3.py.snap @@ -39,6 +39,7 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), }, @@ -63,6 +64,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -73,9 +75,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__recover.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__recover.py.snap index 818809026883f..574fa9d8e117a 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__recover.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__recover.py.snap @@ -29,6 +29,7 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), }, @@ -62,6 +63,7 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), }, @@ -86,6 +88,7 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), }, @@ -119,6 +122,7 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), }, @@ -152,6 +156,7 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), }, @@ -199,6 +204,7 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), }, @@ -232,6 +238,7 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), }, @@ -262,11 +269,13 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__star_expression_precedence.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__star_expression_precedence.py.snap index 13ec68acb821f..6b7843ae602d3 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__star_expression_precedence.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__list__star_expression_precedence.py.snap @@ -44,6 +44,7 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), }, @@ -86,6 +87,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), ctx: Load, @@ -101,6 +103,7 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), }, @@ -146,6 +149,7 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), }, @@ -186,6 +190,7 @@ Module( }, ), ], + runtime_values: None, }, ), ctx: Load, @@ -201,6 +206,7 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), }, @@ -241,6 +247,7 @@ Module( }, ), ], + runtime_values: None, }, ), ctx: Load, @@ -256,6 +263,7 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), }, @@ -315,6 +323,7 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), }, @@ -354,6 +363,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -361,6 +372,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -386,6 +398,7 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), }, @@ -439,11 +452,13 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__invalid_target.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__invalid_target.py.snap index a7ba61211f8af..1dc3c831421f5 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__invalid_target.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__invalid_target.py.snap @@ -162,6 +162,7 @@ Module( ), ], ctx: Store, + runtime_elts: None, }, ), value: List( @@ -189,6 +190,7 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), }, @@ -196,6 +198,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_0.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_0.py.snap index 80360bc64321d..763170445a70e 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_0.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_0.py.snap @@ -25,6 +25,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_1.py.snap index 6adc7cf73868b..40da172faddd9 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_1.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_1.py.snap @@ -39,6 +39,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_2.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_2.py.snap index c5d280ce7a0d6..d39493ed81a55 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_2.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_2.py.snap @@ -59,6 +59,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -72,9 +74,11 @@ Module( ), value: None, simple: false, + runtime_simple: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_3.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_3.py.snap index 56494fe2b3913..04396d360723c 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_3.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_3.py.snap @@ -54,6 +54,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_4.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_4.py.snap index ee4effd12c812..9e350aa014208 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_4.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__named__missing_expression_4.py.snap @@ -68,6 +68,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__generator.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__generator.py.snap index 10b1f719faeb9..f22d9e8250f3b 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__generator.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__generator.py.snap @@ -45,6 +45,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), }, @@ -72,9 +73,14 @@ Module( ), body: [], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__missing_closing_paren_0.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__missing_closing_paren_0.py.snap index be74ea3c8ab90..e27cf853188ae 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__missing_closing_paren_0.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__missing_closing_paren_0.py.snap @@ -25,6 +25,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__missing_closing_paren_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__missing_closing_paren_1.py.snap index 53ae176db3711..89c867e25f2ac 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__missing_closing_paren_1.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__missing_closing_paren_1.py.snap @@ -40,6 +40,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__missing_closing_paren_2.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__missing_closing_paren_2.py.snap index 05c0bb17752e7..53daeeecb05fd 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__missing_closing_paren_2.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__missing_closing_paren_2.py.snap @@ -54,11 +54,13 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__missing_closing_paren_3.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__missing_closing_paren_3.py.snap index 24ae8dd4bb9e0..38b6a70c0dc30 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__missing_closing_paren_3.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__missing_closing_paren_3.py.snap @@ -40,6 +40,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), }, @@ -64,6 +65,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -74,9 +76,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__parenthesized.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__parenthesized.py.snap index 9f0372217cb2a..4ad25409ab9f4 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__parenthesized.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__parenthesized.py.snap @@ -61,6 +61,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__tuple.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__tuple.py.snap index 9aa45988b6c18..e81959f1c97b4 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__tuple.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__tuple.py.snap @@ -30,6 +30,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), }, @@ -64,6 +65,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), }, @@ -89,6 +91,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), }, @@ -147,6 +150,7 @@ Module( ), value: None, simple: false, + runtime_simple: None, }, ), Expr( @@ -193,6 +197,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), }, @@ -272,11 +277,13 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__tuple_starred_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__tuple_starred_expr.py.snap index fc2ce04a1ca3b..c6f24dff9ba00 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__tuple_starred_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__parenthesized__tuple_starred_expr.py.snap @@ -48,6 +48,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), ctx: Load, @@ -90,6 +91,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), ctx: Load, @@ -98,6 +100,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), }, @@ -166,6 +169,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), }, @@ -206,6 +210,7 @@ Module( }, ), ], + runtime_values: None, }, ), ctx: Load, @@ -246,6 +251,7 @@ Module( }, ), ], + runtime_values: None, }, ), ctx: Load, @@ -254,6 +260,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), }, @@ -294,6 +301,7 @@ Module( }, ), ], + runtime_values: None, }, ), ctx: Load, @@ -334,6 +342,7 @@ Module( }, ), ], + runtime_values: None, }, ), ctx: Load, @@ -342,6 +351,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), }, @@ -438,6 +448,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), }, @@ -477,6 +488,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -484,6 +497,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -533,6 +547,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -540,6 +556,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -558,6 +575,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), }, @@ -642,6 +660,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), }, @@ -684,6 +703,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), ctx: Load, @@ -726,6 +746,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), ctx: Load, @@ -734,6 +755,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), }, @@ -802,6 +824,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), }, @@ -842,6 +865,7 @@ Module( }, ), ], + runtime_values: None, }, ), ctx: Load, @@ -882,6 +906,7 @@ Module( }, ), ], + runtime_values: None, }, ), ctx: Load, @@ -890,6 +915,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), }, @@ -930,6 +956,7 @@ Module( }, ), ], + runtime_values: None, }, ), ctx: Load, @@ -970,6 +997,7 @@ Module( }, ), ], + runtime_values: None, }, ), ctx: Load, @@ -978,6 +1006,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), }, @@ -1074,6 +1103,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), }, @@ -1113,6 +1143,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1120,6 +1152,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -1169,6 +1202,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1176,6 +1211,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -1194,6 +1230,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), }, @@ -1272,11 +1309,13 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__comprehension.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__comprehension.py.snap index fe53312824c59..7ecf8227e5af5 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__comprehension.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__comprehension.py.snap @@ -49,6 +49,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -106,6 +108,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -149,6 +153,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -162,6 +168,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -210,6 +218,7 @@ Module( }, ), ], + runtime_elts: None, }, ), iter: Name( @@ -222,6 +231,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -273,6 +284,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -325,6 +338,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -375,6 +390,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -431,6 +448,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -438,6 +457,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -452,6 +472,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -512,6 +534,8 @@ Module( ), ], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -573,6 +597,8 @@ Module( ), ], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -632,6 +658,8 @@ Module( ), ], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -697,6 +725,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -704,6 +734,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -718,6 +749,8 @@ Module( ), ], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -725,6 +758,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__missing_closing_curly_brace_0.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__missing_closing_curly_brace_0.py.snap index b520e3eea91dd..c3f04d00c5eb6 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__missing_closing_curly_brace_0.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__missing_closing_curly_brace_0.py.snap @@ -28,11 +28,13 @@ Module( }, ), ], + runtime_elts: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__missing_closing_curly_brace_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__missing_closing_curly_brace_1.py.snap index b746257d0b801..bff106292258d 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__missing_closing_curly_brace_1.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__missing_closing_curly_brace_1.py.snap @@ -43,11 +43,13 @@ Module( }, ), ], + runtime_elts: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__missing_closing_curly_brace_2.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__missing_closing_curly_brace_2.py.snap index ef03e861b0ad6..fcf5a11bdeed9 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__missing_closing_curly_brace_2.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__missing_closing_curly_brace_2.py.snap @@ -52,11 +52,13 @@ Module( }, ), ], + runtime_elts: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__missing_closing_curly_brace_3.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__missing_closing_curly_brace_3.py.snap index 0be8d06138c61..9cd61f1d9eaf0 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__missing_closing_curly_brace_3.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__missing_closing_curly_brace_3.py.snap @@ -38,6 +38,7 @@ Module( }, ), ], + runtime_elts: None, }, ), }, @@ -62,6 +63,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -72,9 +74,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__recover.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__recover.py.snap index 8954c554faa96..97fbfdad6a23f 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__recover.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__recover.py.snap @@ -28,6 +28,7 @@ Module( }, ), ], + runtime_elts: None, }, ), }, @@ -60,6 +61,7 @@ Module( }, ), ], + runtime_elts: None, }, ), }, @@ -83,6 +85,7 @@ Module( }, ), ], + runtime_elts: None, }, ), }, @@ -115,6 +118,7 @@ Module( }, ), ], + runtime_elts: None, }, ), }, @@ -151,6 +155,7 @@ Module( ), }, ], + runtime_values: None, }, ), }, @@ -197,6 +202,7 @@ Module( }, ), ], + runtime_elts: None, }, ), }, @@ -229,6 +235,7 @@ Module( }, ), ], + runtime_elts: None, }, ), }, @@ -259,11 +266,13 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__star_expression_precedence.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__star_expression_precedence.py.snap index 20d61b1a4c6b2..0186d37db50bd 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__star_expression_precedence.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__set__star_expression_precedence.py.snap @@ -43,6 +43,7 @@ Module( }, ), ], + runtime_elts: None, }, ), }, @@ -85,6 +86,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), ctx: Load, @@ -99,6 +101,7 @@ Module( }, ), ], + runtime_elts: None, }, ), }, @@ -143,6 +146,7 @@ Module( }, ), ], + runtime_elts: None, }, ), }, @@ -183,6 +187,7 @@ Module( }, ), ], + runtime_values: None, }, ), ctx: Load, @@ -197,6 +202,7 @@ Module( }, ), ], + runtime_elts: None, }, ), }, @@ -237,6 +243,7 @@ Module( }, ), ], + runtime_values: None, }, ), ctx: Load, @@ -251,6 +258,7 @@ Module( }, ), ], + runtime_elts: None, }, ), }, @@ -309,6 +317,7 @@ Module( }, ), ], + runtime_elts: None, }, ), }, @@ -348,6 +357,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -355,6 +366,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -379,6 +391,7 @@ Module( }, ), ], + runtime_elts: None, }, ), }, @@ -431,11 +444,13 @@ Module( }, ), ], + runtime_elts: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__subscript__invalid_slice_element.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__subscript__invalid_slice_element.py.snap index 91295b506fd1b..4b6bc2038c6de 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__subscript__invalid_slice_element.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__subscript__invalid_slice_element.py.snap @@ -283,6 +283,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__subscript__unclosed_slice_0.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__subscript__unclosed_slice_0.py.snap index bb210f7665b36..0364937d6a21d 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__subscript__unclosed_slice_0.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__subscript__unclosed_slice_0.py.snap @@ -65,6 +65,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__subscript__unclosed_slice_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__subscript__unclosed_slice_1.py.snap index 13d17537ca1db..012749f23beed 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__subscript__unclosed_slice_1.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__subscript__unclosed_slice_1.py.snap @@ -70,6 +70,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -83,9 +85,11 @@ Module( ), value: None, simple: false, + runtime_simple: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__unary.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__unary.py.snap index 3510eb8a3cabc..2a953ead2a4a8 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__unary.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__unary.py.snap @@ -47,6 +47,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__unary__named_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__unary__named_expression.py.snap index a410a5cb73abd..b1d9de55a8691 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__unary__named_expression.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__unary__named_expression.py.snap @@ -83,6 +83,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__unary__no_expression_0.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__unary__no_expression_0.py.snap index b11ca386f946b..fa342a515a33b 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__unary__no_expression_0.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__unary__no_expression_0.py.snap @@ -61,6 +61,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__unary__no_expression_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__unary__no_expression_1.py.snap index 48f2e1e00ffd4..db7b51e2a3784 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__unary__no_expression_1.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__unary__no_expression_1.py.snap @@ -61,6 +61,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__yield__named_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__yield__named_expression.py.snap index c637ec5f6bdb6..04cd075c4e3a8 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__yield__named_expression.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__yield__named_expression.py.snap @@ -99,6 +99,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ), @@ -107,6 +108,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__yield__star_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__yield__star_expression.py.snap index 88317ef0ada79..7aec4c2dc7825 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__yield__star_expression.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__yield__star_expression.py.snap @@ -80,6 +80,7 @@ Module( }, ), ], + runtime_values: None, }, ), ctx: Load, @@ -96,6 +97,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ), @@ -104,6 +106,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__yield_from__starred_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__yield_from__starred_expression.py.snap index b8f1723b79245..5cfa734325bd6 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__yield_from__starred_expression.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__yield_from__starred_expression.py.snap @@ -76,6 +76,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), }, @@ -83,6 +84,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__yield_from__unparenthesized.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__yield_from__unparenthesized.py.snap index 4ce0931063254..df2c7d670639a 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__yield_from__unparenthesized.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__yield_from__unparenthesized.py.snap @@ -77,6 +77,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), }, @@ -131,6 +132,7 @@ Module( }, ), ], + runtime_values: None, }, ), ctx: Load, @@ -139,6 +141,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), }, @@ -146,6 +149,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_conversion_follows_exclamation.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_conversion_follows_exclamation.py.snap index aef6b79cbf26a..e5480b696e094 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_conversion_follows_exclamation.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_conversion_follows_exclamation.py.snap @@ -40,6 +40,9 @@ Module( debug_text: None, conversion: Str, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -53,6 +56,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -86,6 +91,9 @@ Module( debug_text: None, conversion: Str, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -98,6 +106,8 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -132,6 +142,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -145,11 +158,14 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_empty_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_empty_expression.py.snap index 68b565cf3beb5..0b5fc7656dcdf 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_empty_expression.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_empty_expression.py.snap @@ -40,6 +40,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -53,6 +56,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -87,6 +92,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -100,11 +108,14 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_invalid_conversion_flag_name_tok.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_invalid_conversion_flag_name_tok.py.snap index 2086898197bbb..24e84da674265 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_invalid_conversion_flag_name_tok.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_invalid_conversion_flag_name_tok.py.snap @@ -40,6 +40,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -53,11 +56,14 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_invalid_conversion_flag_other_tok.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_invalid_conversion_flag_other_tok.py.snap index a2ad5f30d0902..ee1f3dbd704e6 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_invalid_conversion_flag_other_tok.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_invalid_conversion_flag_other_tok.py.snap @@ -40,6 +40,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -53,6 +56,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -87,6 +92,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -100,11 +108,14 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_invalid_starred_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_invalid_starred_expr.py.snap index 56eacd2d9098d..b264927c4bf3c 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_invalid_starred_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_invalid_starred_expr.py.snap @@ -47,6 +47,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -60,6 +63,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -110,6 +115,7 @@ Module( }, ), ], + runtime_values: None, }, ), ctx: Load, @@ -118,6 +124,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -131,6 +140,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -180,6 +191,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -193,11 +207,14 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_lambda_without_parentheses.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_lambda_without_parentheses.py.snap index 97f372aa56938..796f7e7a5e3b6 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_lambda_without_parentheses.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_lambda_without_parentheses.py.snap @@ -51,6 +51,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -58,6 +60,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -73,6 +76,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -93,11 +99,14 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_unclosed_lbrace.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_unclosed_lbrace.py.snap index acff57934788e..add8b98312570 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_unclosed_lbrace.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_unclosed_lbrace.py.snap @@ -1,5 +1,6 @@ --- source: crates/ruff_python_parser/tests/fixtures.rs +input_file: crates/ruff_python_parser/resources/inline/err/f_string_unclosed_lbrace.py --- ## AST @@ -39,6 +40,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -52,6 +56,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -86,6 +92,9 @@ Module( debug_text: None, conversion: Repr, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -99,6 +108,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -139,6 +150,9 @@ Module( ), conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -152,6 +166,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -186,6 +202,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -199,6 +218,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -233,6 +254,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -246,11 +270,14 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_unclosed_lbrace_in_format_spec.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_unclosed_lbrace_in_format_spec.py.snap index 1ac023ab76511..39e2ad6143a94 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_unclosed_lbrace_in_format_spec.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@f_string_unclosed_lbrace_in_format_spec.py.snap @@ -53,6 +53,9 @@ Module( elements: [], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -66,6 +69,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -121,6 +126,9 @@ Module( ], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -134,11 +142,14 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_iter_unpack_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_iter_unpack_py38.py.snap index 01aa0c3e56e3f..e682e6f34c80f 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_iter_unpack_py38.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_iter_unpack_py38.py.snap @@ -54,6 +54,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), body: [ @@ -71,6 +72,10 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), For( @@ -117,6 +122,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), body: [ @@ -134,6 +140,10 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), For( @@ -187,6 +197,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), body: [ @@ -204,9 +215,14 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_invalid_iter_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_invalid_iter_expr.py.snap index 3479a2f1cdfa8..36ccdbcd4f4b9 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_invalid_iter_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_invalid_iter_expr.py.snap @@ -50,6 +50,7 @@ Module( }, ), ], + runtime_values: None, }, ), ctx: Load, @@ -70,6 +71,10 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), For( @@ -116,6 +121,10 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), For( @@ -141,6 +150,10 @@ Module( ), body: [], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), AnnAssign( @@ -164,9 +177,11 @@ Module( ), value: None, simple: false, + runtime_simple: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_invalid_target.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_invalid_target.py.snap index c8f400ccc869f..134c4f7051c38 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_invalid_target.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_invalid_target.py.snap @@ -47,6 +47,10 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), For( @@ -98,6 +102,10 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), For( @@ -132,6 +140,7 @@ Module( }, ), ], + runtime_values: None, }, ), ctx: Store, @@ -160,6 +169,10 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), For( @@ -220,6 +233,10 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), For( @@ -264,6 +281,10 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), For( @@ -301,6 +322,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), ), @@ -329,6 +351,10 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), For( @@ -398,6 +424,7 @@ Module( ), ], ctx: Store, + runtime_elts: None, }, ), ctx: Store, @@ -405,6 +432,7 @@ Module( ), ], ctx: Store, + runtime_elts: None, }, ), iter: Name( @@ -430,9 +458,14 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_invalid_target_binary_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_invalid_target_binary_expr.py.snap index dee71c15aa633..be10abbafc28f 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_invalid_target_binary_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_invalid_target_binary_expr.py.snap @@ -40,6 +40,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), iter: Name( @@ -65,6 +66,10 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), For( @@ -97,6 +102,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), iter: Name( @@ -122,6 +128,10 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), For( @@ -152,6 +162,7 @@ Module( }, ), ], + runtime_values: None, }, ), iter: Name( @@ -177,6 +188,10 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), For( @@ -222,6 +237,10 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), For( @@ -267,6 +286,10 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), For( @@ -320,9 +343,14 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_invalid_target_in_keyword.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_invalid_target_in_keyword.py.snap index 76ecd5aca005b..9962b931cc7bc 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_invalid_target_in_keyword.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_invalid_target_in_keyword.py.snap @@ -56,10 +56,13 @@ Module( }, ), ], + runtime_comparators: None, }, ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -86,6 +89,10 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), For( @@ -122,6 +129,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), arguments: Arguments { @@ -129,6 +137,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -155,6 +165,10 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), For( @@ -187,6 +201,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), iter: Name( @@ -212,6 +227,10 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), For( @@ -249,6 +268,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), Name( @@ -262,6 +282,7 @@ Module( ], ctx: Store, parenthesized: true, + runtime_elts: None, }, ), iter: Name( @@ -287,6 +308,10 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), For( @@ -324,6 +349,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), Name( @@ -336,6 +362,7 @@ Module( ), ], ctx: Store, + runtime_elts: None, }, ), iter: Name( @@ -361,6 +388,10 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), For( @@ -398,6 +429,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), Name( @@ -409,6 +441,7 @@ Module( }, ), ], + runtime_elts: None, }, ), iter: Name( @@ -434,9 +467,14 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_missing_in_keyword.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_missing_in_keyword.py.snap index 256fc1f8bd2d4..5ed87d63ed269 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_missing_in_keyword.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_missing_in_keyword.py.snap @@ -46,6 +46,10 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), For( @@ -84,9 +88,14 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_missing_iter.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_missing_iter.py.snap index f9640e450af6f..32b2afb527683 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_missing_iter.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_missing_iter.py.snap @@ -55,13 +55,21 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_missing_target.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_missing_target.py.snap index 184d01f31ca38..b0f9aa79376a7 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_missing_target.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@for_stmt_missing_target.py.snap @@ -46,9 +46,14 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_dotted_names.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_dotted_names.py.snap index e64b251ac4127..789c0799239e0 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_dotted_names.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_dotted_names.py.snap @@ -35,6 +35,7 @@ Module( ], level: 0, is_lazy: false, + runtime_level: None, }, ), ImportFrom( @@ -72,6 +73,7 @@ Module( ], level: 0, is_lazy: false, + runtime_level: None, }, ), ImportFrom( @@ -159,9 +161,11 @@ Module( ], level: 0, is_lazy: false, + runtime_level: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_empty_names.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_empty_names.py.snap index 39401788860ca..0cd4161ff65cd 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_empty_names.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_empty_names.py.snap @@ -24,6 +24,7 @@ Module( names: [], level: 0, is_lazy: false, + runtime_level: None, }, ), ImportFrom( @@ -40,6 +41,7 @@ Module( names: [], level: 0, is_lazy: false, + runtime_level: None, }, ), ImportFrom( @@ -56,9 +58,11 @@ Module( names: [], level: 0, is_lazy: false, + runtime_level: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_missing_module.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_missing_module.py.snap index 6dcd1dcea0664..5f34bd941cbc6 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_missing_module.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_missing_module.py.snap @@ -18,6 +18,7 @@ Module( names: [], level: 0, is_lazy: false, + runtime_level: None, }, ), ImportFrom( @@ -39,9 +40,11 @@ Module( ], level: 0, is_lazy: false, + runtime_level: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_missing_rpar.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_missing_rpar.py.snap index eb355d62d856f..b751f55e738d9 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_missing_rpar.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_missing_rpar.py.snap @@ -45,6 +45,7 @@ Module( ], level: 0, is_lazy: false, + runtime_level: None, }, ), Expr( @@ -113,6 +114,7 @@ Module( ], level: 0, is_lazy: false, + runtime_level: None, }, ), Expr( @@ -147,6 +149,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_parenthesized_star.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_parenthesized_star.py.snap index 4b7d807a7f937..1f172cbb8b9b1 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_parenthesized_star.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_parenthesized_star.py.snap @@ -35,9 +35,11 @@ Module( ], level: 0, is_lazy: false, + runtime_level: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_star_with_other_names.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_star_with_other_names.py.snap index 57dc8ea3c4fc0..ea9337bdaa1a2 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_star_with_other_names.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_star_with_other_names.py.snap @@ -45,6 +45,7 @@ Module( ], level: 0, is_lazy: false, + runtime_level: None, }, ), ImportFrom( @@ -92,6 +93,7 @@ Module( ], level: 0, is_lazy: false, + runtime_level: None, }, ), ImportFrom( @@ -135,6 +137,7 @@ Module( ], level: 0, is_lazy: false, + runtime_level: None, }, ), ImportFrom( @@ -182,9 +185,11 @@ Module( ], level: 0, is_lazy: false, + runtime_level: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_unparenthesized_trailing_comma.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_unparenthesized_trailing_comma.py.snap index 996f94b7d1fb2..f96de9c325a5b 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_unparenthesized_trailing_comma.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@from_import_unparenthesized_trailing_comma.py.snap @@ -35,6 +35,7 @@ Module( ], level: 0, is_lazy: false, + runtime_level: None, }, ), ImportFrom( @@ -68,6 +69,7 @@ Module( ], level: 0, is_lazy: false, + runtime_level: None, }, ), ImportFrom( @@ -105,9 +107,11 @@ Module( ], level: 0, is_lazy: false, + runtime_level: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_empty_body.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_empty_body.py.snap index 151d9f4b39202..616fe16ffd626 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_empty_body.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_empty_body.py.snap @@ -30,9 +30,14 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -55,6 +60,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: Some( Name( @@ -67,6 +73,10 @@ Module( ), ), body: [], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), Assign( @@ -92,9 +102,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_invalid_return_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_invalid_return_expr.py.snap index a807f4cf4fec4..86c78504253d0 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_invalid_return_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_invalid_return_expr.py.snap @@ -30,6 +30,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: Some( Starred( @@ -62,6 +63,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -84,6 +89,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: Some( Starred( @@ -116,6 +122,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -138,6 +148,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: Some( Yield( @@ -171,9 +182,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_missing_identifier.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_missing_identifier.py.snap index 51228a1638111..65fa7c58e6048 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_missing_identifier.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_missing_identifier.py.snap @@ -30,6 +30,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -46,6 +47,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -68,6 +73,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: Some( Name( @@ -93,9 +99,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_missing_return_type.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_missing_return_type.py.snap index acfd61b9242fd..4b282afab457a 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_missing_return_type.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_missing_return_type.py.snap @@ -30,6 +30,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -46,9 +47,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_unclosed_parameter_list.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_unclosed_parameter_list.py.snap index 9d71866cf6d59..b6cc7dfdd0420 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_unclosed_parameter_list.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_unclosed_parameter_list.py.snap @@ -48,6 +48,8 @@ Module( }, ), ), + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -63,6 +65,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -70,9 +74,14 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -95,6 +104,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -116,6 +126,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -156,6 +170,8 @@ Module( }, ), ), + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -180,6 +196,8 @@ Module( }, ), ), + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -195,6 +213,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -212,12 +232,18 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_unclosed_type_param_list.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_unclosed_type_param_list.py.snap index dd2412c32a051..27102d9e05c2f 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_unclosed_type_param_list.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_unclosed_type_param_list.py.snap @@ -52,6 +52,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), parameters: Parameters { @@ -71,6 +72,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -86,6 +89,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -93,6 +98,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -128,6 +134,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), Assign( @@ -153,9 +163,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_unparenthesized_return_types.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_unparenthesized_return_types.py.snap index e943085fc1dda..67cd9df098b22 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_unparenthesized_return_types.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_def_unparenthesized_return_types.py.snap @@ -30,6 +30,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: Some( Tuple( @@ -48,6 +49,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ), @@ -65,6 +67,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -87,6 +93,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: Some( Tuple( @@ -113,6 +120,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ), @@ -130,9 +138,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_type_params_py311.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_type_params_py311.py.snap index 020e464de8cc2..769799bdd0c15 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_type_params_py311.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@function_type_params_py311.py.snap @@ -40,6 +40,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), parameters: Parameters { @@ -50,6 +51,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -66,6 +68,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -84,6 +90,7 @@ Module( range: 69..71, node_index: NodeIndex(None), type_params: [], + runtime_type_params: None, }, ), parameters: Parameters { @@ -94,6 +101,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -110,9 +118,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@global_stmt_empty.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@global_stmt_empty.py.snap index 92375a3dfba72..bf9a95a1130a3 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@global_stmt_empty.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@global_stmt_empty.py.snap @@ -18,6 +18,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@global_stmt_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@global_stmt_expression.py.snap index 018d9049ee9b8..708cc0eb9f052 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@global_stmt_expression.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@global_stmt_expression.py.snap @@ -46,6 +46,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@global_stmt_trailing_comma.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@global_stmt_trailing_comma.py.snap index 22cbfb00161e6..4c57d4ab886ec 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@global_stmt_trailing_comma.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@global_stmt_trailing_comma.py.snap @@ -49,6 +49,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_elif_missing_colon.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_elif_missing_colon.py.snap index 4238e23e7a21c..a3553f9657492 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_elif_missing_colon.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_elif_missing_colon.py.snap @@ -52,6 +52,8 @@ Module( }, ), ], + runtime_body: None, + runtime_orelse: None, }, ElifElseClause { range: 31..45, @@ -65,11 +67,15 @@ Module( }, ), ], + runtime_body: None, + runtime_orelse: None, }, ], + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_empty_body.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_empty_body.py.snap index ad3fe7c4ca123..0df7acba7d355 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_empty_body.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_empty_body.py.snap @@ -23,6 +23,7 @@ Module( ), body: [], elif_else_clauses: [], + runtime_body: None, }, ), Expr( @@ -57,6 +58,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_invalid_elif_test_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_invalid_elif_test_expr.py.snap index 356e404b04586..cbf69b260cd7a 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_invalid_elif_test_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_invalid_elif_test_expr.py.snap @@ -59,6 +59,8 @@ Module( }, ), ], + runtime_body: None, + runtime_orelse: None, }, ElifElseClause { range: 33..55, @@ -89,11 +91,15 @@ Module( }, ), ], + runtime_body: None, + runtime_orelse: None, }, ], + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_invalid_test_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_invalid_test_expr.py.snap index 1840201849a75..dd0865ba44bb9 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_invalid_test_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_invalid_test_expr.py.snap @@ -44,6 +44,7 @@ Module( ), ], elif_else_clauses: [], + runtime_body: None, }, ), If( @@ -81,6 +82,7 @@ Module( ), ], elif_else_clauses: [], + runtime_body: None, }, ), If( @@ -116,9 +118,11 @@ Module( ), ], elif_else_clauses: [], + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_missing_colon.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_missing_colon.py.snap index 5dc30d6ce6f8e..3f20fe86301d1 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_missing_colon.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_missing_colon.py.snap @@ -24,6 +24,7 @@ Module( ), body: [], elif_else_clauses: [], + runtime_body: None, }, ), If( @@ -47,6 +48,7 @@ Module( ), ], elif_else_clauses: [], + runtime_body: None, }, ), Assign( @@ -72,9 +74,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_missing_test.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_missing_test.py.snap index f0f87f8a4fa3e..00631867e2abf 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_missing_test.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_missing_test.py.snap @@ -37,9 +37,11 @@ Module( ), ], elif_else_clauses: [], + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_misspelled_elif.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_misspelled_elif.py.snap index 3a360a80665dd..8af41bdaf979d 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_misspelled_elif.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@if_stmt_misspelled_elif.py.snap @@ -30,6 +30,7 @@ Module( ), ], elif_else_clauses: [], + runtime_body: None, }, ), AnnAssign( @@ -54,6 +55,7 @@ Module( ), value: None, simple: true, + runtime_simple: None, }, ), Pass( @@ -69,6 +71,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@implicitly_concatenated_unterminated_string.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@implicitly_concatenated_unterminated_string.py.snap index 7dd649dafd015..f7a8949678bc6 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@implicitly_concatenated_unterminated_string.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@implicitly_concatenated_unterminated_string.py.snap @@ -135,6 +135,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -149,6 +152,8 @@ Module( ], ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -185,6 +190,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@implicitly_concatenated_unterminated_string_multiline.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@implicitly_concatenated_unterminated_string_multiline.py.snap index 6d6ae6f83c4c4..dc1fd69e15573 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@implicitly_concatenated_unterminated_string_multiline.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@implicitly_concatenated_unterminated_string_multiline.py.snap @@ -61,6 +61,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -75,6 +78,8 @@ Module( ], ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -171,6 +176,8 @@ Module( ], ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -207,6 +214,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_alias_missing_asname.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_alias_missing_asname.py.snap index 47f3fd931108c..e0b748fdf0200 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_alias_missing_asname.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_alias_missing_asname.py.snap @@ -30,6 +30,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_from_star.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_from_star.py.snap index c2e12781c9a3d..e2e3063cc8953 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_from_star.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_from_star.py.snap @@ -30,6 +30,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -58,9 +59,14 @@ Module( ], level: 0, is_lazy: false, + runtime_level: None, }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ClassDef( @@ -101,9 +107,12 @@ Module( ], level: 0, is_lazy: false, + runtime_level: None, }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), FunctionDef( @@ -126,6 +135,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -154,9 +164,14 @@ Module( ], level: 2, is_lazy: false, + runtime_level: None, }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -179,6 +194,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -217,12 +233,18 @@ Module( ], level: 0, is_lazy: false, + runtime_level: None, }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_stmt_empty.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_stmt_empty.py.snap index 6f254cafc4e38..a2986b03b8520 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_stmt_empty.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_stmt_empty.py.snap @@ -19,6 +19,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_stmt_parenthesized_names.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_stmt_parenthesized_names.py.snap index e4acf74b90026..d3512f493acb9 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_stmt_parenthesized_names.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_stmt_parenthesized_names.py.snap @@ -68,11 +68,13 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_stmt_star_import.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_stmt_star_import.py.snap index 78b584adc6b7b..449b7354d91f1 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_stmt_star_import.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_stmt_star_import.py.snap @@ -93,11 +93,13 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_stmt_trailing_comma.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_stmt_trailing_comma.py.snap index 37a98420278ad..98464ff72d7cd 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_stmt_trailing_comma.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@import_stmt_trailing_comma.py.snap @@ -48,6 +48,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@incomplete_attribute_before_for_in_delimiter.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@incomplete_attribute_before_for_in_delimiter.py.snap index b59353d9aec69..6525227c6105f 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@incomplete_attribute_before_for_in_delimiter.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@incomplete_attribute_before_for_in_delimiter.py.snap @@ -60,6 +60,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -116,6 +118,8 @@ Module( ), ifs: [], is_async: true, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -172,6 +176,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -228,6 +234,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], parenthesized: true, @@ -285,6 +293,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -339,9 +349,14 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_class.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_class.py.snap index 9876d8216bd7a..c83bd1e180f0a 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_class.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_class.py.snap @@ -39,6 +39,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), arguments: Some( @@ -70,6 +71,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, ), body: [ @@ -86,6 +89,8 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), ClassDef( @@ -117,6 +122,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), arguments: Some( @@ -143,6 +149,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, ), body: [ @@ -159,6 +167,8 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), ClassDef( @@ -190,6 +200,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), arguments: Some( @@ -214,6 +225,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, ), body: [ @@ -230,6 +243,8 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), ClassDef( @@ -279,6 +294,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), arguments: None, @@ -296,6 +312,8 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), ClassDef( @@ -351,6 +369,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), arguments: None, @@ -368,6 +387,8 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), ClassDef( @@ -399,6 +420,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), arguments: Some( @@ -423,6 +445,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, ), body: [ @@ -439,6 +463,8 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), ClassDef( @@ -486,6 +512,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), arguments: None, @@ -503,9 +530,12 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_function.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_function.py.snap index 9ca7f7bbefb41..a795982388895 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_function.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_function.py.snap @@ -40,6 +40,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), parameters: Parameters { @@ -50,6 +51,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: Some( Await( @@ -82,6 +84,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -114,6 +120,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), parameters: Parameters { @@ -149,6 +156,8 @@ Module( }, ), ), + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -156,6 +165,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -172,6 +182,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -204,6 +218,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), parameters: Parameters { @@ -214,6 +229,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: Some( Named( @@ -254,6 +270,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -286,6 +306,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), parameters: Parameters { @@ -329,6 +350,8 @@ Module( }, ), ), + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -336,6 +359,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -352,6 +376,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -384,6 +412,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), parameters: Parameters { @@ -421,6 +450,8 @@ Module( }, ), ), + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -428,6 +459,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -444,6 +476,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -476,6 +512,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), parameters: Parameters { @@ -486,6 +523,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: Some( Yield( @@ -520,6 +558,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -552,6 +594,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), parameters: Parameters { @@ -587,6 +630,8 @@ Module( }, ), ), + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -594,6 +639,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -610,6 +656,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -642,6 +692,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), parameters: Parameters { @@ -652,6 +703,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: Some( YieldFrom( @@ -684,6 +736,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -734,6 +790,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), parameters: Parameters { @@ -744,6 +801,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -760,6 +818,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -810,6 +872,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), parameters: Parameters { @@ -820,6 +883,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -836,6 +900,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -885,6 +953,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), parameters: Parameters { @@ -895,6 +964,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -911,6 +981,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -960,6 +1034,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), parameters: Parameters { @@ -970,6 +1045,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -986,6 +1062,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -1042,6 +1122,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), parameters: Parameters { @@ -1052,6 +1133,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -1068,6 +1150,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -1124,6 +1210,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), parameters: Parameters { @@ -1134,6 +1221,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -1150,6 +1238,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -1205,6 +1297,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), parameters: Parameters { @@ -1215,6 +1308,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -1231,6 +1325,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -1286,6 +1384,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), parameters: Parameters { @@ -1296,6 +1395,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -1312,6 +1412,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -1360,6 +1464,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), parameters: Parameters { @@ -1370,6 +1475,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -1386,6 +1492,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -1434,6 +1544,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), parameters: Parameters { @@ -1444,6 +1555,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -1460,6 +1572,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -1507,6 +1623,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), parameters: Parameters { @@ -1517,6 +1634,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -1533,6 +1651,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -1580,6 +1702,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), parameters: Parameters { @@ -1590,6 +1713,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -1606,9 +1730,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_function_py314.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_function_py314.py.snap index ddf812502d5e3..0a8f73c502893 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_function_py314.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_function_py314.py.snap @@ -30,6 +30,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: Some( Named( @@ -70,6 +71,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -125,6 +130,8 @@ Module( }, ), ), + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -132,6 +139,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -148,6 +156,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -170,6 +182,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -220,6 +233,8 @@ Module( }, ), ), + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -227,6 +242,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -243,6 +259,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -265,6 +285,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: Some( Yield( @@ -299,6 +320,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -346,6 +371,8 @@ Module( }, ), ), + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -353,6 +380,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -369,6 +397,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -391,6 +423,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: Some( YieldFrom( @@ -423,9 +456,17 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -448,6 +489,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -471,6 +513,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: Some( Await( @@ -503,6 +546,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -550,6 +597,8 @@ Module( }, ), ), + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -557,6 +606,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -573,12 +623,21 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_py314.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_py314.py.snap index 80f657c133947..99d0352f991d2 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_py314.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_py314.py.snap @@ -47,6 +47,7 @@ Module( ), value: None, simple: true, + runtime_simple: None, }, ), FunctionDef( @@ -69,6 +70,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -103,6 +105,7 @@ Module( ), value: None, simple: true, + runtime_simple: None, }, ), AnnAssign( @@ -134,9 +137,14 @@ Module( ), value: None, simple: true, + runtime_simple: None, }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -159,6 +167,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -191,12 +200,18 @@ Module( ), value: None, simple: true, + runtime_simple: None, }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_type_alias.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_type_alias.py.snap index a0174091277bd..e1ec90612d01a 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_type_alias.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_annotation_type_alias.py.snap @@ -59,6 +59,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -120,6 +121,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -180,6 +182,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -240,6 +243,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -369,6 +373,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -412,6 +417,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_byte_literal.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_byte_literal.py.snap index 0de2a88389a01..e070f35d21215 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_byte_literal.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_byte_literal.py.snap @@ -94,6 +94,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_del_target.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_del_target.py.snap index cc7fbd303af65..37661615d93b8 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_del_target.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_del_target.py.snap @@ -40,6 +40,7 @@ Module( }, ), ], + runtime_targets: None, }, ), Delete( @@ -87,9 +88,11 @@ Module( ), }, ], + runtime_values: None, }, ), ], + runtime_targets: None, }, ), Delete( @@ -145,9 +148,11 @@ Module( }, ), ], + runtime_elts: None, }, ), ], + runtime_targets: None, }, ), Delete( @@ -215,9 +220,11 @@ Module( }, ), ], + runtime_targets: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_fstring_literal_element.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_fstring_literal_element.py.snap index fc74da89bfdd5..9c84c95c95d9d 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_fstring_literal_element.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_fstring_literal_element.py.snap @@ -43,6 +43,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -80,11 +82,14 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_future_feature.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_future_feature.py.snap index 121735f806bc5..ab97d139f6aaf 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_future_feature.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_future_feature.py.snap @@ -35,6 +35,7 @@ Module( ], level: 0, is_lazy: false, + runtime_level: None, }, ), ImportFrom( @@ -72,6 +73,7 @@ Module( ], level: 0, is_lazy: false, + runtime_level: None, }, ), ImportFrom( @@ -109,9 +111,11 @@ Module( ], level: 0, is_lazy: false, + runtime_level: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_match_pattern_target.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_match_pattern_target.py.snap index 9d06603076c33..a23c2cda3e836 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_match_pattern_target.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_match_pattern_target.py.snap @@ -71,6 +71,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 38..53, @@ -88,6 +89,8 @@ Module( node_index: NodeIndex(None), }, ), + runtime_keys: None, + runtime_patterns: None, }, ), guard: None, @@ -105,6 +108,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -132,9 +136,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_string_literal.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_string_literal.py.snap index 4d20a34438711..7dadbed0e24cd 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_string_literal.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@invalid_string_literal.py.snap @@ -65,6 +65,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ipython_help_escape_command_error_recovery_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ipython_help_escape_command_error_recovery_1.py.snap index 6f812719739d0..8bbfab3a506cb 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ipython_help_escape_command_error_recovery_1.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ipython_help_escape_command_error_recovery_1.py.snap @@ -44,6 +44,9 @@ Module( }, ], body: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), IpyEscapeCommand( @@ -55,6 +58,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ipython_help_escape_command_error_recovery_2.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ipython_help_escape_command_error_recovery_2.py.snap index 4f1baa69a7c8d..a0af89f0ce14f 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ipython_help_escape_command_error_recovery_2.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ipython_help_escape_command_error_recovery_2.py.snap @@ -43,15 +43,20 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), optional_vars: None, }, ], body: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ipython_help_escape_command_error_recovery_3.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ipython_help_escape_command_error_recovery_3.py.snap index 33079dbc605f3..f29cf1cb4b7f4 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ipython_help_escape_command_error_recovery_3.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@ipython_help_escape_command_error_recovery_3.py.snap @@ -44,6 +44,9 @@ Module( }, ], body: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), IpyEscapeCommand( @@ -77,9 +80,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@irrefutable_case_pattern.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@irrefutable_case_pattern.py.snap index e92cdb2db1729..b89ac0be8e0dc 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@irrefutable_case_pattern.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@irrefutable_case_pattern.py.snap @@ -55,6 +55,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 50..61, @@ -89,6 +90,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -132,6 +134,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 91..102, @@ -166,6 +169,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -230,6 +234,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 211..222, @@ -264,6 +269,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -330,6 +336,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -347,6 +354,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 305..316, @@ -381,11 +389,13 @@ Module( }, ), ], + runtime_body: None, }, ], }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@iter_unpack_return_py37.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@iter_unpack_return_py37.py.snap index 34d46e2a2bb65..e520c2776ce8a 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@iter_unpack_return_py37.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@iter_unpack_return_py37.py.snap @@ -59,8 +59,12 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), FunctionDef( @@ -83,6 +87,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -141,15 +146,21 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ), }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@iter_unpack_yield_py37.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@iter_unpack_yield_py37.py.snap index 4110c28f156e9..2d2bc7bf1078b 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@iter_unpack_yield_py37.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@iter_unpack_yield_py37.py.snap @@ -59,8 +59,12 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), FunctionDef( @@ -83,6 +87,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -145,6 +150,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ), @@ -153,6 +159,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -175,6 +185,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -238,6 +249,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ), @@ -255,6 +267,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ), @@ -263,9 +276,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@lambda_body_with_starred_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@lambda_body_with_starred_expr.py.snap index c06d9a8abc2b7..d2ae6b53889d2 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@lambda_body_with_starred_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@lambda_body_with_starred_expr.py.snap @@ -36,6 +36,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -43,6 +45,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Starred( @@ -95,6 +98,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -102,6 +107,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Starred( @@ -124,6 +130,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), }, @@ -159,6 +166,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -166,6 +175,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Starred( @@ -196,6 +206,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), }, @@ -226,6 +237,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -233,6 +246,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Starred( @@ -262,6 +276,7 @@ Module( }, ), ], + runtime_values: None, }, ), ctx: Load, @@ -272,6 +287,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@lambda_body_with_yield_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@lambda_body_with_yield_expr.py.snap index d21b80f6d6c89..6b3908dd8e925 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@lambda_body_with_yield_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@lambda_body_with_yield_expr.py.snap @@ -36,6 +36,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -43,6 +45,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Yield( @@ -91,6 +94,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -98,6 +103,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: YieldFrom( @@ -119,6 +125,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@lazy_import_invalid_context_py315.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@lazy_import_invalid_context_py315.py.snap index 67abc8a22c362..e8ea737af40fc 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@lazy_import_invalid_context_py315.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@lazy_import_invalid_context_py315.py.snap @@ -50,12 +50,17 @@ Module( }, ), ], + runtime_body: None, }, ), ], orelse: [], finalbody: [], is_star: false, + runtime_body: None, + runtime_handlers: None, + runtime_orelse: None, + runtime_finalbody: None, }, ), Try( @@ -115,12 +120,17 @@ Module( }, ), ], + runtime_body: None, }, ), ], orelse: [], finalbody: [], is_star: true, + runtime_body: None, + runtime_handlers: None, + runtime_orelse: None, + runtime_finalbody: None, }, ), FunctionDef( @@ -143,6 +153,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -166,6 +177,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -188,6 +203,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -216,9 +232,14 @@ Module( ], level: 0, is_lazy: true, + runtime_level: None, }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ClassDef( @@ -254,6 +275,8 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), FunctionDef( @@ -276,6 +299,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -312,12 +336,19 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@lazy_import_invalid_from_py315.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@lazy_import_invalid_from_py315.py.snap index 3e7266d918633..b9d98919a8839 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@lazy_import_invalid_from_py315.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@lazy_import_invalid_from_py315.py.snap @@ -35,6 +35,7 @@ Module( ], level: 0, is_lazy: true, + runtime_level: None, }, ), ImportFrom( @@ -62,6 +63,7 @@ Module( ], level: 0, is_lazy: true, + runtime_level: None, }, ), FunctionDef( @@ -84,6 +86,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -112,12 +115,18 @@ Module( ], level: 0, is_lazy: true, + runtime_level: None, }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@lazy_import_stmt_py314.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@lazy_import_stmt_py314.py.snap index 14f80ce4ad9a0..19f0052bca8cd 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@lazy_import_stmt_py314.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@lazy_import_stmt_py314.py.snap @@ -54,9 +54,11 @@ Module( ], level: 0, is_lazy: true, + runtime_level: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_before_py310.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_before_py310.py.snap index 391c87863e461..5b99c1ef55771 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_before_py310.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_before_py310.py.snap @@ -51,11 +51,13 @@ Module( }, ), ], + runtime_body: None, }, ], }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_classify_as_keyword.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_classify_as_keyword.py.snap index 47f410992c2b6..4d6cc7a216406 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_classify_as_keyword.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_classify_as_keyword.py.snap @@ -57,11 +57,13 @@ Module( }, ), ], + runtime_body: None, }, ], }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_classify_as_keyword_or_identifier.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_classify_as_keyword_or_identifier.py.snap index 4696b90ac23f7..19cfcc59502d3 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_classify_as_keyword_or_identifier.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_classify_as_keyword_or_identifier.py.snap @@ -56,11 +56,13 @@ Module( }, ), ], + runtime_body: None, }, ], }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_expected_colon.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_expected_colon.py.snap index da778df7a108e..a5de0429cd3b1 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_expected_colon.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_expected_colon.py.snap @@ -39,6 +39,7 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), cases: [ @@ -68,11 +69,13 @@ Module( }, ), ], + runtime_body: None, }, ], }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_expect_indented_block.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_expect_indented_block.py.snap index f8ff37f51a06f..224a2f0eb0422 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_expect_indented_block.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_expect_indented_block.py.snap @@ -49,11 +49,13 @@ Module( }, ), ], + runtime_body: None, }, ], }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_expected_case_block.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_expected_case_block.py.snap index 561ee48a26958..b703e2a0e4713 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_expected_case_block.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_expected_case_block.py.snap @@ -48,6 +48,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Match( @@ -104,11 +107,13 @@ Module( }, ), ], + runtime_body: None, }, ], }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_invalid_guard_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_invalid_guard_expr.py.snap index 5ae960f29c5be..4c95faa939993 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_invalid_guard_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_invalid_guard_expr.py.snap @@ -71,6 +71,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -136,6 +137,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -202,11 +204,13 @@ Module( }, ), ], + runtime_body: None, }, ], }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_invalid_subject_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_invalid_subject_expr.py.snap index 537bf08d6bdbc..4bcf6b2ae0f52 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_invalid_subject_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_invalid_subject_expr.py.snap @@ -56,6 +56,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -96,6 +97,7 @@ Module( }, ), ], + runtime_values: None, }, ), ctx: Load, @@ -112,6 +114,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), cases: [ @@ -141,6 +144,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -192,11 +196,13 @@ Module( }, ), ], + runtime_body: None, }, ], }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_missing_guard_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_missing_guard_expr.py.snap index 880d99610c296..1811e4ac029f3 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_missing_guard_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_missing_guard_expr.py.snap @@ -55,11 +55,13 @@ Module( }, ), ], + runtime_body: None, }, ], }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_missing_pattern.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_missing_pattern.py.snap index 17247bca62985..21ad0c756fccb 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_missing_pattern.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_missing_pattern.py.snap @@ -55,11 +55,13 @@ Module( }, ), ], + runtime_body: None, }, ], }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_no_newline_before_case.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_no_newline_before_case.py.snap index 7d49a7f558ec6..351ea8f58f296 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_no_newline_before_case.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_no_newline_before_case.py.snap @@ -49,11 +49,13 @@ Module( }, ), ], + runtime_body: None, }, ], }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_single_starred_subject.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_single_starred_subject.py.snap index 67fa5c7067ca3..77e685967e0de 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_single_starred_subject.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@match_stmt_single_starred_subject.py.snap @@ -56,11 +56,13 @@ Module( }, ), ], + runtime_body: None, }, ], }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@mixed_bytes_and_non_bytes_literals.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@mixed_bytes_and_non_bytes_literals.py.snap index 829f518bed297..684f44de2adb0 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@mixed_bytes_and_non_bytes_literals.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@mixed_bytes_and_non_bytes_literals.py.snap @@ -101,6 +101,8 @@ Module( ], ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -166,11 +168,14 @@ Module( ], ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@mixed_tstring_and_bytes_literals.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@mixed_tstring_and_bytes_literals.py.snap index 517a7974527d2..75cc2961841fa 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@mixed_tstring_and_bytes_literals.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@mixed_tstring_and_bytes_literals.py.snap @@ -50,6 +50,8 @@ Module( ], ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -94,6 +96,8 @@ Module( ], ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -138,6 +142,8 @@ Module( ], ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -195,6 +201,8 @@ Module( ], ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -252,6 +260,8 @@ Module( ], ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -322,6 +332,8 @@ Module( ], ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -387,11 +399,14 @@ Module( ], ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@multiple_assignment_in_case_pattern.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@multiple_assignment_in_case_pattern.py.snap index 234f5001e0f5f..8b68ba496672b 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@multiple_assignment_in_case_pattern.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@multiple_assignment_in_case_pattern.py.snap @@ -75,6 +75,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -92,6 +93,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 54..74, @@ -143,6 +145,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -160,6 +163,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 96..115, @@ -212,6 +216,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -229,6 +234,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 146..168, @@ -288,6 +294,8 @@ Module( ), ], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), guard: None, @@ -305,6 +313,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 207..228, @@ -347,6 +356,8 @@ Module( node_index: NodeIndex(None), }, ), + runtime_keys: None, + runtime_patterns: None, }, ), guard: None, @@ -364,6 +375,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 269..290, @@ -415,6 +427,9 @@ Module( ], keywords: [], }, + runtime_patterns: None, + runtime_kwd_attrs: None, + runtime_kwd_patterns: None, }, ), guard: None, @@ -432,6 +447,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 320..345, @@ -501,6 +517,9 @@ Module( }, ], }, + runtime_patterns: None, + runtime_kwd_attrs: None, + runtime_kwd_patterns: None, }, ), guard: None, @@ -518,6 +537,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 372..412, @@ -547,6 +567,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), MatchMapping( @@ -581,6 +602,8 @@ Module( ), ], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), MatchClass( @@ -648,9 +671,13 @@ Module( }, ], }, + runtime_patterns: None, + runtime_kwd_attrs: None, + runtime_kwd_patterns: None, }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -668,6 +695,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 428..444, @@ -716,11 +744,13 @@ Module( }, ), ], + runtime_body: None, }, ], }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@multiple_clauses_on_same_line.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@multiple_clauses_on_same_line.py.snap index cd8e98be1cee8..cfbcd7ca1904e 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@multiple_clauses_on_same_line.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@multiple_clauses_on_same_line.py.snap @@ -50,6 +50,8 @@ Module( }, ), ], + runtime_body: None, + runtime_orelse: None, }, ElifElseClause { range: 31..41, @@ -63,8 +65,11 @@ Module( }, ), ], + runtime_body: None, + runtime_orelse: None, }, ], + runtime_body: None, }, ), If( @@ -107,6 +112,8 @@ Module( }, ), ], + runtime_body: None, + runtime_orelse: None, }, ElifElseClause { range: 75..85, @@ -120,8 +127,11 @@ Module( }, ), ], + runtime_body: None, + runtime_orelse: None, }, ], + runtime_body: None, }, ), For( @@ -161,6 +171,10 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), For( @@ -200,6 +214,10 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), Try( @@ -238,6 +256,7 @@ Module( }, ), ], + runtime_body: None, }, ), ], @@ -258,6 +277,10 @@ Module( ), ], is_star: false, + runtime_body: None, + runtime_handlers: None, + runtime_orelse: None, + runtime_finalbody: None, }, ), Try( @@ -296,6 +319,7 @@ Module( }, ), ], + runtime_body: None, }, ), ], @@ -316,9 +340,14 @@ Module( ), ], is_star: false, + runtime_body: None, + runtime_handlers: None, + runtime_orelse: None, + runtime_finalbody: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@multiple_starred_assignment_target.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@multiple_starred_assignment_target.py.snap index fe2d8393ce51a..15ec9ccafcf47 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@multiple_starred_assignment_target.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@multiple_starred_assignment_target.py.snap @@ -53,6 +53,7 @@ Module( ], ctx: Store, parenthesized: true, + runtime_elts: None, }, ), ], @@ -82,8 +83,12 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -128,6 +133,7 @@ Module( ), ], ctx: Store, + runtime_elts: None, }, ), ], @@ -157,8 +163,12 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -212,6 +222,7 @@ Module( ], ctx: Store, parenthesized: true, + runtime_elts: None, }, ), ], @@ -250,8 +261,12 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -304,6 +319,7 @@ Module( ), ], ctx: Store, + runtime_elts: None, }, ), ], @@ -342,8 +358,12 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -424,11 +444,13 @@ Module( ], ctx: Store, parenthesized: true, + runtime_elts: None, }, ), ], ctx: Store, parenthesized: true, + runtime_elts: None, }, ), ], @@ -458,11 +480,16 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@multiple_starred_names_in_sequence_pattern.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@multiple_starred_names_in_sequence_pattern.py.snap index c289a7895a571..9587ad07c777d 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@multiple_starred_names_in_sequence_pattern.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@multiple_starred_names_in_sequence_pattern.py.snap @@ -71,6 +71,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -88,11 +89,13 @@ Module( }, ), ], + runtime_body: None, }, ], }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@named_expr_slice.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@named_expr_slice.py.snap index 961dcf36e150c..857c1506f2a37 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@named_expr_slice.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@named_expr_slice.py.snap @@ -220,6 +220,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@named_expr_slice_parse_error.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@named_expr_slice_parse_error.py.snap index 34c884074894a..ee314ad800c15 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@named_expr_slice_parse_error.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@named_expr_slice_parse_error.py.snap @@ -82,6 +82,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nested_async_comprehension_py310.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nested_async_comprehension_py310.py.snap index ff285092c2118..50752b47593ae 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nested_async_comprehension_py310.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nested_async_comprehension_py310.py.snap @@ -30,6 +30,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -92,11 +93,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: true, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -140,11 +145,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -153,6 +162,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -175,6 +188,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -248,11 +262,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: true, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -296,11 +314,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -309,6 +331,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -331,6 +357,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -393,11 +420,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: true, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -441,11 +472,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -454,6 +489,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -476,6 +515,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -544,11 +584,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: true, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -604,11 +648,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -616,6 +664,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), generators: [ @@ -657,11 +706,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -670,6 +723,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -692,6 +749,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -760,11 +818,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -820,11 +882,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: true, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -832,6 +898,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), generators: [ @@ -873,11 +940,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -886,9 +957,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nested_quote_in_format_spec_py312.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nested_quote_in_format_spec_py312.py.snap index 187240a204f32..10a79a047d5b7 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nested_quote_in_format_spec_py312.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nested_quote_in_format_spec_py312.py.snap @@ -48,6 +48,9 @@ Module( elements: [], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -75,11 +78,14 @@ Module( ], ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@node_range_with_gaps.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@node_range_with_gaps.py.snap index a71728ff9d61c..2b0126feb98d0 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@node_range_with_gaps.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@node_range_with_gaps.py.snap @@ -30,9 +30,14 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -55,6 +60,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -71,6 +77,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -93,12 +103,18 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nonlocal_declaration_at_module_level.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nonlocal_declaration_at_module_level.py.snap index 5f81d3505db57..6fe3afa4481e5 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nonlocal_declaration_at_module_level.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nonlocal_declaration_at_module_level.py.snap @@ -42,6 +42,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nonlocal_stmt_empty.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nonlocal_stmt_empty.py.snap index cba504e096f0e..e84c7c699b9e7 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nonlocal_stmt_empty.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nonlocal_stmt_empty.py.snap @@ -30,6 +30,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -41,9 +42,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nonlocal_stmt_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nonlocal_stmt_expression.py.snap index ae92fb5c2b1f6..f86a3f496439b 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nonlocal_stmt_expression.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nonlocal_stmt_expression.py.snap @@ -30,6 +30,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -69,9 +70,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nonlocal_stmt_trailing_comma.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nonlocal_stmt_trailing_comma.py.snap index 5060d24003b38..5c1d8eb4ee1c6 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nonlocal_stmt_trailing_comma.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@nonlocal_stmt_trailing_comma.py.snap @@ -30,6 +30,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -72,9 +73,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_missing_annotation.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_missing_annotation.py.snap index 97f376531396e..aac0e2c33b046 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_missing_annotation.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_missing_annotation.py.snap @@ -39,6 +39,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -46,6 +48,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -62,6 +65,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -93,6 +100,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -100,6 +109,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -116,9 +126,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_missing_default.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_missing_default.py.snap index 677e725f3ad36..9d9f1f2f783ed 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_missing_default.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_missing_default.py.snap @@ -39,6 +39,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -46,6 +48,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -62,6 +65,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -102,6 +109,8 @@ Module( }, ), ), + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -109,6 +118,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -125,9 +135,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_with_invalid_annotation.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_with_invalid_annotation.py.snap index b81e6a9903bed..ecb74d5dd83b7 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_with_invalid_annotation.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_with_invalid_annotation.py.snap @@ -55,6 +55,8 @@ Module( }, ), ), + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -62,6 +64,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -78,6 +81,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -126,6 +133,8 @@ Module( }, ), ), + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -133,6 +142,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -149,6 +159,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -189,6 +203,8 @@ Module( }, ), ), + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -204,6 +220,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -211,6 +229,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -227,9 +246,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_with_invalid_default.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_with_invalid_default.py.snap index 461ef54faab20..d75d2635ba3eb 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_with_invalid_default.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_with_invalid_default.py.snap @@ -39,6 +39,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( Starred( @@ -62,6 +64,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -78,6 +81,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -109,6 +116,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( Starred( @@ -132,6 +141,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -148,6 +158,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -179,6 +193,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( Yield( @@ -203,6 +219,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -219,9 +236,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_with_invalid_star_annotation.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_with_invalid_star_annotation.py.snap index c8ace07b1fba3..5f936bc6da220 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_with_invalid_star_annotation.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_with_invalid_star_annotation.py.snap @@ -53,10 +53,13 @@ Module( }, ), ), + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -73,6 +76,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -133,10 +140,13 @@ Module( }, ), ), + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -153,6 +163,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -209,16 +223,20 @@ Module( }, ), ], + runtime_values: None, }, ), ctx: Load, }, ), ), + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -235,6 +253,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -288,10 +310,13 @@ Module( }, ), ), + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -308,9 +333,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_with_star_annotation_py310.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_with_star_annotation_py310.py.snap index 20e6c382e4c92..353def8ade66a 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_with_star_annotation_py310.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@param_with_star_annotation_py310.py.snap @@ -53,10 +53,13 @@ Module( }, ), ), + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -73,9 +76,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_duplicate_names.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_duplicate_names.py.snap index cf8ca302d41f0..763683219303b 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_duplicate_names.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_duplicate_names.py.snap @@ -39,6 +39,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -54,6 +56,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -78,6 +82,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), kwonlyargs: [ @@ -93,6 +99,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -117,6 +125,8 @@ Module( }, ), ), + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -131,8 +141,11 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), + runtime_defaults: None, }, returns: None, body: [ @@ -149,9 +162,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_expected_after_star_separator.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_expected_after_star_separator.py.snap index 3a61d03ad026e..8d801462efec9 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_expected_after_star_separator.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_expected_after_star_separator.py.snap @@ -30,6 +30,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -46,6 +47,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -68,6 +73,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -84,6 +90,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -115,6 +125,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -122,6 +134,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -138,6 +151,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -169,6 +186,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -176,6 +195,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -192,6 +212,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -223,8 +247,11 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), + runtime_defaults: None, }, returns: None, body: [ @@ -241,9 +268,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_follows_var_keyword_param.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_follows_var_keyword_param.py.snap index f643b398d0734..b3e3d9cea03af 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_follows_var_keyword_param.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_follows_var_keyword_param.py.snap @@ -38,6 +38,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -55,6 +57,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -79,6 +83,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), kwonlyargs: [], @@ -92,8 +98,11 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), + runtime_defaults: None, }, returns: None, body: [ @@ -110,9 +119,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_kwarg_after_star_separator.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_kwarg_after_star_separator.py.snap index 3c76f98da42b5..5f34b03a915a1 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_kwarg_after_star_separator.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_kwarg_after_star_separator.py.snap @@ -39,8 +39,11 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), + runtime_defaults: None, }, returns: None, body: [ @@ -57,9 +60,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_multiple_kwargs.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_multiple_kwargs.py.snap index b5c0c9d0aacad..dade5a383d237 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_multiple_kwargs.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_multiple_kwargs.py.snap @@ -39,6 +39,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -55,8 +57,11 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), + runtime_defaults: None, }, returns: None, body: [ @@ -73,9 +78,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_multiple_slash_separator.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_multiple_slash_separator.py.snap index 8fe7404b2345a..b9f8edb1f5257 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_multiple_slash_separator.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_multiple_slash_separator.py.snap @@ -38,6 +38,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -55,6 +57,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -62,6 +66,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -78,6 +83,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -108,6 +117,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -125,6 +136,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -140,6 +153,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -147,6 +162,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -163,9 +179,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_multiple_star_separator.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_multiple_star_separator.py.snap index 642996446c7b5..82329a8d65210 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_multiple_star_separator.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_multiple_star_separator.py.snap @@ -39,6 +39,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -57,11 +59,14 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, ], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -78,6 +83,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -109,6 +118,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -127,6 +138,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -142,11 +155,14 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, ], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -163,9 +179,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_multiple_varargs.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_multiple_varargs.py.snap index a60de5d69e42e..900fd154b06a7 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_multiple_varargs.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_multiple_varargs.py.snap @@ -39,6 +39,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -53,6 +55,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), kwonlyargs: [ @@ -68,11 +72,14 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, ], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -89,6 +96,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -120,6 +131,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -134,6 +147,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), kwonlyargs: [ @@ -149,11 +164,14 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, ], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -170,6 +188,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -201,6 +223,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -215,6 +239,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), kwonlyargs: [ @@ -230,6 +256,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -245,11 +273,14 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, ], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -266,9 +297,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_no_arg_before_slash.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_no_arg_before_slash.py.snap index f3fc1117e0011..a0f59c4fd8ca9 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_no_arg_before_slash.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_no_arg_before_slash.py.snap @@ -30,6 +30,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -46,6 +47,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -77,6 +82,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -84,6 +91,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -100,9 +108,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_non_default_after_default.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_non_default_after_default.py.snap index 6dfcec4878927..78d1c46a7121e 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_non_default_after_default.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_non_default_after_default.py.snap @@ -39,6 +39,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -64,6 +66,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -88,6 +92,8 @@ Module( }, ), ), + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -95,6 +101,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -111,9 +118,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_star_after_slash.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_star_after_slash.py.snap index 485d7d49babb5..44244c86bd704 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_star_after_slash.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_star_after_slash.py.snap @@ -37,10 +37,13 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -57,6 +60,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -87,6 +94,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -102,6 +111,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), kwonlyargs: [ @@ -117,11 +128,14 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, ], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -138,6 +152,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -168,6 +186,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -187,11 +207,14 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, ], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -208,6 +231,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -238,6 +265,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -257,6 +286,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -272,6 +303,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -287,11 +320,14 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, ], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -308,9 +344,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_star_separator_after_star_param.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_star_separator_after_star_param.py.snap index 6a75f864f722b..0785b1d74cb74 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_star_separator_after_star_param.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_star_separator_after_star_param.py.snap @@ -39,6 +39,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -53,6 +55,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), kwonlyargs: [ @@ -68,11 +72,14 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, ], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -89,6 +96,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -120,6 +131,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -134,6 +147,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), kwonlyargs: [ @@ -149,6 +164,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -164,11 +181,14 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, ], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -185,9 +205,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_var_keyword_with_default.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_var_keyword_with_default.py.snap index 6a172bd47cb8c..6b3a911b9f407 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_var_keyword_with_default.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_var_keyword_with_default.py.snap @@ -39,6 +39,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -55,8 +57,11 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), + runtime_defaults: None, }, returns: None, body: [ @@ -138,11 +143,16 @@ Module( ), }, ], + runtime_values: None, }, ), }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), Expr( @@ -158,6 +168,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_var_positional_with_default.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_var_positional_with_default.py.snap index 076fbfe23bf1e..fb48e19b0faa5 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_var_positional_with_default.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_var_positional_with_default.py.snap @@ -39,6 +39,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -53,10 +55,13 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -90,11 +95,16 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), Expr( @@ -110,6 +120,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@parenthesized_context_manager_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@parenthesized_context_manager_py38.py.snap index 3185cb6e3246f..8dd3613320e5b 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@parenthesized_context_manager_py38.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@parenthesized_context_manager_py38.py.snap @@ -75,6 +75,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -133,6 +136,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -191,9 +197,13 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@parenthesized_kwarg_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@parenthesized_kwarg_py38.py.snap index 6a2b1560fd23e..ee66a16af15c1 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@parenthesized_kwarg_py38.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@parenthesized_kwarg_py38.py.snap @@ -52,6 +52,8 @@ Module( ), }, ], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -99,6 +101,8 @@ Module( ), }, ], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -146,12 +150,15 @@ Module( ), }, ], + runtime_args: None, + runtime_bases: None, }, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@pep701_f_string_py311.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@pep701_f_string_py311.py.snap index b1f3dfc4fc77c..09d9b963a5ab0 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@pep701_f_string_py311.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@pep701_f_string_py311.py.snap @@ -75,6 +75,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -88,6 +91,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -162,12 +167,17 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -181,6 +191,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -250,6 +262,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -263,6 +278,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -389,6 +406,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -402,11 +422,16 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -420,11 +445,16 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -438,11 +468,16 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -456,11 +491,16 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -474,11 +514,16 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -492,6 +537,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -554,6 +601,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -574,11 +624,16 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -599,6 +654,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -634,6 +691,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -647,6 +707,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -688,6 +750,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -708,6 +773,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -757,6 +824,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -770,11 +840,16 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -788,6 +863,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -922,16 +999,22 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -945,11 +1028,14 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@pep701_nested_interpolation_py311.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@pep701_nested_interpolation_py311.py.snap index 51ca8d4ddaf31..9433581174d48 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@pep701_nested_interpolation_py311.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@pep701_nested_interpolation_py311.py.snap @@ -80,6 +80,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -92,6 +95,9 @@ Module( ], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -105,6 +111,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -179,6 +187,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -191,6 +202,9 @@ Module( ], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -204,11 +218,14 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@pep_798_invalid_dict_unpacking_comprehensions_py315.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@pep_798_invalid_dict_unpacking_comprehensions_py315.py.snap index cf6a44043bf19..bb9346329d8bf 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@pep_798_invalid_dict_unpacking_comprehensions_py315.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@pep_798_invalid_dict_unpacking_comprehensions_py315.py.snap @@ -71,6 +71,7 @@ Module( ], ctx: Store, parenthesized: false, + runtime_elts: None, }, ), iter: Name( @@ -83,6 +84,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -150,6 +153,7 @@ Module( ], ctx: Store, parenthesized: false, + runtime_elts: None, }, ), iter: Name( @@ -162,6 +166,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -222,6 +228,7 @@ Module( ], ctx: Store, parenthesized: false, + runtime_elts: None, }, ), iter: Name( @@ -234,6 +241,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -294,6 +303,7 @@ Module( ], ctx: Store, parenthesized: false, + runtime_elts: None, }, ), iter: Name( @@ -306,6 +316,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -313,6 +325,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@pep_798_unpacking_comprehensions_py314.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@pep_798_unpacking_comprehensions_py314.py.snap index 86297c504ceae..685b5d10c7fdd 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@pep_798_unpacking_comprehensions_py314.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@pep_798_unpacking_comprehensions_py314.py.snap @@ -55,6 +55,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -106,6 +108,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -151,6 +155,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -202,6 +208,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], parenthesized: true, @@ -270,6 +278,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], parenthesized: false, @@ -277,12 +287,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@pos_only_py37.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@pos_only_py37.py.snap index 5a0accedf7316..bcd4fdc4ac4a9 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@pos_only_py37.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@pos_only_py37.py.snap @@ -38,6 +38,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -46,6 +48,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -62,6 +65,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -92,6 +99,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -109,6 +118,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -116,6 +127,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -132,6 +144,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -162,6 +178,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -177,6 +195,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), kwonlyargs: [ @@ -192,11 +212,14 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, ], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -213,6 +236,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -244,6 +271,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -251,6 +280,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -267,9 +297,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_from_without_exc.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_from_without_exc.py.snap index a26ddcf6ec928..25dbed536eb8f 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_from_without_exc.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_from_without_exc.py.snap @@ -43,6 +43,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_invalid_cause.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_invalid_cause.py.snap index 5554450d32949..0004e204f3df5 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_invalid_cause.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_invalid_cause.py.snap @@ -119,6 +119,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_invalid_exc.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_invalid_exc.py.snap index 02dab5618e6f2..c8bd421fae5eb 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_invalid_exc.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_invalid_exc.py.snap @@ -92,6 +92,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_unparenthesized_tuple_cause.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_unparenthesized_tuple_cause.py.snap index 8920563325fa7..4b6c7c78664a9 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_unparenthesized_tuple_cause.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_unparenthesized_tuple_cause.py.snap @@ -41,6 +41,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ), @@ -85,12 +86,14 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_unparenthesized_tuple_exc.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_unparenthesized_tuple_exc.py.snap index 249774dde9e13..0a0e28b80d6e5 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_unparenthesized_tuple_exc.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@raise_stmt_unparenthesized_tuple_exc.py.snap @@ -31,6 +31,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ), @@ -66,6 +67,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ), @@ -101,6 +103,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ), @@ -117,6 +120,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lex_logical_token.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lex_logical_token.py.snap index 9410e6f20a83f..8823bea5d13db 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lex_logical_token.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lex_logical_token.py.snap @@ -40,11 +40,14 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), body: [], elif_else_clauses: [], + runtime_body: None, }, ), FunctionDef( @@ -67,6 +70,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -77,6 +81,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), If( @@ -109,6 +117,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -133,6 +143,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -143,10 +154,15 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], elif_else_clauses: [], + runtime_body: None, }, ), If( @@ -179,6 +195,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -203,6 +221,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -213,10 +232,15 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], elif_else_clauses: [], + runtime_body: None, }, ), If( @@ -249,6 +273,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -273,6 +299,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -283,10 +310,15 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], elif_else_clauses: [], + runtime_body: None, }, ), If( @@ -340,10 +372,13 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -368,6 +403,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -378,10 +414,15 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], elif_else_clauses: [], + runtime_body: None, }, ), If( @@ -435,10 +476,13 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -463,6 +507,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -473,10 +518,15 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], elif_else_clauses: [], + runtime_body: None, }, ), If( @@ -530,10 +580,13 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -558,6 +611,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -568,10 +622,15 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], elif_else_clauses: [], + runtime_body: None, }, ), If( @@ -627,6 +686,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -640,10 +702,14 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -668,6 +734,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -678,10 +745,15 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], elif_else_clauses: [], + runtime_body: None, }, ), If( @@ -733,15 +805,20 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), body: [], elif_else_clauses: [], + runtime_body: None, }, ), FunctionDef( @@ -764,6 +841,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -774,9 +852,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lex_logical_token_mac_eol.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lex_logical_token_mac_eol.py.snap index 11e80e4bd94e6..f36dc38c283c4 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lex_logical_token_mac_eol.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lex_logical_token_mac_eol.py.snap @@ -61,10 +61,13 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -89,6 +92,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -99,13 +103,19 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], elif_else_clauses: [], + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lex_logical_token_windows_eol.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lex_logical_token_windows_eol.py.snap index 692755d4e89bc..7c76ad9460d28 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lex_logical_token_windows_eol.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lex_logical_token_windows_eol.py.snap @@ -61,10 +61,13 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -89,6 +92,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -99,13 +103,19 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], elif_else_clauses: [], + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__fstring_format_spec_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__fstring_format_spec_1.py.snap index c9aa9e7ce459a..61734ba481a00 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__fstring_format_spec_1.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__fstring_format_spec_1.py.snap @@ -74,6 +74,9 @@ Module( ], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -87,6 +90,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -210,6 +215,9 @@ Module( ], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -223,6 +231,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -318,6 +328,9 @@ Module( ], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -331,6 +344,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -391,6 +406,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__line_continuation_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__line_continuation_1.py.snap index 21f4465c4e8d5..6a79b668c85b1 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__line_continuation_1.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__line_continuation_1.py.snap @@ -48,6 +48,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -73,6 +75,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -83,9 +86,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__line_continuation_windows_eol.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__line_continuation_windows_eol.py.snap index cde70bca42cd0..0c3a297dc330d 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__line_continuation_windows_eol.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__line_continuation_windows_eol.py.snap @@ -48,6 +48,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -73,6 +75,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -83,9 +86,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__triple_quoted_fstring_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__triple_quoted_fstring_1.py.snap index 8fcddba72a0b2..a20b3bdb1f079 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__triple_quoted_fstring_1.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__triple_quoted_fstring_1.py.snap @@ -47,6 +47,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -60,11 +63,14 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__triple_quoted_fstring_2.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__triple_quoted_fstring_2.py.snap index 290b20e86aee5..9a6e0f05a672b 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__triple_quoted_fstring_2.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__triple_quoted_fstring_2.py.snap @@ -54,6 +54,9 @@ Module( ], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -67,11 +70,14 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__triple_quoted_fstring_3.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__triple_quoted_fstring_3.py.snap index 3c611d4fbeae7..4c67cf4bbfb22 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__triple_quoted_fstring_3.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__triple_quoted_fstring_3.py.snap @@ -70,6 +70,9 @@ Module( ], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -83,10 +86,14 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -99,9 +106,11 @@ Module( ), ], elif_else_clauses: [], + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__ty_1828.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__ty_1828.py.snap index d0ee282cd7f40..3441def760d23 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__ty_1828.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__ty_1828.py.snap @@ -1,5 +1,6 @@ --- source: crates/ruff_python_parser/tests/fixtures.rs +input_file: crates/ruff_python_parser/resources/invalid/re_lexing/ty_1828.py --- ## AST @@ -80,6 +81,9 @@ Module( ), conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -93,6 +97,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), slice: Slice( @@ -133,19 +139,24 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ), simple: false, + runtime_simple: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@rebound_comprehension_variable.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@rebound_comprehension_variable.py.snap index 932b4f7ac26bf..e5b0ee2260810 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@rebound_comprehension_variable.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@rebound_comprehension_variable.py.snap @@ -80,11 +80,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -161,11 +165,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -252,11 +260,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -343,11 +355,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -424,11 +440,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], parenthesized: true, @@ -474,6 +494,7 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), generators: [ @@ -515,11 +536,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -596,11 +621,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, Comprehension { range: 215..232, @@ -640,11 +669,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -721,11 +754,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, Comprehension { range: 263..280, @@ -765,11 +802,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -838,6 +879,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), generators: [ @@ -879,11 +921,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, Comprehension { range: 323..340, @@ -923,11 +969,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -935,6 +985,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@return_stmt_invalid_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@return_stmt_invalid_expr.py.snap index d00b8aadbf4c9..21b18794d6d67 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@return_stmt_invalid_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@return_stmt_invalid_expr.py.snap @@ -142,6 +142,7 @@ Module( }, ), ], + runtime_values: None, }, ), ctx: Load, @@ -151,6 +152,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@simple_and_compound_stmt_on_same_line.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@simple_and_compound_stmt_on_same_line.py.snap index c7203ece654ae..ebcc879bdb24e 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@simple_and_compound_stmt_on_same_line.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@simple_and_compound_stmt_on_same_line.py.snap @@ -59,9 +59,11 @@ Module( ), ], elif_else_clauses: [], + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@simple_and_compound_stmt_on_same_line_in_block.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@simple_and_compound_stmt_on_same_line_in_block.py.snap index 8ca5568f51cfc..6b363da4909e4 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@simple_and_compound_stmt_on_same_line_in_block.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@simple_and_compound_stmt_on_same_line_in_block.py.snap @@ -30,6 +30,7 @@ Module( ), ], elif_else_clauses: [], + runtime_body: None, }, ), If( @@ -52,6 +53,7 @@ Module( ), ], elif_else_clauses: [], + runtime_body: None, }, ), If( @@ -74,6 +76,7 @@ Module( ), ], elif_else_clauses: [], + runtime_body: None, }, ), If( @@ -96,9 +99,11 @@ Module( ), ], elif_else_clauses: [], + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@simple_stmts_on_same_line.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@simple_stmts_on_same_line.py.snap index 4a6746ba538ba..81ed3b3b79d33 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@simple_stmts_on_same_line.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@simple_stmts_on_same_line.py.snap @@ -127,6 +127,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@simple_stmts_on_same_line_in_block.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@simple_stmts_on_same_line_in_block.py.snap index 9f757bf464c5b..dc6ac8fdac2df 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@simple_stmts_on_same_line_in_block.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@simple_stmts_on_same_line_in_block.py.snap @@ -54,9 +54,11 @@ Module( ), ], elif_else_clauses: [], + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@single_star_for.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@single_star_for.py.snap index f1a7ec5d75198..e73ed970d6928 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@single_star_for.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@single_star_for.py.snap @@ -53,6 +53,10 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), For( @@ -98,9 +102,14 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@single_star_return.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@single_star_return.py.snap index 46af64432464c..0ecf706fe7477 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@single_star_return.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@single_star_return.py.snap @@ -30,6 +30,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -57,9 +58,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@single_star_yield.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@single_star_yield.py.snap index e95f6482b7998..d961302d804e3 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@single_star_yield.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@single_star_yield.py.snap @@ -30,6 +30,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -63,9 +64,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@single_starred_assignment_target.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@single_starred_assignment_target.py.snap index 93661f3f07564..1dff2ae692775 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@single_starred_assignment_target.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@single_starred_assignment_target.py.snap @@ -48,11 +48,16 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@star_index_py310.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@star_index_py310.py.snap index c10eb737d2e3c..cbc20af3501c7 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@star_index_py310.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@star_index_py310.py.snap @@ -49,6 +49,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ctx: Load, @@ -115,6 +116,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ctx: Load, @@ -122,6 +124,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, ), body: [ @@ -138,6 +142,8 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), Expr( @@ -195,6 +201,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ctx: Load, @@ -257,6 +264,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ctx: Load, @@ -318,6 +326,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ctx: Load, @@ -393,6 +402,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ctx: Load, @@ -401,6 +411,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@star_slices.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@star_slices.py.snap index 48d71c4c722c9..bca9fc105705e 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@star_slices.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@star_slices.py.snap @@ -73,6 +73,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@starred_comprehension_target.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@starred_comprehension_target.py.snap index bf5f2b33ebe43..761bbd7784a24 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@starred_comprehension_target.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@starred_comprehension_target.py.snap @@ -55,6 +55,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -62,6 +64,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@starred_list_comp_py314.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@starred_list_comp_py314.py.snap index e567871623993..c790e4ca93584 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@starred_list_comp_py314.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@starred_list_comp_py314.py.snap @@ -55,6 +55,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -62,6 +64,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@starred_starred_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@starred_starred_expression.py.snap index 5e7b922cfabd7..19ceddd7b52e1 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@starred_starred_expression.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@starred_starred_expression.py.snap @@ -44,6 +44,7 @@ Module( range: 9..11, elts: [], ctx: Load, + runtime_elts: None, }, ), ctx: Load, @@ -54,6 +55,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -93,6 +96,7 @@ Module( range: 22..24, elts: [], ctx: Load, + runtime_elts: None, }, ), ctx: Load, @@ -103,12 +107,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__function_type_parameters.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__function_type_parameters.py.snap index 0b2e6cb57b537..ae49cdad1e0c8 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__function_type_parameters.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__function_type_parameters.py.snap @@ -53,6 +53,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), parameters: Parameters { @@ -63,6 +64,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -79,6 +81,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -124,6 +130,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), parameters: Parameters { @@ -134,6 +141,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -150,6 +158,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -195,6 +207,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), parameters: Parameters { @@ -205,6 +218,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -221,6 +235,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -253,6 +271,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), parameters: Parameters { @@ -263,6 +282,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -279,6 +299,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -311,6 +335,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), parameters: Parameters { @@ -321,6 +346,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -340,6 +366,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), AnnAssign( @@ -353,6 +383,7 @@ Module( elts: [], ctx: Store, parenthesized: true, + runtime_elts: None, }, ), annotation: EllipsisLiteral( @@ -363,9 +394,11 @@ Module( ), value: None, simple: false, + runtime_simple: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__if_extra_closing_parentheses.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__if_extra_closing_parentheses.py.snap index a7555f2ebf662..bb6b49885b8bb 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__if_extra_closing_parentheses.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__if_extra_closing_parentheses.py.snap @@ -23,6 +23,7 @@ Module( ), body: [], elif_else_clauses: [], + runtime_body: None, }, ), Pass( @@ -32,6 +33,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__if_extra_indent.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__if_extra_indent.py.snap index b469e7418a1c7..fc62c64abc4d6 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__if_extra_indent.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__if_extra_indent.py.snap @@ -65,6 +65,7 @@ Module( ), ], elif_else_clauses: [], + runtime_body: None, }, ), Assign( @@ -90,6 +91,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), If( @@ -162,6 +166,7 @@ Module( ), ], elif_else_clauses: [], + runtime_body: None, }, ), Expr( @@ -233,6 +238,7 @@ Module( ), ], elif_else_clauses: [], + runtime_body: None, }, ), Expr( @@ -265,6 +271,7 @@ Module( ), ], elif_else_clauses: [], + runtime_body: None, }, ), Expr( @@ -365,6 +372,7 @@ Module( ), ], elif_else_clauses: [], + runtime_body: None, }, ), Expr( @@ -428,6 +436,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -449,6 +459,7 @@ Module( ), ], elif_else_clauses: [], + runtime_body: None, }, ), Expr( @@ -507,9 +518,11 @@ Module( ), ], elif_else_clauses: [], + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__invalid_assignment_targets.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__invalid_assignment_targets.py.snap index 510a3c189c766..e3e7e4daa5c7a 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__invalid_assignment_targets.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__invalid_assignment_targets.py.snap @@ -34,6 +34,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), AugAssign( @@ -94,6 +97,7 @@ Module( ), ), simple: false, + runtime_simple: None, }, ), Assign( @@ -124,6 +128,7 @@ Module( }, ), ], + runtime_values: None, }, ), ], @@ -136,6 +141,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -176,6 +184,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -216,6 +227,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -248,6 +262,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -277,6 +294,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -284,6 +303,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: NumberLiteral( @@ -307,6 +327,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -354,6 +377,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -401,6 +427,7 @@ Module( ), }, ], + runtime_values: None, }, ), ], @@ -413,6 +440,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -434,6 +464,7 @@ Module( }, ), ], + runtime_elts: None, }, ), ], @@ -446,6 +477,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -487,6 +521,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -501,6 +537,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -542,6 +581,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -556,6 +597,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -623,6 +667,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -637,6 +683,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -678,6 +727,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], parenthesized: true, @@ -693,6 +744,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -724,6 +778,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -757,6 +814,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -788,6 +848,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -829,6 +892,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), ], @@ -841,6 +905,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -865,6 +932,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -878,6 +947,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -911,6 +983,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -924,6 +999,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), ], @@ -936,6 +1013,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -969,6 +1049,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -993,6 +1076,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -1006,6 +1092,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), ], @@ -1018,6 +1106,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -1056,6 +1147,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -1098,6 +1192,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -1124,6 +1221,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -1148,6 +1248,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -1171,6 +1274,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -1194,6 +1300,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -1222,6 +1331,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -1238,6 +1349,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -1275,6 +1389,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -1288,6 +1404,7 @@ Module( ), ], ctx: Store, + runtime_elts: None, }, ), ], @@ -1325,8 +1442,12 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -1362,6 +1483,7 @@ Module( ), ], ctx: Store, + runtime_elts: None, }, ), List( @@ -1385,10 +1507,12 @@ Module( ), ], ctx: Store, + runtime_elts: None, }, ), ], ctx: Store, + runtime_elts: None, }, ), Name( @@ -1401,6 +1525,7 @@ Module( ), ], ctx: Store, + runtime_elts: None, }, ), ], @@ -1434,6 +1559,7 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), List( @@ -1457,10 +1583,12 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), ], ctx: Load, + runtime_elts: None, }, ), NumberLiteral( @@ -1474,8 +1602,12 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -1513,6 +1645,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -1527,6 +1661,7 @@ Module( ], ctx: Store, parenthesized: true, + runtime_elts: None, }, ), ], @@ -1565,11 +1700,16 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__invalid_augmented_assignment_target.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__invalid_augmented_assignment_target.py.snap index 1e0455a3d24b4..e550b994b31e0 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__invalid_augmented_assignment_target.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__invalid_augmented_assignment_target.py.snap @@ -37,6 +37,7 @@ Module( }, ), ], + runtime_values: None, }, ), op: Add, @@ -186,6 +187,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -193,6 +196,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: NumberLiteral( @@ -308,6 +312,7 @@ Module( ), }, ], + runtime_values: None, }, ), op: Add, @@ -340,6 +345,7 @@ Module( }, ), ], + runtime_elts: None, }, ), op: Add, @@ -392,6 +398,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -446,6 +454,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -526,6 +536,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -580,6 +592,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], parenthesized: true, @@ -727,6 +741,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), op: Add, @@ -762,6 +777,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -807,6 +824,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -820,6 +840,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), op: Add, @@ -864,6 +886,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -888,6 +913,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -901,6 +929,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), op: Add, @@ -1110,6 +1140,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -1162,6 +1194,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -1175,6 +1209,7 @@ Module( ), ], ctx: Store, + runtime_elts: None, }, ), op: Add, @@ -1212,6 +1247,7 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), }, @@ -1248,6 +1284,7 @@ Module( ), ], ctx: Store, + runtime_elts: None, }, ), List( @@ -1271,10 +1308,12 @@ Module( ), ], ctx: Store, + runtime_elts: None, }, ), ], ctx: Store, + runtime_elts: None, }, ), Name( @@ -1287,6 +1326,7 @@ Module( ), ], ctx: Store, + runtime_elts: None, }, ), op: Add, @@ -1320,6 +1360,7 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), List( @@ -1343,10 +1384,12 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), ], ctx: Load, + runtime_elts: None, }, ), NumberLiteral( @@ -1360,6 +1403,7 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), }, @@ -1398,6 +1442,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -1412,6 +1458,7 @@ Module( ], ctx: Store, parenthesized: true, + runtime_elts: None, }, ), op: Add, @@ -1450,11 +1497,13 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_0.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_0.py.snap index d03bfe08c894e..619fc9ac27d83 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_0.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_0.py.snap @@ -73,6 +73,9 @@ Module( ], keywords: [], }, + runtime_patterns: None, + runtime_kwd_attrs: None, + runtime_kwd_patterns: None, }, ), guard: None, @@ -84,11 +87,13 @@ Module( }, ), ], + runtime_body: None, }, ], }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_1.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_1.py.snap index 34809d25604f1..db17c3b6bb29c 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_1.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_1.py.snap @@ -66,11 +66,13 @@ Module( }, ), ], + runtime_body: None, }, ], }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_2.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_2.py.snap index f02af5a34e1ae..615d4cacb7513 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_2.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_2.py.snap @@ -88,9 +88,11 @@ Module( ), value: None, simple: false, + runtime_simple: None, }, ), ], + runtime_body: None, }, ], }, @@ -102,6 +104,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_3.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_3.py.snap index eb00a56bdde69..2a663ffb3cce6 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_3.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_3.py.snap @@ -35,6 +35,7 @@ Module( node_index: NodeIndex(None), range: 108..109, items: [], + runtime_values: None, }, ), arguments: PatternArguments { @@ -73,6 +74,9 @@ Module( ], keywords: [], }, + runtime_patterns: None, + runtime_kwd_attrs: None, + runtime_kwd_patterns: None, }, ), guard: None, @@ -93,6 +97,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -104,6 +109,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_4.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_4.py.snap index fde6679f01c21..1ccfd0b0c7312 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_4.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__as_pattern_4.py.snap @@ -80,6 +80,8 @@ Module( ), ], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), guard: None, @@ -91,11 +93,13 @@ Module( }, ), ], + runtime_body: None, }, ], }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__invalid_class_pattern.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__invalid_class_pattern.py.snap index 67b1874089e53..900b37114fe59 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__invalid_class_pattern.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__invalid_class_pattern.py.snap @@ -69,6 +69,9 @@ Module( }, ], }, + runtime_patterns: None, + runtime_kwd_attrs: None, + runtime_kwd_patterns: None, }, ), guard: None, @@ -80,6 +83,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 102..135, @@ -127,6 +131,9 @@ Module( }, ], }, + runtime_patterns: None, + runtime_kwd_attrs: None, + runtime_kwd_patterns: None, }, ), guard: None, @@ -138,6 +145,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 140..174, @@ -185,6 +193,9 @@ Module( }, ], }, + runtime_patterns: None, + runtime_kwd_attrs: None, + runtime_kwd_patterns: None, }, ), guard: None, @@ -196,6 +207,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 179..217, @@ -243,6 +255,9 @@ Module( }, ], }, + runtime_patterns: None, + runtime_kwd_attrs: None, + runtime_kwd_patterns: None, }, ), guard: None, @@ -254,6 +269,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 222..249, @@ -301,6 +317,9 @@ Module( }, ], }, + runtime_patterns: None, + runtime_kwd_attrs: None, + runtime_kwd_patterns: None, }, ), guard: None, @@ -312,6 +331,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 254..285, @@ -359,6 +379,9 @@ Module( }, ], }, + runtime_patterns: None, + runtime_kwd_attrs: None, + runtime_kwd_patterns: None, }, ), guard: None, @@ -370,11 +393,13 @@ Module( }, ), ], + runtime_body: None, }, ], }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__invalid_lhs_or_rhs_pattern.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__invalid_lhs_or_rhs_pattern.py.snap index 4f3a4512a1d65..ba01fabf0a05e 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__invalid_lhs_or_rhs_pattern.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__invalid_lhs_or_rhs_pattern.py.snap @@ -51,6 +51,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -78,6 +80,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 65..90, @@ -122,6 +125,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 95..120, @@ -166,6 +170,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 125..156, @@ -227,6 +232,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 161..191, @@ -264,6 +270,7 @@ Module( ), ], ctx: Store, + runtime_elts: None, }, ), op: Add, @@ -290,6 +297,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 196..229, @@ -328,6 +336,7 @@ Module( ), }, ], + runtime_values: None, }, ), op: Add, @@ -354,6 +363,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 234..260, @@ -400,6 +410,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 265..292, @@ -453,6 +464,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 297..332, @@ -491,6 +503,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -518,6 +532,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -573,6 +588,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -589,6 +606,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 398..422, @@ -632,6 +650,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 427..451, @@ -675,6 +694,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 456..486, @@ -735,6 +755,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 491..520, @@ -782,6 +803,7 @@ Module( ), ], ctx: Store, + runtime_elts: None, }, ), }, @@ -797,6 +819,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 525..557, @@ -845,6 +868,7 @@ Module( ), }, ], + runtime_values: None, }, ), }, @@ -860,6 +884,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 562..586, @@ -904,6 +929,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 591..625, @@ -952,6 +978,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -968,6 +996,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -1013,6 +1042,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -1034,6 +1065,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -1050,11 +1083,13 @@ Module( }, ), ], + runtime_body: None, }, ], }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__invalid_mapping_pattern.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__invalid_mapping_pattern.py.snap index 45178034fd49f..7ba9ec9072c48 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__invalid_mapping_pattern.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__invalid_mapping_pattern.py.snap @@ -64,6 +64,8 @@ Module( ), ], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), guard: None, @@ -75,6 +77,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 110..138, @@ -118,6 +121,8 @@ Module( ), ], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), guard: None, @@ -129,6 +134,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 143..170, @@ -172,6 +178,8 @@ Module( ), ], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), guard: None, @@ -183,6 +191,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 175..209, @@ -246,6 +255,8 @@ Module( ), ], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), guard: None, @@ -257,6 +268,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -313,6 +325,8 @@ Module( node_index: NodeIndex(None), }, ), + runtime_keys: None, + runtime_patterns: None, }, ), guard: None, @@ -324,6 +338,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 365..411, @@ -364,6 +379,8 @@ Module( node_index: NodeIndex(None), }, ), + runtime_keys: None, + runtime_patterns: None, }, ), guard: None, @@ -375,6 +392,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 416..462, @@ -415,6 +433,8 @@ Module( node_index: NodeIndex(None), }, ), + runtime_keys: None, + runtime_patterns: None, }, ), guard: None, @@ -426,6 +446,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -477,6 +498,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -499,6 +522,8 @@ Module( ), ], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), guard: None, @@ -516,11 +541,13 @@ Module( }, ), ], + runtime_body: None, }, ], }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__star_pattern_usage.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__star_pattern_usage.py.snap index f5388675aafdb..0854b2275ed79 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__star_pattern_usage.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__star_pattern_usage.py.snap @@ -42,6 +42,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 102..128, @@ -77,6 +78,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 133..156, @@ -103,6 +105,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 161..188, @@ -141,6 +144,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -152,6 +156,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 193..220, @@ -190,6 +195,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -201,6 +207,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 225..251, @@ -231,6 +238,9 @@ Module( ], keywords: [], }, + runtime_patterns: None, + runtime_kwd_attrs: None, + runtime_kwd_patterns: None, }, ), guard: None, @@ -242,6 +252,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 256..284, @@ -281,6 +292,9 @@ Module( }, ], }, + runtime_patterns: None, + runtime_kwd_attrs: None, + runtime_kwd_patterns: None, }, ), guard: None, @@ -292,6 +306,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 289..312, @@ -334,6 +349,8 @@ Module( ), ], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), guard: None, @@ -345,6 +362,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 317..343, @@ -388,6 +406,8 @@ Module( ), ], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), guard: None, @@ -399,6 +419,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 348..377, @@ -425,6 +446,8 @@ Module( ), ], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), guard: None, @@ -436,6 +459,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 382..407, @@ -486,6 +510,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -552,6 +577,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -563,11 +589,13 @@ Module( }, ), ], + runtime_body: None, }, ], }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__unary_add_usage.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__unary_add_usage.py.snap index 2fcc8cad9381a..adf72825137e7 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__unary_add_usage.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__match__unary_add_usage.py.snap @@ -57,6 +57,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 119..149, @@ -126,6 +127,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -137,6 +139,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 154..184, @@ -206,6 +209,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -217,6 +221,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 189..223, @@ -302,6 +307,9 @@ Module( }, ], }, + runtime_patterns: None, + runtime_kwd_attrs: None, + runtime_kwd_patterns: None, }, ), guard: None, @@ -313,6 +321,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 228..268, @@ -384,6 +393,8 @@ Module( ), ], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), guard: None, @@ -395,11 +406,13 @@ Module( }, ), ], + runtime_body: None, }, ], }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__ambiguous_lpar_with_items.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__ambiguous_lpar_with_items.py.snap index 441cae77b76f0..849ef085449a7 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__ambiguous_lpar_with_items.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__ambiguous_lpar_with_items.py.snap @@ -43,6 +43,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), optional_vars: None, @@ -62,6 +63,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -97,6 +101,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), optional_vars: None, @@ -129,6 +134,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -164,6 +172,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), optional_vars: None, @@ -196,6 +205,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -239,6 +251,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -291,6 +306,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -351,6 +369,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -424,6 +445,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -486,11 +510,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], parenthesized: true, @@ -526,6 +554,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -561,12 +592,16 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), optional_vars: None, }, ], body: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), For( @@ -609,11 +644,17 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), body: [], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), Expr( @@ -669,6 +710,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -721,6 +765,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], parenthesized: true, @@ -756,6 +802,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -798,12 +847,16 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), optional_vars: None, }, ], body: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), For( @@ -843,10 +896,15 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), body: [], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), Expr( @@ -924,6 +982,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -989,6 +1050,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -1032,6 +1096,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), optional_vars: None, @@ -1051,6 +1116,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -1104,6 +1172,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ), @@ -1112,6 +1181,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), optional_vars: None, @@ -1131,6 +1201,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -1172,6 +1245,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), optional_vars: None, @@ -1191,6 +1265,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -1236,6 +1313,9 @@ Module( }, ], body: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), AnnAssign( @@ -1258,6 +1338,7 @@ Module( ), value: None, simple: true, + runtime_simple: None, }, ), With( @@ -1303,6 +1384,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], parenthesized: true, @@ -1334,6 +1417,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -1366,6 +1452,9 @@ Module( }, ], body: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), Expr( @@ -1410,6 +1499,9 @@ Module( }, ], body: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), AnnAssign( @@ -1432,6 +1524,7 @@ Module( ), value: None, simple: true, + runtime_simple: None, }, ), With( @@ -1464,6 +1557,9 @@ Module( }, ], body: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), AnnAssign( @@ -1486,6 +1582,7 @@ Module( ), value: None, simple: true, + runtime_simple: None, }, ), With( @@ -1559,9 +1656,13 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__empty_with_items.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__empty_with_items.py.snap index 6b0b38c2e329c..90788327da591 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__empty_with_items.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__empty_with_items.py.snap @@ -30,6 +30,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), Expr( @@ -62,6 +65,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__unclosed_ambiguous_lpar.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__unclosed_ambiguous_lpar.py.snap index b1fee5d797b33..c682d058a4301 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__unclosed_ambiguous_lpar.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__unclosed_ambiguous_lpar.py.snap @@ -61,9 +61,13 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__unclosed_ambiguous_lpar_eof.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__unclosed_ambiguous_lpar_eof.py.snap index 6724cfec7005d..d660854359bbc 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__unclosed_ambiguous_lpar_eof.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__unclosed_ambiguous_lpar_eof.py.snap @@ -31,9 +31,13 @@ Module( }, ], body: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__unparenthesized_with_items.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__unparenthesized_with_items.py.snap index 9f31d95dd880f..eb6936881a9c4 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__unparenthesized_with_items.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@statements__with__unparenthesized_with_items.py.snap @@ -38,6 +38,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -77,6 +80,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -114,6 +120,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -160,6 +169,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -219,6 +231,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -278,6 +293,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -331,9 +349,13 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_empty_expression.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_empty_expression.py.snap index 7133e8b63fcab..b138de089a545 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_empty_expression.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_empty_expression.py.snap @@ -39,6 +39,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -51,6 +54,8 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -84,6 +89,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -96,11 +104,14 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_invalid_conversion_flag_name_tok.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_invalid_conversion_flag_name_tok.py.snap index 55f34a110b1da..4f21af3fdf176 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_invalid_conversion_flag_name_tok.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_invalid_conversion_flag_name_tok.py.snap @@ -39,6 +39,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -51,11 +54,14 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_invalid_conversion_flag_other_tok.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_invalid_conversion_flag_other_tok.py.snap index 0c729b6c50f0d..a8bf46bf3510f 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_invalid_conversion_flag_other_tok.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_invalid_conversion_flag_other_tok.py.snap @@ -39,6 +39,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -51,6 +54,8 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -84,6 +89,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -96,11 +104,14 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_invalid_starred_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_invalid_starred_expr.py.snap index 29393932932ac..f3c9273601451 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_invalid_starred_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_invalid_starred_expr.py.snap @@ -46,6 +46,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -58,6 +61,8 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -107,6 +112,7 @@ Module( }, ), ], + runtime_values: None, }, ), ctx: Load, @@ -115,6 +121,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -127,6 +136,8 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -175,6 +186,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -187,11 +201,14 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_lambda_without_parentheses.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_lambda_without_parentheses.py.snap index b26d9cf4db8a2..58295a06342f3 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_lambda_without_parentheses.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_lambda_without_parentheses.py.snap @@ -50,6 +50,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -57,6 +59,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -72,6 +75,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -91,11 +97,14 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_unclosed_lbrace.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_unclosed_lbrace.py.snap index e755d104ba5fa..537d55c71ce18 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_unclosed_lbrace.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_unclosed_lbrace.py.snap @@ -1,5 +1,6 @@ --- source: crates/ruff_python_parser/tests/fixtures.rs +input_file: crates/ruff_python_parser/resources/inline/err/t_string_unclosed_lbrace.py --- ## AST @@ -38,6 +39,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -50,6 +54,8 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -83,6 +89,9 @@ Module( debug_text: None, conversion: Repr, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -95,6 +104,8 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -134,6 +145,9 @@ Module( ), conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -146,6 +160,8 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -179,6 +195,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -191,6 +210,8 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -224,6 +245,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -236,11 +260,14 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_unclosed_lbrace_in_format_spec.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_unclosed_lbrace_in_format_spec.py.snap index 5efaaaebe1542..e03d8fd7a80fc 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_unclosed_lbrace_in_format_spec.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@t_string_unclosed_lbrace_in_format_spec.py.snap @@ -52,6 +52,9 @@ Module( elements: [], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -64,6 +67,8 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -118,6 +123,9 @@ Module( ], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -130,11 +138,14 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@template_strings_py313.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@template_strings_py313.py.snap index aaa2aed20ff70..71a16208b62b5 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@template_strings_py313.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@template_strings_py313.py.snap @@ -39,6 +39,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -51,6 +54,8 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -84,6 +89,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -96,6 +104,8 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -131,11 +141,14 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@try_stmt_invalid_order.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@try_stmt_invalid_order.py.snap index 193c1c8269667..29a0b9d0424c8 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@try_stmt_invalid_order.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@try_stmt_invalid_order.py.snap @@ -33,6 +33,10 @@ Module( ), ], is_star: false, + runtime_body: None, + runtime_handlers: None, + runtime_orelse: None, + runtime_finalbody: None, }, ), Pass( @@ -42,6 +46,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@try_stmt_missing_except_finally.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@try_stmt_missing_except_finally.py.snap index 6368dc0cd1822..796dc5b05160e 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@try_stmt_missing_except_finally.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@try_stmt_missing_except_finally.py.snap @@ -26,6 +26,10 @@ Module( orelse: [], finalbody: [], is_star: false, + runtime_body: None, + runtime_handlers: None, + runtime_orelse: None, + runtime_finalbody: None, }, ), Try( @@ -51,9 +55,14 @@ Module( ], finalbody: [], is_star: false, + runtime_body: None, + runtime_handlers: None, + runtime_orelse: None, + runtime_finalbody: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@try_stmt_misspelled_except.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@try_stmt_misspelled_except.py.snap index e65db427d0db0..e47df6f48a6b2 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@try_stmt_misspelled_except.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@try_stmt_misspelled_except.py.snap @@ -26,6 +26,10 @@ Module( orelse: [], finalbody: [], is_star: false, + runtime_body: None, + runtime_handlers: None, + runtime_orelse: None, + runtime_finalbody: None, }, ), AnnAssign( @@ -50,6 +54,7 @@ Module( ), value: None, simple: true, + runtime_simple: None, }, ), Pass( @@ -87,6 +92,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Try( @@ -116,12 +124,17 @@ Module( }, ), ], + runtime_body: None, }, ), ], orelse: [], finalbody: [], is_star: false, + runtime_body: None, + runtime_handlers: None, + runtime_orelse: None, + runtime_finalbody: None, }, ), AnnAssign( @@ -146,6 +159,7 @@ Module( ), value: None, simple: true, + runtime_simple: None, }, ), Pass( @@ -177,9 +191,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@try_stmt_mixed_except_kind.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@try_stmt_mixed_except_kind.py.snap index 62db5271c7b96..7b4ed7c1d41ce 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@try_stmt_mixed_except_kind.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@try_stmt_mixed_except_kind.py.snap @@ -37,6 +37,7 @@ Module( }, ), ], + runtime_body: None, }, ), ExceptHandler( @@ -62,12 +63,17 @@ Module( }, ), ], + runtime_body: None, }, ), ], orelse: [], finalbody: [], is_star: false, + runtime_body: None, + runtime_handlers: None, + runtime_orelse: None, + runtime_finalbody: None, }, ), Try( @@ -106,6 +112,7 @@ Module( }, ), ], + runtime_body: None, }, ), ExceptHandler( @@ -122,12 +129,17 @@ Module( }, ), ], + runtime_body: None, }, ), ], orelse: [], finalbody: [], is_star: true, + runtime_body: None, + runtime_handlers: None, + runtime_orelse: None, + runtime_finalbody: None, }, ), Try( @@ -157,6 +169,7 @@ Module( }, ), ], + runtime_body: None, }, ), ExceptHandler( @@ -173,6 +186,7 @@ Module( }, ), ], + runtime_body: None, }, ), ExceptHandler( @@ -198,6 +212,7 @@ Module( }, ), ], + runtime_body: None, }, ), ExceptHandler( @@ -223,15 +238,21 @@ Module( }, ), ], + runtime_body: None, }, ), ], orelse: [], finalbody: [], is_star: false, + runtime_body: None, + runtime_handlers: None, + runtime_orelse: None, + runtime_finalbody: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@tuple_context_manager_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@tuple_context_manager_py38.py.snap index 059a866b5dd31..1789f423bc317 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@tuple_context_manager_py38.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@tuple_context_manager_py38.py.snap @@ -57,6 +57,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -119,6 +122,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -155,9 +161,13 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_alias_incomplete_stmt.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_alias_incomplete_stmt.py.snap index eb26aa58f7f83..5cf9ea4c23dc7 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_alias_incomplete_stmt.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_alias_incomplete_stmt.py.snap @@ -76,6 +76,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_alias_invalid_value_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_alias_invalid_value_expr.py.snap index 9e9d4f715353e..302d83f26ab43 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_alias_invalid_value_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_alias_invalid_value_expr.py.snap @@ -139,6 +139,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_default_py312.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_default_py312.py.snap index d20f30583a143..8e630eef9a60f 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_default_py312.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_default_py312.py.snap @@ -50,6 +50,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -101,6 +102,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), parameters: Parameters { @@ -111,6 +113,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -127,6 +130,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ClassDef( @@ -167,6 +174,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), arguments: Some( @@ -175,6 +183,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, ), body: [ @@ -191,6 +201,8 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), ClassDef( @@ -266,6 +278,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), arguments: Some( @@ -274,6 +287,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, ), body: [ @@ -290,9 +305,12 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_invalid_bound_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_invalid_bound_expr.py.snap index 56404f81d85a7..7ec1122512879 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_invalid_bound_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_invalid_bound_expr.py.snap @@ -57,6 +57,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -117,6 +118,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -175,6 +177,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -240,6 +243,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -253,6 +257,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_missing_bound.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_missing_bound.py.snap index 4a12a66c5d60e..3bd6e7b34d27a 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_missing_bound.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_missing_bound.py.snap @@ -41,6 +41,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -97,6 +98,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -110,6 +112,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_param_spec_bound.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_param_spec_bound.py.snap index 0a0d030f52034..670dbc560125c 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_param_spec_bound.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_param_spec_bound.py.snap @@ -40,6 +40,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -81,6 +82,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_param_spec_invalid_default_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_param_spec_invalid_default_expr.py.snap index 6e215c846a687..fea0747299472 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_param_spec_invalid_default_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_param_spec_invalid_default_expr.py.snap @@ -56,6 +56,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -115,6 +116,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -172,6 +174,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -236,6 +239,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -294,6 +298,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -307,6 +312,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_param_spec_missing_default.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_param_spec_missing_default.py.snap index 180df8a3edbf4..a98c4db657d70 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_param_spec_missing_default.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_param_spec_missing_default.py.snap @@ -40,6 +40,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -95,6 +96,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -108,6 +110,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_invalid_default_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_invalid_default_expr.py.snap index cc7032b9c67a6..f091bb8470c59 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_invalid_default_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_invalid_default_expr.py.snap @@ -57,6 +57,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -117,6 +118,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -177,6 +179,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -235,6 +238,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -300,6 +304,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -368,6 +373,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -381,6 +387,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_missing_default.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_missing_default.py.snap index 0b4f3f21836c5..b8955671641f8 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_missing_default.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_missing_default.py.snap @@ -41,6 +41,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -93,6 +94,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -149,6 +151,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -162,6 +165,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_tuple_bound.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_tuple_bound.py.snap index edeed69d21dec..fc3e1910bc06f 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_tuple_bound.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_tuple_bound.py.snap @@ -40,6 +40,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -81,6 +82,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_tuple_invalid_default_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_tuple_invalid_default_expr.py.snap index f5fd209fbec59..27b9a9e9be279 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_tuple_invalid_default_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_tuple_invalid_default_expr.py.snap @@ -56,6 +56,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -122,6 +123,7 @@ Module( }, ), ], + runtime_values: None, }, ), ctx: Load, @@ -131,6 +133,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -190,6 +193,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -247,6 +251,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -311,6 +316,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -324,6 +330,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_tuple_missing_default.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_tuple_missing_default.py.snap index f31c1fae6416d..5154228ced2b9 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_tuple_missing_default.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_param_type_var_tuple_missing_default.py.snap @@ -40,6 +40,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -95,6 +96,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -108,6 +110,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_parameter_default_order.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_parameter_default_order.py.snap index 6d6b2fe73e998..1701e91ad67b5 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_parameter_default_order.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_parameter_default_order.py.snap @@ -61,6 +61,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), arguments: None, @@ -78,6 +79,8 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), ClassDef( @@ -157,6 +160,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), arguments: None, @@ -174,6 +178,8 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), FunctionDef( @@ -228,6 +234,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), parameters: Parameters { @@ -238,6 +245,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -254,6 +262,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), TypeAlias( @@ -309,6 +321,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: EllipsisLiteral( @@ -320,6 +333,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_params_empty.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_params_empty.py.snap index d28237e35fd8a..3d025fc8e7d72 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_params_empty.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_params_empty.py.snap @@ -26,6 +26,7 @@ Module( range: 7..9, node_index: NodeIndex(None), type_params: [], + runtime_type_params: None, }, ), parameters: Parameters { @@ -36,6 +37,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -46,6 +48,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), TypeAlias( @@ -65,6 +71,7 @@ Module( range: 36..38, node_index: NodeIndex(None), type_params: [], + runtime_type_params: None, }, ), value: BinOp( @@ -93,6 +100,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_stmt_py311.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_stmt_py311.py.snap index 227ca0f7fe411..254f5836b8055 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_stmt_py311.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@type_stmt_py311.py.snap @@ -34,6 +34,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@unparenthesized_named_expr_index_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@unparenthesized_named_expr_index_py38.py.snap index c144ff3d3a441..4dcf2f8ae0969 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@unparenthesized_named_expr_index_py38.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@unparenthesized_named_expr_index_py38.py.snap @@ -55,6 +55,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@unparenthesized_named_expr_set_comp_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@unparenthesized_named_expr_set_comp_py38.py.snap index ecc5a6040e597..050eb729b9543 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@unparenthesized_named_expr_set_comp_py38.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@unparenthesized_named_expr_set_comp_py38.py.snap @@ -79,11 +79,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -91,6 +95,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@unparenthesized_named_expr_set_literal_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@unparenthesized_named_expr_set_literal_py38.py.snap index 3d999f8721c7a..b64439fa5aace 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@unparenthesized_named_expr_set_literal_py38.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@unparenthesized_named_expr_set_literal_py38.py.snap @@ -61,6 +61,7 @@ Module( }, ), ], + runtime_elts: None, }, ), }, @@ -116,6 +117,7 @@ Module( }, ), ], + runtime_elts: None, }, ), }, @@ -171,11 +173,13 @@ Module( }, ), ], + runtime_elts: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@unterminated_fstring_newline_recovery.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@unterminated_fstring_newline_recovery.py.snap index 7ed7f32534bbc..6cb728f12c1b0 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@unterminated_fstring_newline_recovery.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@unterminated_fstring_newline_recovery.py.snap @@ -43,6 +43,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -115,6 +117,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -128,6 +133,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -206,6 +213,9 @@ Module( elements: [], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -219,6 +229,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -291,6 +303,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -304,6 +319,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -340,6 +357,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@walrus_py37.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@walrus_py37.py.snap index e712c5694089d..fe893f88a023b 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@walrus_py37.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@walrus_py37.py.snap @@ -40,6 +40,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@while_stmt_invalid_test_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@while_stmt_invalid_test_expr.py.snap index e6637b1f496d5..910fe8fa7b20d 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@while_stmt_invalid_test_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@while_stmt_invalid_test_expr.py.snap @@ -44,6 +44,8 @@ Module( ), ], orelse: [], + runtime_body: None, + runtime_orelse: None, }, ), While( @@ -81,6 +83,8 @@ Module( ), ], orelse: [], + runtime_body: None, + runtime_orelse: None, }, ), While( @@ -97,6 +101,8 @@ Module( ), body: [], orelse: [], + runtime_body: None, + runtime_orelse: None, }, ), AnnAssign( @@ -119,6 +125,7 @@ Module( ), value: None, simple: true, + runtime_simple: None, }, ), While( @@ -150,6 +157,8 @@ Module( ), body: [], orelse: [], + runtime_body: None, + runtime_orelse: None, }, ), AnnAssign( @@ -172,9 +181,11 @@ Module( ), value: None, simple: true, + runtime_simple: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@while_stmt_missing_colon.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@while_stmt_missing_colon.py.snap index 9ad6e6213276d..eca0f6e9ae4cc 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@while_stmt_missing_colon.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@while_stmt_missing_colon.py.snap @@ -40,6 +40,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), body: [ @@ -51,9 +52,12 @@ Module( ), ], orelse: [], + runtime_body: None, + runtime_orelse: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@while_stmt_missing_test.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@while_stmt_missing_test.py.snap index be86004a045d1..817161e3b1c74 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@while_stmt_missing_test.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@while_stmt_missing_test.py.snap @@ -37,6 +37,8 @@ Module( ), ], orelse: [], + runtime_body: None, + runtime_orelse: None, }, ), While( @@ -75,13 +77,19 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], orelse: [], + runtime_body: None, + runtime_orelse: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@with_items_parenthesized_missing_colon.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@with_items_parenthesized_missing_colon.py.snap index 817368aa22c72..cf300bb6502b6 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@with_items_parenthesized_missing_colon.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@with_items_parenthesized_missing_colon.py.snap @@ -51,9 +51,13 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@with_items_parenthesized_missing_comma.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@with_items_parenthesized_missing_comma.py.snap index c756775e3b8fd..16877b562d058 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@with_items_parenthesized_missing_comma.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@with_items_parenthesized_missing_comma.py.snap @@ -57,6 +57,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -115,6 +118,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -190,6 +196,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -274,6 +283,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -309,6 +321,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), optional_vars: None, @@ -328,9 +341,13 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@write_to_debug_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@write_to_debug_expr.py.snap index b23970c545bc8..e2a4686457158 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@write_to_debug_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@write_to_debug_expr.py.snap @@ -24,6 +24,7 @@ Module( }, ), ], + runtime_targets: None, }, ), Delete( @@ -64,6 +65,7 @@ Module( }, ), ], + runtime_targets: None, }, ), Assign( @@ -89,6 +91,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -136,6 +141,7 @@ Module( ], ctx: Store, parenthesized: false, + runtime_elts: None, }, ), ], @@ -183,11 +189,16 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@yield_after_comma.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@yield_after_comma.py.snap index 78d8a6437b3ee..e7db000f7fc0f 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@yield_after_comma.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@yield_after_comma.py.snap @@ -30,6 +30,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -71,14 +72,20 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@yield_from_in_async_function.py.snap b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@yield_from_in_async_function.py.snap index f040e673c2a8d..979ca5cb5aa4c 100644 --- a/crates/ruff_python_parser/tests/snapshots/invalid_syntax@yield_from_in_async_function.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/invalid_syntax@yield_from_in_async_function.py.snap @@ -30,6 +30,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -54,9 +55,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@all_async_comprehension_py310.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@all_async_comprehension_py310.py.snap index 7982e188e27ee..b8d909df3999f 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@all_async_comprehension_py310.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@all_async_comprehension_py310.py.snap @@ -30,6 +30,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -92,11 +93,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: true, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -140,11 +145,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: true, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -153,9 +162,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@ambiguous_lpar_with_items_binary_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@ambiguous_lpar_with_items_binary_expr.py.snap index 0e73bb0c25c88..599908a1a54e6 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@ambiguous_lpar_with_items_binary_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@ambiguous_lpar_with_items_binary_expr.py.snap @@ -42,6 +42,7 @@ Module( }, ), ], + runtime_values: None, }, ), optional_vars: None, @@ -61,6 +62,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -97,6 +101,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), optional_vars: None, @@ -116,6 +121,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -164,9 +172,11 @@ Module( }, ), ], + runtime_values: None, }, ), ], + runtime_values: None, }, ), optional_vars: None, @@ -186,6 +196,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -226,6 +239,7 @@ Module( }, ), ], + runtime_values: None, }, ), Name( @@ -237,6 +251,7 @@ Module( }, ), ], + runtime_values: None, }, ), optional_vars: None, @@ -256,6 +271,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -337,6 +355,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -419,9 +440,13 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@ambiguous_lpar_with_items_if_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@ambiguous_lpar_with_items_if_expr.py.snap index d035e3bff61ca..392db6ab6b0ac 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@ambiguous_lpar_with_items_if_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@ambiguous_lpar_with_items_if_expr.py.snap @@ -65,6 +65,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -121,6 +124,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], parenthesized: true, @@ -153,6 +158,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -209,6 +217,8 @@ Module( ), ifs: [], is_async: true, + runtime_ifs: None, + runtime_is_async: None, }, ], parenthesized: true, @@ -241,6 +251,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -314,9 +327,13 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@ann_assign_stmt_simple_target.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@ann_assign_stmt_simple_target.py.snap index 36a6809370615..489ac97c513ef 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@ann_assign_stmt_simple_target.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@ann_assign_stmt_simple_target.py.snap @@ -32,6 +32,7 @@ Module( ), value: None, simple: true, + runtime_simple: None, }, ), AnnAssign( @@ -56,6 +57,7 @@ Module( ), value: None, simple: false, + runtime_simple: None, }, ), AnnAssign( @@ -92,6 +94,7 @@ Module( ), value: None, simple: false, + runtime_simple: None, }, ), AnnAssign( @@ -132,9 +135,11 @@ Module( ), value: None, simple: false, + runtime_simple: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@args_unparenthesized_generator.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@args_unparenthesized_generator.py.snap index 495601cfa5ed3..d642cc4385c97 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@args_unparenthesized_generator.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@args_unparenthesized_generator.py.snap @@ -81,11 +81,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], parenthesized: true, @@ -142,11 +146,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], parenthesized: true, @@ -154,6 +162,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -230,11 +240,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], parenthesized: false, @@ -242,6 +256,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -318,11 +334,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], parenthesized: true, @@ -330,12 +350,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@assign_stmt_starred_expr_value.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@assign_stmt_starred_expr_value.py.snap index 1fe9bc4e9c1e2..765ee3c0413ff 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@assign_stmt_starred_expr_value.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@assign_stmt_starred_expr_value.py.snap @@ -33,6 +33,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -65,8 +68,12 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -108,6 +115,7 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), ctx: Load, @@ -116,8 +124,12 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -159,6 +171,7 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), ctx: Load, @@ -167,11 +180,16 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@assign_targets_terminator.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@assign_targets_terminator.py.snap index 5d1a27f814f9e..b1b6ed81a9071 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@assign_targets_terminator.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@assign_targets_terminator.py.snap @@ -49,6 +49,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Expr( @@ -79,6 +82,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), }, @@ -122,6 +126,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Expr( @@ -152,11 +159,13 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@async_for_statement.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@async_for_statement.py.snap index 5443d07ff3e14..dddb2497a77bb 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@async_for_statement.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@async_for_statement.py.snap @@ -46,9 +46,14 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@async_function_definition.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@async_function_definition.py.snap index d3fe2817d2874..241ee75102052 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@async_function_definition.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@async_function_definition.py.snap @@ -30,6 +30,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -46,9 +47,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@async_with_statement.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@async_with_statement.py.snap index d653933f323f2..d5a984a080813 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@async_with_statement.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@async_with_statement.py.snap @@ -44,9 +44,13 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@backslash_continuation_indentation.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@backslash_continuation_indentation.py.snap index d38904b2c4b15..dff398280850f 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@backslash_continuation_indentation.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@backslash_continuation_indentation.py.snap @@ -75,11 +75,15 @@ Module( }, ), ], + runtime_body: None, + runtime_orelse: None, }, ], + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@class_def_arguments.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@class_def_arguments.py.snap index 6a275e46d095b..48e73cf25d91a 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@class_def_arguments.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@class_def_arguments.py.snap @@ -36,6 +36,8 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), ClassDef( @@ -55,6 +57,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, ), body: [ @@ -71,6 +75,8 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), ClassDef( @@ -123,6 +129,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], parenthesized: true, @@ -130,6 +138,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, ), body: [ @@ -146,6 +156,8 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), ClassDef( @@ -202,6 +214,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], parenthesized: true, @@ -212,6 +226,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, ), body: [ @@ -228,9 +244,12 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@class_keyword_in_case_pattern.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@class_keyword_in_case_pattern.py.snap index a732e866b3b81..8eeefbb0d9461 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@class_keyword_in_case_pattern.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@class_keyword_in_case_pattern.py.snap @@ -69,6 +69,9 @@ Module( }, ], }, + runtime_patterns: None, + runtime_kwd_attrs: None, + runtime_kwd_patterns: None, }, ), guard: None, @@ -86,11 +89,13 @@ Module( }, ), ], + runtime_body: None, }, ], }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@class_type_params_py312.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@class_type_params_py312.py.snap index 85a9bc9f7898f..53d495ec47a4c 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@class_type_params_py312.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@class_type_params_py312.py.snap @@ -59,6 +59,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), ), @@ -112,6 +113,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), arguments: None, @@ -129,9 +131,12 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@comma_separated_regular_list_terminator.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@comma_separated_regular_list_terminator.py.snap index c755a0542b10f..d6821b6a66c08 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@comma_separated_regular_list_terminator.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@comma_separated_regular_list_terminator.py.snap @@ -30,6 +30,7 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), }, @@ -63,6 +64,7 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), }, @@ -96,6 +98,7 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), }, @@ -138,6 +141,7 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), }, @@ -180,11 +184,13 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@debug_rename_import.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@debug_rename_import.py.snap index b96eb28938ea4..9958598821880 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@debug_rename_import.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@debug_rename_import.py.snap @@ -60,6 +60,7 @@ Module( ], level: 0, is_lazy: false, + runtime_level: None, }, ), ImportFrom( @@ -93,9 +94,11 @@ Module( ], level: 0, is_lazy: false, + runtime_level: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_async_function.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_async_function.py.snap index 7d009ac3d44c1..6f9920b1a8b49 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_async_function.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_async_function.py.snap @@ -43,6 +43,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -59,9 +60,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_await_expression_py39.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_await_expression_py39.py.snap index 957a81dd4fb4a..dbccc2cd459ac 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_await_expression_py39.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_await_expression_py39.py.snap @@ -30,6 +30,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -72,6 +73,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -88,12 +90,21 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_expression_dotted_ident_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_expression_dotted_ident_py38.py.snap index 578a528c1d761..9fc89e09f80f7 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_expression_dotted_ident_py38.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_expression_dotted_ident_py38.py.snap @@ -67,6 +67,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -83,9 +84,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_expression_eval_hack_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_expression_eval_hack_py38.py.snap index fb3322b7a7daa..144d0714d5ed5 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_expression_eval_hack_py38.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_expression_eval_hack_py38.py.snap @@ -58,6 +58,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -77,6 +79,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -93,9 +96,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_expression_identity_hack_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_expression_identity_hack_py38.py.snap index 3250a9ad0fd2c..d1258b1e9ff40 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_expression_identity_hack_py38.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_expression_identity_hack_py38.py.snap @@ -39,6 +39,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -46,6 +48,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -66,6 +69,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -143,6 +150,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -162,6 +171,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -178,9 +188,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_expression_py39.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_expression_py39.py.snap index dca975e0e9802..2af32084e26e4 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_expression_py39.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@decorator_expression_py39.py.snap @@ -83,6 +83,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -99,6 +100,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -148,6 +153,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -155,6 +162,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -183,6 +191,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -202,6 +212,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -218,9 +229,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@del_debug_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@del_debug_py38.py.snap index e3595cb15786a..7b998968a6956 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@del_debug_py38.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@del_debug_py38.py.snap @@ -24,9 +24,11 @@ Module( }, ), ], + runtime_targets: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@del_targets_terminator.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@del_targets_terminator.py.snap index 2c6467849cf96..9ffff67db0513 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@del_targets_terminator.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@del_targets_terminator.py.snap @@ -32,6 +32,7 @@ Module( }, ), ], + runtime_targets: None, }, ), Expr( @@ -62,6 +63,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), }, @@ -88,6 +90,7 @@ Module( }, ), ], + runtime_targets: None, }, ), Expr( @@ -118,11 +121,13 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@different_match_pattern_bindings.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@different_match_pattern_bindings.py.snap index 27052180223f1..e6e35bef1457a 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@different_match_pattern_bindings.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@different_match_pattern_bindings.py.snap @@ -51,6 +51,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), MatchSequence( @@ -73,9 +74,11 @@ Module( }, ), ], + runtime_patterns: None, }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -93,6 +96,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 37..62, @@ -136,6 +140,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), MatchSequence( @@ -172,9 +177,11 @@ Module( }, ), ], + runtime_patterns: None, }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -192,6 +199,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 67..89, @@ -249,9 +257,11 @@ Module( }, ), ], + runtime_patterns: None, }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -269,6 +279,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 94..119, @@ -306,6 +317,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), MatchSequence( @@ -336,9 +348,11 @@ Module( }, ), ], + runtime_patterns: None, }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -356,6 +370,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 124..146, @@ -385,6 +400,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), MatchSequence( @@ -425,12 +441,17 @@ Module( ], keywords: [], }, + runtime_patterns: None, + runtime_kwd_attrs: None, + runtime_kwd_patterns: None, }, ), ], + runtime_patterns: None, }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -448,11 +469,13 @@ Module( }, ), ], + runtime_body: None, }, ], }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@dotted_name_normalized_spaces.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@dotted_name_normalized_spaces.py.snap index 6bb8c42dcb079..a84349cbc01b9 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@dotted_name_normalized_spaces.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@dotted_name_normalized_spaces.py.snap @@ -49,6 +49,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@duplicate_match_key_attr.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@duplicate_match_key_attr.py.snap index e090cde33989f..469d718161c92 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@duplicate_match_key_attr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@duplicate_match_key_attr.py.snap @@ -105,6 +105,8 @@ Module( ), ], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), guard: None, @@ -122,11 +124,13 @@ Module( }, ), ], + runtime_body: None, }, ], }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@except_star_py311.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@except_star_py311.py.snap index f4f83b064f903..19a0d8612ba8d 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@except_star_py311.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@except_star_py311.py.snap @@ -58,15 +58,21 @@ Module( }, ), ], + runtime_body: None, }, ), ], orelse: [], finalbody: [], is_star: true, + runtime_body: None, + runtime_handlers: None, + runtime_orelse: None, + runtime_finalbody: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@except_stmt_as_name_soft_keyword.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@except_stmt_as_name_soft_keyword.py.snap index d6f25ac1cc6ff..fb2e39f86e47a 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@except_stmt_as_name_soft_keyword.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@except_stmt_as_name_soft_keyword.py.snap @@ -64,6 +64,7 @@ Module( }, ), ], + runtime_body: None, }, ), ExceptHandler( @@ -101,6 +102,7 @@ Module( }, ), ], + runtime_body: None, }, ), ExceptHandler( @@ -138,15 +140,21 @@ Module( }, ), ], + runtime_body: None, }, ), ], orelse: [], finalbody: [], is_star: false, + runtime_body: None, + runtime_handlers: None, + runtime_orelse: None, + runtime_finalbody: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@except_stmt_unparenthesized_tuple_no_as_py314.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@except_stmt_unparenthesized_tuple_no_as_py314.py.snap index 2d4a97a396148..b4c3d0150e0cc 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@except_stmt_unparenthesized_tuple_no_as_py314.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@except_stmt_unparenthesized_tuple_no_as_py314.py.snap @@ -52,6 +52,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ), @@ -64,12 +65,17 @@ Module( }, ), ], + runtime_body: None, }, ), ], orelse: [], finalbody: [], is_star: false, + runtime_body: None, + runtime_handlers: None, + runtime_orelse: None, + runtime_finalbody: None, }, ), Try( @@ -114,6 +120,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ), @@ -126,15 +133,21 @@ Module( }, ), ], + runtime_body: None, }, ), ], orelse: [], finalbody: [], is_star: true, + runtime_body: None, + runtime_handlers: None, + runtime_orelse: None, + runtime_finalbody: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__arguments.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__arguments.py.snap index 05f893a42cd16..4793d3eb05c8d 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__arguments.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__arguments.py.snap @@ -31,6 +31,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -74,6 +76,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -117,6 +121,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -184,6 +190,8 @@ Module( ), }, ], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -226,6 +234,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -266,6 +276,8 @@ Module( ), }, ], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -322,6 +334,8 @@ Module( ), }, ], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -372,6 +386,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -421,6 +437,8 @@ Module( ), }, ], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -484,6 +502,8 @@ Module( ), }, ], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -544,6 +564,8 @@ Module( ), }, ], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -600,6 +622,8 @@ Module( ), }, ], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -658,6 +682,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -738,6 +764,8 @@ Module( ), }, ], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -822,6 +850,8 @@ Module( ), }, ], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -902,6 +932,8 @@ Module( ), }, ], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -971,6 +1003,8 @@ Module( ), }, ], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -1023,6 +1057,8 @@ Module( ), }, ], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -1081,6 +1117,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1088,6 +1126,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -1102,6 +1141,8 @@ Module( ), }, ], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -1163,6 +1204,8 @@ Module( ), }, ], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -1206,6 +1249,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -1247,6 +1292,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -1297,6 +1344,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -1371,6 +1420,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], parenthesized: false, @@ -1378,6 +1429,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -1430,6 +1483,7 @@ Module( }, ), ], + runtime_values: None, }, ), ctx: Load, @@ -1437,6 +1491,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -1494,6 +1550,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -1542,6 +1600,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -1593,6 +1653,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1600,6 +1662,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -1617,6 +1680,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -1680,6 +1745,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -1720,6 +1787,8 @@ Module( ), }, ], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -1773,10 +1842,13 @@ Module( }, ), ], + runtime_values: None, }, ), }, ], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -1823,6 +1895,8 @@ Module( ), }, ], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -1884,6 +1958,8 @@ Module( ), }, ], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -1932,6 +2008,8 @@ Module( ), }, ], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -1984,6 +2062,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1991,6 +2071,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -2005,12 +2086,15 @@ Module( ), }, ], + runtime_args: None, + runtime_bases: None, }, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__attribute.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__attribute.py.snap index baa336d282c40..eabdf4f526038 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__attribute.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__attribute.py.snap @@ -69,6 +69,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -99,6 +101,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -145,6 +149,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -161,6 +167,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -249,6 +257,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -263,6 +273,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__await.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__await.py.snap index 4b39468468300..afc6b3304ba8e 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__await.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__await.py.snap @@ -99,6 +99,7 @@ Module( }, ), ], + runtime_values: None, }, ), }, @@ -128,6 +129,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -168,6 +171,7 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), }, @@ -206,6 +210,7 @@ Module( }, ), ], + runtime_elts: None, }, ), }, @@ -247,6 +252,7 @@ Module( ), }, ], + runtime_values: None, }, ), }, @@ -289,6 +295,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), }, @@ -327,6 +334,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), }, @@ -370,6 +378,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), }, @@ -444,6 +453,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), }, @@ -480,6 +490,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -487,6 +499,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -587,6 +600,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__bin_op.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__bin_op.py.snap index 3b4a7feb7b101..16ae5839abc60 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__bin_op.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__bin_op.py.snap @@ -1193,6 +1193,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__bool_op.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__bool_op.py.snap index 90362fa9dd0f1..c244320f939ee 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__bool_op.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__bool_op.py.snap @@ -37,6 +37,7 @@ Module( }, ), ], + runtime_values: None, }, ), }, @@ -76,6 +77,7 @@ Module( }, ), ], + runtime_values: None, }, ), }, @@ -107,6 +109,7 @@ Module( }, ), ], + runtime_values: None, }, ), }, @@ -146,6 +149,7 @@ Module( }, ), ], + runtime_values: None, }, ), }, @@ -183,6 +187,7 @@ Module( }, ), ], + runtime_values: None, }, ), Name( @@ -194,6 +199,7 @@ Module( }, ), ], + runtime_values: None, }, ), }, @@ -239,6 +245,7 @@ Module( }, ), ], + runtime_values: None, }, ), Name( @@ -272,6 +279,7 @@ Module( }, ), ], + runtime_values: None, }, ), Name( @@ -283,6 +291,7 @@ Module( }, ), ], + runtime_values: None, }, ), }, @@ -327,6 +336,7 @@ Module( }, ), ], + runtime_values: None, }, ), Name( @@ -338,6 +348,7 @@ Module( }, ), ], + runtime_values: None, }, ), }, @@ -380,6 +391,7 @@ Module( }, ), ], + runtime_values: None, }, ), Name( @@ -391,6 +403,7 @@ Module( }, ), ], + runtime_values: None, }, ), ), @@ -438,6 +451,7 @@ Module( }, ), ], + runtime_values: None, }, ), Name( @@ -449,11 +463,13 @@ Module( }, ), ], + runtime_values: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__call.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__call.py.snap index 5f931e1947ac5..26219b4e8e293 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__call.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__call.py.snap @@ -31,6 +31,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -69,6 +71,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -120,6 +124,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ctx: Load, @@ -130,6 +135,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -182,6 +189,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -229,6 +238,7 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), arguments: Arguments { @@ -236,6 +246,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -284,6 +296,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), arguments: Arguments { @@ -291,6 +304,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -338,6 +353,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], parenthesized: true, @@ -348,6 +365,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -394,6 +413,7 @@ Module( }, ), ], + runtime_elts: None, }, ), arguments: Arguments { @@ -401,6 +421,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -464,6 +486,7 @@ Module( ), }, ], + runtime_values: None, }, ), arguments: Arguments { @@ -471,6 +494,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -505,6 +530,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -530,6 +557,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -555,6 +584,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -579,6 +610,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -618,6 +651,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -645,6 +680,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -672,12 +709,15 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__compare.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__compare.py.snap index ef4b3720a0461..86340d7423b14 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__compare.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__compare.py.snap @@ -39,6 +39,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), }, @@ -72,6 +73,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), }, @@ -105,6 +107,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), }, @@ -138,6 +141,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), }, @@ -171,6 +175,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), }, @@ -204,6 +209,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), }, @@ -237,6 +243,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), }, @@ -270,6 +277,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), }, @@ -303,6 +311,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), }, @@ -336,6 +345,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), }, @@ -405,6 +415,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), }, @@ -492,6 +503,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), }, @@ -530,6 +542,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), }, @@ -585,6 +598,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), Name( @@ -596,9 +610,11 @@ Module( }, ), ], + runtime_values: None, }, ), ], + runtime_values: None, }, ), }, @@ -638,6 +654,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), }, @@ -677,6 +694,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), }, @@ -782,11 +800,13 @@ Module( }, ), ], + runtime_comparators: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__dictionary.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__dictionary.py.snap index 34a2ba29b61fa..7e89b43d9bb5c 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__dictionary.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__dictionary.py.snap @@ -19,6 +19,7 @@ Module( node_index: NodeIndex(None), range: 9..11, items: [], + runtime_values: None, }, ), }, @@ -55,6 +56,7 @@ Module( ), }, ], + runtime_values: None, }, ), }, @@ -145,6 +147,7 @@ Module( ), }, ], + runtime_values: None, }, ), }, @@ -158,6 +161,7 @@ Module( node_index: NodeIndex(None), range: 66..69, items: [], + runtime_values: None, }, ), }, @@ -216,6 +220,7 @@ Module( ), }, ], + runtime_values: None, }, ), }, @@ -259,6 +264,7 @@ Module( ), }, ], + runtime_values: None, }, ), ), @@ -307,14 +313,17 @@ Module( ), }, ], + runtime_values: None, }, ), }, ], + runtime_values: None, }, ), }, ], + runtime_values: None, }, ), }, @@ -352,6 +361,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -359,6 +370,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -383,6 +395,7 @@ Module( ), }, ], + runtime_values: None, }, ), }, @@ -442,6 +455,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -449,6 +464,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: NoneLiteral( @@ -494,6 +510,7 @@ Module( ), }, ], + runtime_values: None, }, ), }, @@ -543,6 +560,7 @@ Module( ), }, ], + runtime_values: None, }, ), }, @@ -607,6 +625,7 @@ Module( ), }, ], + runtime_values: None, }, ), }, @@ -632,6 +651,7 @@ Module( ), }, ], + runtime_values: None, }, ), }, @@ -677,6 +697,7 @@ Module( ), }, ], + runtime_values: None, }, ), }, @@ -713,6 +734,7 @@ Module( ), }, ], + runtime_values: None, }, ), }, @@ -830,6 +852,7 @@ Module( ), }, ], + runtime_values: None, }, ), }, @@ -919,10 +942,12 @@ Module( ), }, ], + runtime_values: None, }, ), }, ], + runtime_values: None, }, ), }, @@ -1007,11 +1032,14 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), }, ], + runtime_values: None, }, ), }, @@ -1044,6 +1072,7 @@ Module( ), }, ], + runtime_values: None, }, ), }, @@ -1100,6 +1129,7 @@ Module( ), }, ], + runtime_values: None, }, ), }, @@ -1190,11 +1220,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, Comprehension { range: 556..574, @@ -1234,11 +1268,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -1280,6 +1318,7 @@ Module( }, ), ], + runtime_elts: None, }, ), ), @@ -1332,10 +1371,12 @@ Module( ), }, ], + runtime_values: None, }, ), }, ], + runtime_values: None, }, ), }, @@ -1390,11 +1431,13 @@ Module( ), }, ], + runtime_values: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__dictionary_comprehension.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__dictionary_comprehension.py.snap index aca02dde86b39..27639732fe6e1 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__dictionary_comprehension.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__dictionary_comprehension.py.snap @@ -73,10 +73,13 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -131,6 +134,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -231,11 +236,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -330,6 +339,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), BoolOp( @@ -355,6 +365,7 @@ Module( }, ), ], + runtime_values: None, }, ), Name( @@ -367,6 +378,8 @@ Module( ), ], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -459,10 +472,13 @@ Module( }, ), ], + runtime_values: None, }, ), ], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, Comprehension { range: 156..175, @@ -509,10 +525,13 @@ Module( }, ), ], + runtime_comparators: None, }, ), ], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -589,10 +608,13 @@ Module( }, ), ], + runtime_values: None, }, ), ], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, Comprehension { range: 205..230, @@ -639,10 +661,13 @@ Module( }, ), ], + runtime_comparators: None, }, ), ], is_async: true, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -703,6 +728,7 @@ Module( ], ctx: Store, parenthesized: false, + runtime_elts: None, }, ), iter: Name( @@ -715,6 +741,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -777,6 +805,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -837,6 +867,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -903,6 +935,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -910,6 +944,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -924,6 +959,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -995,6 +1032,8 @@ Module( ), ], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -1064,6 +1103,8 @@ Module( ), ], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -1139,6 +1180,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1146,6 +1189,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -1160,6 +1204,8 @@ Module( ), ], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -1167,6 +1213,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__f_string.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__f_string.py.snap index ac894204d597e..d6f5caec1cd09 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__f_string.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__f_string.py.snap @@ -1,5 +1,6 @@ --- source: crates/ruff_python_parser/tests/fixtures.rs +input_file: crates/ruff_python_parser/resources/valid/expressions/f_string.py --- ## AST @@ -34,6 +35,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -63,6 +66,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -92,6 +97,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -121,6 +128,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -150,6 +159,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -197,6 +208,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -210,6 +224,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -244,6 +260,9 @@ Module( debug_text: None, conversion: Str, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -257,6 +276,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -297,11 +318,15 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -315,6 +340,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -365,6 +392,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), debug_text: None, @@ -376,6 +404,9 @@ Module( elements: [], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -389,6 +420,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -456,6 +489,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -468,6 +504,9 @@ Module( ], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -481,6 +520,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -548,6 +589,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -560,6 +604,9 @@ Module( ], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -573,6 +620,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -613,6 +662,9 @@ Module( ), conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -626,6 +678,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -680,6 +734,9 @@ Module( ], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -693,6 +750,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -733,6 +792,9 @@ Module( ), conversion: Str, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -746,6 +808,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -795,6 +859,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), debug_text: Some( @@ -806,6 +871,9 @@ Module( ), conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -819,6 +887,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -889,6 +959,9 @@ Module( ], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -902,6 +975,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), debug_text: None, @@ -921,6 +996,9 @@ Module( ], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -934,6 +1012,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -1011,6 +1091,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -1045,6 +1128,8 @@ Module( ], ), }, + runtime_joined_str: None, + runtime_values: None, }, ), ), @@ -1059,6 +1144,7 @@ Module( ), }, ], + runtime_values: None, }, ), }, @@ -1115,6 +1201,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 298..345, @@ -1171,6 +1258,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -1212,6 +1300,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -1250,6 +1341,9 @@ Module( ], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -1263,6 +1357,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -1300,6 +1396,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -1348,6 +1446,9 @@ Module( ], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -1361,6 +1462,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -1401,6 +1504,9 @@ Module( ), conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -1414,6 +1520,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -1455,6 +1563,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -1479,6 +1590,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -1503,6 +1617,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -1523,6 +1640,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -1564,6 +1683,9 @@ Module( debug_text: None, conversion: Ascii, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -1588,6 +1710,9 @@ Module( debug_text: None, conversion: Str, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -1612,6 +1737,9 @@ Module( debug_text: None, conversion: Repr, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -1636,6 +1764,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -1649,6 +1780,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -1704,6 +1837,9 @@ Module( ], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -1717,6 +1853,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -1782,6 +1920,7 @@ Module( }, ), ], + runtime_elts: None, }, ), attr: Identifier { @@ -1797,17 +1936,25 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -1821,6 +1968,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -1866,6 +2015,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1873,6 +2024,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Set( @@ -1889,6 +2041,7 @@ Module( }, ), ], + runtime_elts: None, }, ), }, @@ -1896,6 +2049,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -1909,6 +2065,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -1949,6 +2107,9 @@ Module( ), conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -1962,6 +2123,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -2002,6 +2165,9 @@ Module( ), conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -2015,6 +2181,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -2055,6 +2223,9 @@ Module( ), conversion: Ascii, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -2068,6 +2239,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -2116,6 +2289,9 @@ Module( ], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -2129,6 +2305,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -2183,6 +2361,9 @@ Module( ], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -2196,6 +2377,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -2244,6 +2427,9 @@ Module( ], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -2257,6 +2443,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -2305,6 +2493,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -2319,6 +2510,8 @@ Module( ], ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -2354,6 +2547,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -2385,6 +2581,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -2399,6 +2598,8 @@ Module( ], ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -2434,6 +2635,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -2461,6 +2665,8 @@ Module( ], ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -2522,11 +2728,15 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -2540,6 +2750,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -2588,6 +2800,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -2615,6 +2830,8 @@ Module( ], ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -2734,6 +2951,8 @@ Module( ], ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -2782,6 +3001,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -2822,6 +3044,8 @@ Module( ], ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -2870,6 +3094,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -2910,6 +3137,8 @@ Module( ], ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -2958,6 +3187,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -2998,6 +3230,8 @@ Module( ], ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -3053,6 +3287,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -3100,11 +3337,14 @@ Module( ], ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__generator.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__generator.py.snap index da4fe251d055c..2c5a1172f307f 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__generator.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__generator.py.snap @@ -48,6 +48,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], parenthesized: true, @@ -93,6 +95,8 @@ Module( ), ifs: [], is_async: true, + runtime_ifs: None, + runtime_is_async: None, }, ], parenthesized: true, @@ -162,6 +166,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), BoolOp( @@ -187,6 +192,7 @@ Module( }, ), ], + runtime_values: None, }, ), Name( @@ -199,6 +205,8 @@ Module( ), ], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], parenthesized: true, @@ -266,10 +274,13 @@ Module( }, ), ], + runtime_values: None, }, ), ], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, Comprehension { range: 136..165, @@ -316,10 +327,13 @@ Module( }, ), ], + runtime_comparators: None, }, ), ], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], parenthesized: true, @@ -387,10 +401,13 @@ Module( }, ), ], + runtime_values: None, }, ), ], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, Comprehension { range: 202..237, @@ -437,10 +454,13 @@ Module( }, ), ], + runtime_comparators: None, }, ), ], is_async: true, + runtime_ifs: None, + runtime_is_async: None, }, ], parenthesized: true, @@ -516,6 +536,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], parenthesized: true, @@ -583,6 +605,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], parenthesized: true, @@ -779,10 +803,13 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], parenthesized: false, @@ -790,12 +817,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__if.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__if.py.snap index 98ed6f9e96cc8..a8aa286719b51 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__if.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__if.py.snap @@ -78,6 +78,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -184,6 +186,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), body: BinOp( @@ -269,6 +272,7 @@ Module( }, ), ], + runtime_values: None, }, ), orelse: BooleanLiteral( @@ -323,6 +327,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), orelse: Name( @@ -368,6 +373,7 @@ Module( }, ), ], + runtime_values: None, }, ), body: BooleanLiteral( @@ -440,6 +446,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), }, @@ -489,6 +496,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -496,6 +505,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -628,6 +638,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -635,6 +647,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -704,6 +717,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__lambda.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__lambda.py.snap index 29db11b942119..99c40b404d66c 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__lambda.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__lambda.py.snap @@ -79,6 +79,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -86,6 +88,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: NumberLiteral( @@ -127,6 +130,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -142,6 +147,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -149,6 +156,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: EllipsisLiteral( @@ -187,6 +195,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -202,6 +212,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -217,6 +229,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -224,6 +238,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: NumberLiteral( @@ -265,6 +280,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -280,6 +297,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -305,6 +324,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -322,6 +343,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: NumberLiteral( @@ -363,6 +385,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -378,6 +402,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -385,6 +411,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: BinOp( @@ -440,6 +467,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -455,6 +484,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -472,6 +503,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: BinOp( @@ -525,10 +557,13 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -567,6 +602,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), kwonlyargs: [ @@ -582,6 +619,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -597,6 +636,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -612,6 +653,7 @@ Module( }, ], kwarg: None, + runtime_defaults: None, }, ), body: EllipsisLiteral( @@ -652,6 +694,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -667,6 +711,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -682,11 +728,14 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, ], kwarg: None, + runtime_defaults: None, }, ), body: NumberLiteral( @@ -730,6 +779,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -745,6 +796,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -770,6 +823,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -785,6 +840,7 @@ Module( }, ], kwarg: None, + runtime_defaults: None, }, ), body: NumberLiteral( @@ -826,6 +882,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -841,6 +899,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -856,6 +916,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -874,6 +936,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -889,11 +953,14 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, ], kwarg: None, + runtime_defaults: None, }, ), body: NumberLiteral( @@ -935,8 +1002,11 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), + runtime_defaults: None, }, ), body: Call( @@ -956,6 +1026,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -987,6 +1059,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), kwonlyargs: [], @@ -1000,8 +1074,11 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), + runtime_defaults: None, }, ), body: BinOp( @@ -1025,6 +1102,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -1068,6 +1147,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), kwonlyargs: [ @@ -1083,6 +1164,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1098,6 +1181,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -1122,8 +1207,11 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), + runtime_defaults: None, }, ), body: BinOp( @@ -1147,6 +1235,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -1191,6 +1281,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1199,6 +1291,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: EllipsisLiteral( @@ -1236,6 +1329,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1253,6 +1348,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1260,6 +1357,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: EllipsisLiteral( @@ -1297,6 +1395,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -1315,6 +1415,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: EllipsisLiteral( @@ -1352,6 +1453,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1367,6 +1470,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1386,11 +1491,14 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, ], kwarg: None, + runtime_defaults: None, }, ), body: EllipsisLiteral( @@ -1429,6 +1537,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -1457,11 +1567,14 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, ], kwarg: None, + runtime_defaults: None, }, ), body: EllipsisLiteral( @@ -1499,6 +1612,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1514,6 +1629,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -1541,6 +1658,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -1558,6 +1677,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: NumberLiteral( @@ -1598,6 +1718,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1613,6 +1735,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1630,6 +1754,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1648,6 +1774,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1663,11 +1791,14 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, ], kwarg: None, + runtime_defaults: None, }, ), body: NumberLiteral( @@ -1708,6 +1839,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1723,6 +1856,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1740,6 +1875,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1754,6 +1891,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), kwonlyargs: [ @@ -1769,6 +1908,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1783,8 +1924,11 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), + runtime_defaults: None, }, ), body: NumberLiteral( @@ -1801,6 +1945,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__list.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__list.py.snap index ae2769786fee4..98df2b44d98cd 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__list.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__list.py.snap @@ -20,6 +20,7 @@ Module( range: 15..17, elts: [], ctx: Load, + runtime_elts: None, }, ), }, @@ -44,6 +45,7 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), }, @@ -68,6 +70,7 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), }, @@ -110,6 +113,7 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), }, @@ -152,6 +156,7 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), }, @@ -166,6 +171,7 @@ Module( range: 75..78, elts: [], ctx: Load, + runtime_elts: None, }, ), }, @@ -190,6 +196,7 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), }, @@ -223,6 +230,7 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), }, @@ -257,14 +265,17 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), ], ctx: Load, + runtime_elts: None, }, ), ], ctx: Load, + runtime_elts: None, }, ), }, @@ -303,6 +314,7 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), List( @@ -330,10 +342,12 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), ], ctx: Load, + runtime_elts: None, }, ), }, @@ -372,6 +386,7 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), }, @@ -410,6 +425,7 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), }, @@ -466,6 +482,7 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), }, @@ -514,6 +531,7 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), }, @@ -577,6 +595,7 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), }, @@ -658,6 +677,7 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), Tuple( @@ -707,6 +727,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), Set( @@ -739,6 +760,7 @@ Module( }, ), ], + runtime_elts: None, }, ), Dict( @@ -768,6 +790,7 @@ Module( ), }, ], + runtime_values: None, }, ), Named( @@ -795,6 +818,7 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), }, @@ -873,11 +897,15 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -903,6 +931,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], parenthesized: false, @@ -910,11 +940,14 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ], ctx: Load, + runtime_elts: None, }, ), }, @@ -953,15 +986,18 @@ Module( }, ), ], + runtime_comparators: None, }, ), ], ctx: Load, + runtime_elts: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__list_comprehension.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__list_comprehension.py.snap index 6f1310b33da71..ad5def6bce9bf 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__list_comprehension.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__list_comprehension.py.snap @@ -83,14 +83,20 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Expr( @@ -148,11 +154,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -221,6 +231,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), BoolOp( @@ -246,6 +257,7 @@ Module( }, ), ], + runtime_values: None, }, ), Name( @@ -258,6 +270,8 @@ Module( ), ], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -324,10 +338,13 @@ Module( }, ), ], + runtime_values: None, }, ), ], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, Comprehension { range: 117..136, @@ -374,10 +391,13 @@ Module( }, ), ], + runtime_comparators: None, }, ), ], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -444,10 +464,13 @@ Module( }, ), ], + runtime_values: None, }, ), ], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, Comprehension { range: 163..188, @@ -494,10 +517,13 @@ Module( }, ), ], + runtime_comparators: None, }, ), ], is_async: true, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -558,10 +584,13 @@ Module( }, ), ], + runtime_comparators: None, }, ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -612,6 +641,7 @@ Module( ], ctx: Store, parenthesized: false, + runtime_elts: None, }, ), iter: Name( @@ -624,6 +654,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -680,6 +712,7 @@ Module( ], ctx: Store, parenthesized: false, + runtime_elts: None, }, ), iter: Name( @@ -692,6 +725,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -764,10 +799,13 @@ Module( }, ), ], + runtime_comparators: None, }, ), ], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -842,6 +880,8 @@ Module( ), ], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -922,6 +962,8 @@ Module( ), ], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -1002,6 +1044,8 @@ Module( ), ], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -1077,17 +1121,22 @@ Module( range: 453..455, elts: [], ctx: Load, + runtime_elts: None, }, ), }, ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -1140,6 +1189,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -1190,6 +1241,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -1246,6 +1299,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1253,6 +1308,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -1267,6 +1323,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -1328,6 +1386,8 @@ Module( ), ], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -1387,6 +1447,8 @@ Module( ), ], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -1452,6 +1514,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1459,6 +1523,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -1473,6 +1538,8 @@ Module( ), ], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -1480,6 +1547,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__name.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__name.py.snap index b32e08dff6b06..f2dbce25e7596 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__name.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__name.py.snap @@ -137,6 +137,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__named.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__named.py.snap index 199a11eab69b7..0509afecdea22 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__named.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__named.py.snap @@ -174,6 +174,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), }, @@ -267,6 +268,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -274,6 +277,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -361,6 +365,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__number_literal.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__number_literal.py.snap index ad313fbab1b75..da2a15e2adfdd 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__number_literal.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__number_literal.py.snap @@ -33,6 +33,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -58,6 +61,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -83,6 +89,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -108,6 +117,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -133,6 +145,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -158,6 +173,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -183,6 +201,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -208,6 +229,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -233,6 +257,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -258,6 +285,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -284,6 +314,9 @@ Module( }, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -310,6 +343,9 @@ Module( }, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -335,6 +371,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -360,6 +399,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -385,6 +427,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -410,6 +455,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -435,6 +483,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -460,6 +511,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -497,6 +551,9 @@ Module( ctx: Load, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -534,6 +591,9 @@ Module( ctx: Load, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -571,6 +631,9 @@ Module( ctx: Load, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -617,9 +680,14 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -657,6 +725,9 @@ Module( ctx: Load, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -703,9 +774,14 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -744,6 +820,9 @@ Module( ctx: Load, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -820,14 +899,21 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -874,9 +960,14 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -923,9 +1014,14 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -963,6 +1059,9 @@ Module( ctx: Load, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -1009,9 +1108,14 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -1045,6 +1149,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), If( @@ -1087,6 +1194,7 @@ Module( ), ], elif_else_clauses: [], + runtime_body: None, }, ), Assign( @@ -1127,6 +1235,9 @@ Module( ctx: Load, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -1170,12 +1281,18 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__parenthesized.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__parenthesized.py.snap index 9854d74ac153b..5bbfe64283081 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__parenthesized.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__parenthesized.py.snap @@ -45,6 +45,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -79,6 +81,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -87,6 +91,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -95,6 +101,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -133,6 +141,7 @@ Module( }, ), ], + runtime_values: None, }, ), Name( @@ -144,6 +153,7 @@ Module( }, ), ], + runtime_values: None, }, ), }, @@ -174,6 +184,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -181,6 +193,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -267,6 +280,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__set.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__set.py.snap index e65e97a2b8fb2..567ff79825917 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__set.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__set.py.snap @@ -19,6 +19,7 @@ Module( node_index: NodeIndex(None), range: 14..16, items: [], + runtime_values: None, }, ), }, @@ -42,6 +43,7 @@ Module( }, ), ], + runtime_elts: None, }, ), }, @@ -65,6 +67,7 @@ Module( }, ), ], + runtime_elts: None, }, ), }, @@ -106,6 +109,7 @@ Module( }, ), ], + runtime_elts: None, }, ), }, @@ -147,6 +151,7 @@ Module( }, ), ], + runtime_elts: None, }, ), }, @@ -160,6 +165,7 @@ Module( node_index: NodeIndex(None), range: 74..77, items: [], + runtime_values: None, }, ), }, @@ -183,6 +189,7 @@ Module( }, ), ], + runtime_elts: None, }, ), }, @@ -215,6 +222,7 @@ Module( }, ), ], + runtime_elts: None, }, ), }, @@ -243,9 +251,11 @@ Module( }, ), ], + runtime_elts: None, }, ), ], + runtime_elts: None, }, ), }, @@ -283,6 +293,7 @@ Module( }, ), ], + runtime_elts: None, }, ), Set( @@ -309,9 +320,11 @@ Module( }, ), ], + runtime_elts: None, }, ), ], + runtime_elts: None, }, ), }, @@ -349,6 +362,7 @@ Module( }, ), ], + runtime_elts: None, }, ), }, @@ -404,6 +418,7 @@ Module( }, ), ], + runtime_elts: None, }, ), }, @@ -450,6 +465,7 @@ Module( }, ), ], + runtime_elts: None, }, ), }, @@ -497,6 +513,7 @@ Module( }, ), ], + runtime_elts: None, }, ), }, @@ -559,6 +576,7 @@ Module( }, ), ], + runtime_elts: None, }, ), }, @@ -621,6 +639,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), Set( @@ -656,6 +675,7 @@ Module( }, ), ], + runtime_elts: None, }, ), Dict( @@ -695,14 +715,17 @@ Module( ), }, ], + runtime_values: None, }, ), ], + runtime_elts: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__set_comprehension.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__set_comprehension.py.snap index 5482a567fce87..3913a677e5154 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__set_comprehension.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__set_comprehension.py.snap @@ -48,6 +48,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -116,6 +118,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), BoolOp( @@ -141,6 +144,7 @@ Module( }, ), ], + runtime_values: None, }, ), Name( @@ -153,6 +157,8 @@ Module( ), ], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -219,10 +225,13 @@ Module( }, ), ], + runtime_values: None, }, ), ], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, Comprehension { range: 83..102, @@ -269,10 +278,13 @@ Module( }, ), ], + runtime_comparators: None, }, ), ], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -339,10 +351,13 @@ Module( }, ), ], + runtime_values: None, }, ), ], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, Comprehension { range: 129..154, @@ -389,10 +404,13 @@ Module( }, ), ], + runtime_comparators: None, }, ), ], is_async: true, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -443,6 +461,7 @@ Module( ], ctx: Store, parenthesized: false, + runtime_elts: None, }, ), iter: Name( @@ -455,6 +474,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -507,6 +528,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -557,6 +580,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -613,6 +638,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -620,6 +647,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -634,6 +662,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -695,6 +725,8 @@ Module( ), ], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -754,6 +786,8 @@ Module( ), ], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -819,6 +853,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -826,6 +862,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -840,6 +877,8 @@ Module( ), ], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -847,6 +886,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__slice.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__slice.py.snap index d19e76dab3bec..3af9b25d5d3aa 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__slice.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__slice.py.snap @@ -675,6 +675,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ctx: Load, @@ -734,6 +735,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ctx: Load, @@ -742,6 +744,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__starred.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__starred.py.snap index be5cfdc577d60..6d7e6d259c8f7 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__starred.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__starred.py.snap @@ -175,11 +175,15 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ctx: Load, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -247,6 +251,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ctx: Store, @@ -261,6 +266,9 @@ Module( ctx: Load, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Expr( @@ -317,6 +325,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ctx: Load, @@ -392,6 +401,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ctx: Load, @@ -400,6 +410,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__string.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__string.py.snap index 0f376fd49033f..7b449d85f0c53 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__string.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__string.py.snap @@ -357,6 +357,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__subscript.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__subscript.py.snap index 8407b7a8d8c56..f862202fac3e6 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__subscript.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__subscript.py.snap @@ -98,6 +98,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ctx: Load, @@ -148,6 +149,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ctx: Load, @@ -207,6 +209,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ctx: Load, @@ -276,6 +279,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ctx: Load, @@ -398,6 +402,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ctx: Load, @@ -500,6 +505,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ctx: Load, @@ -558,6 +564,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ctx: Load, @@ -757,6 +764,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ctx: Load, @@ -812,6 +820,7 @@ Module( }, ), ], + runtime_values: None, }, ), ctx: Load, @@ -820,6 +829,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ctx: Load, @@ -880,6 +890,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ctx: Load, @@ -888,6 +899,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__t_string.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__t_string.py.snap index 76e9eb3b6cc7e..856f4410978b6 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__t_string.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__t_string.py.snap @@ -1,5 +1,6 @@ --- source: crates/ruff_python_parser/tests/fixtures.rs +input_file: crates/ruff_python_parser/resources/valid/expressions/t_string.py --- ## AST @@ -32,6 +33,8 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -59,6 +62,8 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -86,6 +91,8 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -113,6 +120,8 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -140,6 +149,8 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -186,6 +197,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -198,6 +212,8 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -231,6 +247,9 @@ Module( debug_text: None, conversion: Str, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -243,6 +262,8 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -282,11 +303,15 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -299,6 +324,8 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -348,6 +375,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), debug_text: None, @@ -359,6 +387,9 @@ Module( elements: [], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -371,6 +402,8 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -437,6 +470,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -449,6 +485,9 @@ Module( ], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -461,6 +500,8 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -527,6 +568,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -539,6 +583,9 @@ Module( ], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -551,6 +598,8 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -590,6 +639,9 @@ Module( ), conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -602,6 +654,8 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -655,6 +709,9 @@ Module( ], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -667,6 +724,8 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -706,6 +765,9 @@ Module( ), conversion: Str, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -718,6 +780,8 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -766,6 +830,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), debug_text: Some( @@ -777,6 +842,9 @@ Module( ), conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -789,6 +857,8 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -857,6 +927,9 @@ Module( ], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -869,6 +942,8 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), debug_text: None, @@ -888,6 +963,9 @@ Module( ], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -900,6 +978,8 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -982,6 +1062,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -1021,6 +1104,8 @@ Module( ], ), }, + runtime_template_str: None, + runtime_values: None, }, ), ), @@ -1035,6 +1120,7 @@ Module( ), }, ], + runtime_values: None, }, ), }, @@ -1091,6 +1177,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 300..347, @@ -1147,6 +1234,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -1187,6 +1275,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -1225,6 +1316,9 @@ Module( ], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -1237,6 +1331,8 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -1272,6 +1368,8 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -1319,6 +1417,9 @@ Module( ], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -1331,6 +1432,8 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -1370,6 +1473,9 @@ Module( ), conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -1382,6 +1488,8 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -1422,6 +1530,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -1446,6 +1557,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -1470,6 +1584,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -1489,6 +1606,8 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -1529,6 +1648,9 @@ Module( debug_text: None, conversion: Ascii, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -1553,6 +1675,9 @@ Module( debug_text: None, conversion: Str, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -1577,6 +1702,9 @@ Module( debug_text: None, conversion: Repr, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -1601,6 +1729,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -1613,6 +1744,8 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -1667,6 +1800,9 @@ Module( ], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -1679,6 +1815,8 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -1743,6 +1881,7 @@ Module( }, ), ], + runtime_elts: None, }, ), attr: Identifier { @@ -1758,17 +1897,25 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -1781,6 +1928,8 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -1825,6 +1974,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1832,6 +1983,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Set( @@ -1848,6 +2000,7 @@ Module( }, ), ], + runtime_elts: None, }, ), }, @@ -1855,6 +2008,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -1867,6 +2023,8 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -1906,6 +2064,9 @@ Module( ), conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -1918,6 +2079,8 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -1957,6 +2120,9 @@ Module( ), conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -1969,6 +2135,8 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -2008,6 +2176,9 @@ Module( ), conversion: Ascii, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -2020,6 +2191,8 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -2067,6 +2240,9 @@ Module( ], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -2079,6 +2255,8 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -2132,6 +2310,9 @@ Module( ], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -2144,6 +2325,8 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -2191,6 +2374,9 @@ Module( ], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -2203,6 +2389,8 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -2256,6 +2444,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -2269,6 +2460,8 @@ Module( ], ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -2303,6 +2496,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -2332,6 +2528,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -2345,6 +2544,8 @@ Module( ], ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -2379,6 +2580,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -2411,6 +2615,8 @@ Module( ], ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -2471,11 +2677,15 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -2488,6 +2698,8 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -2541,6 +2753,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -2573,6 +2788,8 @@ Module( ], ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -2690,6 +2907,8 @@ Module( ], ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -2752,6 +2971,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -2764,11 +2986,16 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -2782,11 +3009,16 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -2799,11 +3031,14 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__tuple.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__tuple.py.snap index 85d7b0c3f69aa..b0d006f363b0f 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__tuple.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__tuple.py.snap @@ -21,6 +21,7 @@ Module( elts: [], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), }, @@ -36,6 +37,7 @@ Module( elts: [], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), }, @@ -56,6 +58,7 @@ Module( elts: [], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), Tuple( @@ -65,11 +68,13 @@ Module( elts: [], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), }, @@ -94,6 +99,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), }, @@ -126,6 +132,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), }, @@ -158,6 +165,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), }, @@ -190,6 +198,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), }, @@ -214,6 +223,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), }, @@ -246,6 +256,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), }, @@ -278,6 +289,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), }, @@ -309,6 +321,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), }, @@ -348,6 +361,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), }, @@ -419,6 +433,7 @@ Module( elts: [], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), Starred( @@ -432,6 +447,7 @@ Module( elts: [], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), ctx: Load, @@ -440,6 +456,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), }, @@ -471,6 +488,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), }, @@ -510,6 +528,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), }, @@ -581,6 +600,7 @@ Module( elts: [], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), Starred( @@ -594,6 +614,7 @@ Module( elts: [], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), ctx: Load, @@ -602,6 +623,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), }, @@ -641,6 +663,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), }, @@ -688,6 +711,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), }, @@ -743,6 +767,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), }, @@ -798,11 +823,13 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__unary_op.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__unary_op.py.snap index 5098bc60446b0..a58fde291d79f 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__unary_op.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__unary_op.py.snap @@ -354,6 +354,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), }, @@ -438,6 +439,7 @@ Module( }, ), ], + runtime_values: None, }, ), BoolOp( @@ -492,9 +494,11 @@ Module( }, ), ], + runtime_values: None, }, ), ], + runtime_values: None, }, ), }, @@ -579,6 +583,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__yield.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__yield.py.snap index e137cd09fc3de..832017181d847 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__yield.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__yield.py.snap @@ -115,6 +115,7 @@ Module( }, ), ], + runtime_values: None, }, ), ), @@ -148,6 +149,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -190,6 +193,7 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), ), @@ -230,6 +234,7 @@ Module( }, ), ], + runtime_elts: None, }, ), ), @@ -273,6 +278,7 @@ Module( ), }, ], + runtime_values: None, }, ), ), @@ -313,6 +319,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ), @@ -353,6 +360,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), ), @@ -394,6 +402,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), ), @@ -478,6 +487,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ), @@ -517,6 +527,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ), @@ -525,6 +536,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__yield_from.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__yield_from.py.snap index 86e8a9ac06f33..f51bc49946bb8 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__yield_from.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@expressions__yield_from.py.snap @@ -97,6 +97,7 @@ Module( }, ), ], + runtime_values: None, }, ), }, @@ -128,6 +129,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -168,6 +171,7 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), }, @@ -206,6 +210,7 @@ Module( }, ), ], + runtime_elts: None, }, ), }, @@ -247,6 +252,7 @@ Module( ), }, ], + runtime_values: None, }, ), }, @@ -285,6 +291,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), }, @@ -324,6 +331,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), }, @@ -419,6 +427,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), }, @@ -426,6 +435,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@for_in_target_valid_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@for_in_target_valid_expr.py.snap index 05a956dcf6ffe..4d01bafaa6414 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@for_in_target_valid_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@for_in_target_valid_expr.py.snap @@ -52,6 +52,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), ctx: Store, @@ -80,6 +81,10 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), For( @@ -116,6 +121,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), slice: NumberLiteral( @@ -153,6 +159,10 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), For( @@ -189,6 +199,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), attr: Identifier { @@ -222,9 +233,14 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@for_iter_unpack_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@for_iter_unpack_py38.py.snap index bebfeca6cb8d6..1f7aea79c0047 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@for_iter_unpack_py38.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@for_iter_unpack_py38.py.snap @@ -54,6 +54,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), body: [ @@ -71,6 +72,10 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), For( @@ -117,6 +122,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), body: [ @@ -134,6 +140,10 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), For( @@ -187,6 +197,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), body: [ @@ -204,9 +215,14 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@for_iter_unpack_py39.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@for_iter_unpack_py39.py.snap index 57ae9806a24a1..b43f4e9ec106b 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@for_iter_unpack_py39.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@for_iter_unpack_py39.py.snap @@ -54,6 +54,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), body: [ @@ -71,6 +72,10 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), For( @@ -117,6 +122,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), body: [ @@ -134,6 +140,10 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), For( @@ -187,6 +197,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), body: [ @@ -204,9 +215,14 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@from_import_no_space.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@from_import_no_space.py.snap index a47797f4e8d6b..0315c3b29721f 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@from_import_no_space.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@from_import_no_space.py.snap @@ -29,6 +29,7 @@ Module( ], level: 1, is_lazy: false, + runtime_level: None, }, ), ImportFrom( @@ -50,9 +51,11 @@ Module( ], level: 3, is_lazy: false, + runtime_level: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@from_import_soft_keyword_module_name.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@from_import_soft_keyword_module_name.py.snap index caa760037150b..26c451702e8b3 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@from_import_soft_keyword_module_name.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@from_import_soft_keyword_module_name.py.snap @@ -35,6 +35,7 @@ Module( ], level: 0, is_lazy: false, + runtime_level: None, }, ), ImportFrom( @@ -62,6 +63,7 @@ Module( ], level: 0, is_lazy: false, + runtime_level: None, }, ), ImportFrom( @@ -89,6 +91,7 @@ Module( ], level: 0, is_lazy: false, + runtime_level: None, }, ), ImportFrom( @@ -116,6 +119,7 @@ Module( ], level: 0, is_lazy: false, + runtime_level: None, }, ), ImportFrom( @@ -143,9 +147,11 @@ Module( ], level: 0, is_lazy: false, + runtime_level: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@from_import_stmt_terminator.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@from_import_stmt_terminator.py.snap index a517cf6019c38..ee29fdeae46ae 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@from_import_stmt_terminator.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@from_import_stmt_terminator.py.snap @@ -45,6 +45,7 @@ Module( ], level: 0, is_lazy: false, + runtime_level: None, }, ), ImportFrom( @@ -82,6 +83,7 @@ Module( ], level: 0, is_lazy: false, + runtime_level: None, }, ), Expr( @@ -112,6 +114,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), }, @@ -151,6 +154,7 @@ Module( ], level: 0, is_lazy: false, + runtime_level: None, }, ), Expr( @@ -181,6 +185,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), }, @@ -220,6 +225,7 @@ Module( ], level: 0, is_lazy: false, + runtime_level: None, }, ), Expr( @@ -250,11 +256,13 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@fstring_format_spec_terminator.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@fstring_format_spec_terminator.py.snap index d3a6103ce05c6..c7707f01b9f1c 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@fstring_format_spec_terminator.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@fstring_format_spec_terminator.py.snap @@ -53,6 +53,9 @@ Module( elements: [], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -73,6 +76,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -128,6 +133,9 @@ Module( ], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -148,11 +156,14 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@function_def_parameter_range.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@function_def_parameter_range.py.snap index 900be0a882988..f5a140414738d 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@function_def_parameter_range.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@function_def_parameter_range.py.snap @@ -48,6 +48,8 @@ Module( }, ), ), + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -72,6 +74,8 @@ Module( }, ), ), + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -79,6 +83,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: Some( Name( @@ -104,9 +109,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@function_def_parenthesized_return_types.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@function_def_parenthesized_return_types.py.snap index 207800f85ee6f..b77cc6b3cfa6a 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@function_def_parenthesized_return_types.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@function_def_parenthesized_return_types.py.snap @@ -30,6 +30,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: Some( Tuple( @@ -48,6 +49,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), ), @@ -65,6 +67,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -87,6 +93,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: Some( Tuple( @@ -113,6 +120,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), ), @@ -130,9 +138,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@function_def_valid_return_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@function_def_valid_return_expr.py.snap index 5415e94eee9fd..27677b5f895f3 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@function_def_valid_return_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@function_def_valid_return_expr.py.snap @@ -30,6 +30,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: Some( BinOp( @@ -70,6 +71,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -92,6 +97,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: Some( Lambda( @@ -116,6 +122,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -123,6 +131,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -150,6 +159,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -172,6 +185,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: Some( If( @@ -218,9 +232,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@function_type_params_py312.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@function_type_params_py312.py.snap index c60829f2b7b50..f81eb41fc1460 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@function_type_params_py312.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@function_type_params_py312.py.snap @@ -40,6 +40,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), parameters: Parameters { @@ -50,6 +51,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -66,9 +68,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@global_stmt.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@global_stmt.py.snap index 2282955763fe7..bde83c87d3e17 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@global_stmt.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@global_stmt.py.snap @@ -47,6 +47,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@import_as_name_soft_keyword.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@import_as_name_soft_keyword.py.snap index 0b9b20b8ce859..3fd67206588f3 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@import_as_name_soft_keyword.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@import_as_name_soft_keyword.py.snap @@ -111,6 +111,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@import_from_star.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@import_from_star.py.snap index 61744c2a710e1..261b3c3dba05e 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@import_from_star.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@import_from_star.py.snap @@ -35,9 +35,11 @@ Module( ], level: 0, is_lazy: false, + runtime_level: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@import_stmt_terminator.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@import_stmt_terminator.py.snap index ee630a8fb65a7..fa0257f39ba4f 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@import_stmt_terminator.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@import_stmt_terminator.py.snap @@ -125,11 +125,13 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@irrefutable_case_pattern_at_end.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@irrefutable_case_pattern_at_end.py.snap index ee291df1336f8..ae940a79098db 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@irrefutable_case_pattern_at_end.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@irrefutable_case_pattern_at_end.py.snap @@ -56,6 +56,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 29..42, @@ -89,6 +90,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -139,6 +141,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 72..83, @@ -166,6 +169,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -223,6 +227,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 164..175, @@ -257,11 +262,13 @@ Module( }, ), ], + runtime_body: None, }, ], }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@iter_unpack_return_py37.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@iter_unpack_return_py37.py.snap index f98e1ddaa3818..e3dc19d7298ef 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@iter_unpack_return_py37.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@iter_unpack_return_py37.py.snap @@ -59,8 +59,12 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), FunctionDef( @@ -83,6 +87,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -141,15 +146,21 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), ), }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@iter_unpack_return_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@iter_unpack_return_py38.py.snap index 4b66019a93412..6ffb6a68594b1 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@iter_unpack_return_py38.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@iter_unpack_return_py38.py.snap @@ -59,8 +59,12 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), FunctionDef( @@ -83,6 +87,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -141,15 +146,21 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ), }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@iter_unpack_yield_py37.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@iter_unpack_yield_py37.py.snap index 6738798560aac..cc00a3f456b45 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@iter_unpack_yield_py37.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@iter_unpack_yield_py37.py.snap @@ -59,8 +59,12 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), FunctionDef( @@ -83,6 +87,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -145,6 +150,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), ), @@ -153,9 +159,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@iter_unpack_yield_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@iter_unpack_yield_py38.py.snap index 9f1c150b3d61f..440884eff3003 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@iter_unpack_yield_py38.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@iter_unpack_yield_py38.py.snap @@ -59,8 +59,12 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), FunctionDef( @@ -83,6 +87,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -145,6 +150,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ), @@ -153,6 +159,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -175,6 +185,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -238,6 +249,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ), @@ -255,6 +267,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ), @@ -263,9 +276,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@lambda_with_no_parameters.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@lambda_with_no_parameters.py.snap index 597604369514c..ed1cd6e5adcc4 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@lambda_with_no_parameters.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@lambda_with_no_parameters.py.snap @@ -33,6 +33,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@lambda_with_valid_body.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@lambda_with_valid_body.py.snap index 30d038eb10c91..dd0da3db5ee9a 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@lambda_with_valid_body.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@lambda_with_valid_body.py.snap @@ -36,6 +36,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -43,6 +45,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -83,6 +86,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -90,6 +95,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: If( @@ -151,6 +157,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -158,6 +166,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Await( @@ -204,6 +213,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -211,6 +222,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Lambda( @@ -235,6 +247,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -242,6 +256,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: BinOp( @@ -299,6 +314,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -306,6 +323,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Yield( @@ -359,6 +377,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -366,6 +386,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -396,11 +417,13 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@lazy_import_relative_py315.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@lazy_import_relative_py315.py.snap index 6ca53f54c0164..7fe6560e32a4d 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@lazy_import_relative_py315.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@lazy_import_relative_py315.py.snap @@ -29,6 +29,7 @@ Module( ], level: 1, is_lazy: true, + runtime_level: None, }, ), ImportFrom( @@ -66,6 +67,7 @@ Module( ], level: 1, is_lazy: true, + runtime_level: None, }, ), ImportFrom( @@ -97,9 +99,11 @@ Module( ], level: 1, is_lazy: true, + runtime_level: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@lazy_import_semantic_ok_py315.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@lazy_import_semantic_ok_py315.py.snap index 26121089bed90..03fd8b70c48a8 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@lazy_import_semantic_ok_py315.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@lazy_import_semantic_ok_py315.py.snap @@ -67,6 +67,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -94,6 +96,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -134,6 +139,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -166,12 +173,17 @@ Module( ], level: 0, is_lazy: true, + runtime_level: None, }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@lazy_import_soft_keyword_split_py315.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@lazy_import_soft_keyword_split_py315.py.snap index 4e9741934571c..48549b90ac3b9 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@lazy_import_soft_keyword_split_py315.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@lazy_import_soft_keyword_split_py315.py.snap @@ -82,9 +82,11 @@ Module( ], level: 0, is_lazy: false, + runtime_level: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@lazy_import_stmt_py315.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@lazy_import_stmt_py315.py.snap index 448199ce6be0e..85078322c8ef1 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@lazy_import_stmt_py315.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@lazy_import_stmt_py315.py.snap @@ -79,6 +79,7 @@ Module( ], level: 0, is_lazy: true, + runtime_level: None, }, ), ImportFrom( @@ -112,6 +113,7 @@ Module( ], level: 0, is_lazy: true, + runtime_level: None, }, ), Assign( @@ -137,6 +139,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Import( @@ -189,9 +194,11 @@ Module( ], level: 0, is_lazy: false, + runtime_level: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_after_py310.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_after_py310.py.snap index 8169fc8654b3b..25e743b983908 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_after_py310.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_after_py310.py.snap @@ -51,11 +51,13 @@ Module( }, ), ], + runtime_body: None, }, ], }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_annotated_assignment.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_annotated_assignment.py.snap index a36c35515429f..5350bbeb55212 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_annotated_assignment.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_annotated_assignment.py.snap @@ -48,6 +48,7 @@ Module( ), value: None, simple: false, + runtime_simple: None, }, ), AnnAssign( @@ -98,6 +99,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ctx: Store, @@ -113,9 +115,11 @@ Module( ), value: None, simple: false, + runtime_simple: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_as_pattern.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_as_pattern.py.snap index 2ae3ea1e819b2..7e8c29a4dfa70 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_as_pattern.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_as_pattern.py.snap @@ -55,6 +55,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -98,11 +99,13 @@ Module( }, ), ], + runtime_body: None, }, ], }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_as_pattern_soft_keyword.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_as_pattern_soft_keyword.py.snap index 1d3283279780f..862f9d0b74473 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_as_pattern_soft_keyword.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_as_pattern_soft_keyword.py.snap @@ -55,6 +55,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -104,6 +105,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -153,11 +155,13 @@ Module( }, ), ], + runtime_body: None, }, ], }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_attr_pattern_soft_keyword.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_attr_pattern_soft_keyword.py.snap index 5050a08ea58e9..e31cc9e8ed22f 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_attr_pattern_soft_keyword.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_attr_pattern_soft_keyword.py.snap @@ -67,6 +67,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 39..57, @@ -112,6 +113,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 62..80, @@ -157,6 +159,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 85..130, @@ -262,11 +265,13 @@ Module( }, ), ], + runtime_body: None, }, ], }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_identifier_1.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_identifier_1.py.snap index 7eb5caad2970a..ecee6cce82b96 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_identifier_1.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_identifier_1.py.snap @@ -39,11 +39,13 @@ Module( }, ), ], + runtime_comparators: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_identifier_2.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_identifier_2.py.snap index 5377ee65eac70..1ec8ef05d01b2 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_identifier_2.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_identifier_2.py.snap @@ -53,6 +53,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), }, @@ -85,6 +86,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), }, @@ -116,6 +118,7 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), }, @@ -146,6 +149,7 @@ Module( }, ), ], + runtime_elts: None, }, ), }, @@ -186,6 +190,7 @@ Module( ), value: None, simple: true, + runtime_simple: None, }, ), Expr( @@ -208,6 +213,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), }, @@ -323,6 +329,7 @@ Module( }, ), ], + runtime_values: None, }, ), }, @@ -356,11 +363,13 @@ Module( }, ), ], + runtime_comparators: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_keyword_1.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_keyword_1.py.snap index 3ff055535e784..60c9e4474b3e0 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_keyword_1.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_keyword_1.py.snap @@ -49,6 +49,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -93,6 +94,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -137,6 +139,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -182,6 +185,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -238,6 +242,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -279,6 +284,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -292,6 +300,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), cases: [ @@ -321,6 +331,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -353,6 +364,7 @@ Module( }, ), ], + runtime_elts: None, }, ), cases: [ @@ -382,6 +394,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -432,6 +445,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -473,6 +487,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -523,6 +538,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -552,6 +568,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -584,6 +602,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -614,6 +633,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -621,6 +642,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -660,11 +682,13 @@ Module( }, ), ], + runtime_body: None, }, ], }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_keyword_2.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_keyword_2.py.snap index 84a0f8c7473d5..fd11c3fdbbfb5 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_keyword_2.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_keyword_2.py.snap @@ -49,6 +49,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -92,6 +93,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -135,6 +137,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -176,6 +179,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -218,6 +222,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -260,11 +265,13 @@ Module( }, ), ], + runtime_body: None, }, ], }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_keyword_or_identifier.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_keyword_or_identifier.py.snap index 40eb8aafef94e..217481b552eab 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_keyword_or_identifier.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_classify_as_keyword_or_identifier.py.snap @@ -50,6 +50,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -85,6 +87,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), cases: [ @@ -114,6 +117,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -187,6 +191,7 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), cases: [ @@ -216,6 +221,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -324,11 +330,13 @@ Module( }, ), ], + runtime_body: None, }, ], }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_sequence_pattern_parentheses_terminator.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_sequence_pattern_parentheses_terminator.py.snap index 4cc16363d295f..7931e1644a99f 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_sequence_pattern_parentheses_terminator.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_sequence_pattern_parentheses_terminator.py.snap @@ -60,6 +60,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -77,6 +78,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 40..56, @@ -115,6 +117,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -132,11 +135,13 @@ Module( }, ), ], + runtime_body: None, }, ], }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_sequence_pattern_terminator.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_sequence_pattern_terminator.py.snap index 361c36bae44d0..5187c4f2eb790 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_sequence_pattern_terminator.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_sequence_pattern_terminator.py.snap @@ -64,6 +64,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 40..54, @@ -102,6 +103,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -119,6 +121,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 59..78, @@ -157,6 +160,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), guard: Some( @@ -183,6 +187,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 83..94, @@ -216,11 +221,13 @@ Module( }, ), ], + runtime_body: None, }, ], }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_stmt_subject_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_stmt_subject_expr.py.snap index de49fc65c0f76..a93e5a842b83b 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_stmt_subject_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_stmt_subject_expr.py.snap @@ -64,6 +64,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -122,6 +123,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -176,6 +178,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), cases: [ @@ -205,6 +208,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -254,11 +258,13 @@ Module( }, ), ], + runtime_body: None, }, ], }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_stmt_valid_guard_expr.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_stmt_valid_guard_expr.py.snap index 643a0bac5bb0b..ed434629866e8 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_stmt_valid_guard_expr.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@match_stmt_valid_guard_expr.py.snap @@ -79,6 +79,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -158,6 +159,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -215,6 +217,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -222,6 +226,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -249,6 +254,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -315,11 +321,13 @@ Module( }, ), ], + runtime_body: None, }, ], }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@multiple_assignment_in_case_pattern.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@multiple_assignment_in_case_pattern.py.snap index a37747203d7a0..a45b1c574c6c1 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@multiple_assignment_in_case_pattern.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@multiple_assignment_in_case_pattern.py.snap @@ -65,6 +65,9 @@ Module( ], keywords: [], }, + runtime_patterns: None, + runtime_kwd_attrs: None, + runtime_kwd_patterns: None, }, ), MatchSequence( @@ -87,6 +90,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), MatchAs( @@ -104,6 +108,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -121,11 +126,13 @@ Module( }, ), ], + runtime_body: None, }, ], }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@multiple_starred_assignment_target.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@multiple_starred_assignment_target.py.snap index ee5dde4187d27..4aa2682878edd 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@multiple_starred_assignment_target.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@multiple_starred_assignment_target.py.snap @@ -46,6 +46,7 @@ Module( ], ctx: Store, parenthesized: true, + runtime_elts: None, }, ), ], @@ -75,8 +76,12 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -120,6 +125,7 @@ Module( ], ctx: Store, parenthesized: true, + runtime_elts: None, }, ), Starred( @@ -140,6 +146,7 @@ Module( ], ctx: Store, parenthesized: false, + runtime_elts: None, }, ), ], @@ -165,6 +172,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), NumberLiteral( @@ -178,11 +186,16 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@nested_alternative_patterns.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@nested_alternative_patterns.py.snap index b685a0656d268..233dc40eed6de 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@nested_alternative_patterns.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@nested_alternative_patterns.py.snap @@ -108,6 +108,8 @@ Module( ), ], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), MatchMapping( @@ -154,13 +156,18 @@ Module( ), ], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), ], + runtime_patterns: None, }, ), ], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), MatchMapping( @@ -207,9 +214,12 @@ Module( ), ], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -227,6 +237,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -283,6 +294,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), MatchSequence( @@ -305,12 +317,15 @@ Module( }, ), ], + runtime_patterns: None, }, ), ], + runtime_patterns: None, }, ), ], + runtime_patterns: None, }, ), MatchAs( @@ -328,6 +343,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -345,6 +361,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -420,9 +437,11 @@ Module( }, ), ], + runtime_patterns: None, }, ), ], + runtime_patterns: None, }, ), MatchSequence( @@ -445,12 +464,15 @@ Module( }, ), ], + runtime_patterns: None, }, ), ], + runtime_patterns: None, }, ), ], + runtime_patterns: None, }, ), MatchAs( @@ -468,6 +490,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -485,6 +508,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -588,6 +612,9 @@ Module( patterns: [], keywords: [], }, + runtime_patterns: None, + runtime_kwd_attrs: None, + runtime_kwd_patterns: None, }, ), MatchClass( @@ -620,14 +647,21 @@ Module( patterns: [], keywords: [], }, + runtime_patterns: None, + runtime_kwd_attrs: None, + runtime_kwd_patterns: None, }, ), ], + runtime_patterns: None, }, ), ], keywords: [], }, + runtime_patterns: None, + runtime_kwd_attrs: None, + runtime_kwd_patterns: None, }, ), MatchClass( @@ -675,9 +709,13 @@ Module( ], keywords: [], }, + runtime_patterns: None, + runtime_kwd_attrs: None, + runtime_kwd_patterns: None, }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -695,11 +733,13 @@ Module( }, ), ], + runtime_body: None, }, ], }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@nested_async_comprehension_py310.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@nested_async_comprehension_py310.py.snap index 9c269d6c6997a..2ff1f461ad12b 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@nested_async_comprehension_py310.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@nested_async_comprehension_py310.py.snap @@ -30,6 +30,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -88,11 +89,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -154,11 +159,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: true, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -166,6 +175,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -188,6 +201,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -211,6 +225,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -227,6 +242,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), Expr( @@ -284,11 +303,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: true, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -296,9 +319,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@nested_async_comprehension_py311.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@nested_async_comprehension_py311.py.snap index e1b30a4094c89..86eafcccbd4e6 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@nested_async_comprehension_py311.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@nested_async_comprehension_py311.py.snap @@ -30,6 +30,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -92,11 +93,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: true, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -140,11 +145,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -153,6 +162,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -175,6 +188,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -248,11 +262,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: true, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -296,11 +314,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -309,6 +331,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -331,6 +357,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -393,11 +420,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: true, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -441,11 +472,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -454,9 +489,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@non_duplicate_keyword_args.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@non_duplicate_keyword_args.py.snap index 244f8063cbcb8..5823fd3f336d4 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@non_duplicate_keyword_args.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@non_duplicate_keyword_args.py.snap @@ -39,6 +39,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -46,6 +48,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -62,6 +65,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), Expr( @@ -106,6 +113,8 @@ Module( ), }, ], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -140,6 +149,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -155,6 +166,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -170,6 +183,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -177,6 +192,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -193,6 +209,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), Expr( @@ -287,12 +307,15 @@ Module( ), }, ], + runtime_args: None, + runtime_bases: None, }, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@non_duplicate_type_parameter_names.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@non_duplicate_type_parameter_names.py.snap index 91e9cabf5594a..637e8de75743e 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@non_duplicate_type_parameter_names.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@non_duplicate_type_parameter_names.py.snap @@ -41,6 +41,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Subscript( @@ -98,6 +99,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), parameters: Parameters { @@ -126,6 +128,8 @@ Module( }, ), ), + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -133,6 +137,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -149,6 +154,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ClassDef( @@ -180,6 +189,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), arguments: None, @@ -197,6 +207,8 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), ClassDef( @@ -254,6 +266,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), arguments: None, @@ -271,6 +284,8 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), TypeAlias( @@ -359,6 +374,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), ), @@ -412,6 +428,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: EllipsisLiteral( @@ -423,6 +440,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@non_nested_quote_in_format_spec_py311.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@non_nested_quote_in_format_spec_py311.py.snap index 76a3604fd6748..71129e55b835e 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@non_nested_quote_in_format_spec_py311.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@non_nested_quote_in_format_spec_py311.py.snap @@ -55,6 +55,9 @@ Module( ], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -68,11 +71,14 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@non_rebound_comprehension_variable.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@non_rebound_comprehension_variable.py.snap index 32f31b1690e9d..bc2e33a9a24a9 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@non_rebound_comprehension_variable.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@non_rebound_comprehension_variable.py.snap @@ -80,11 +80,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -92,6 +96,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@nonlocal_declaration_at_module_level.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@nonlocal_declaration_at_module_level.py.snap index f8015717e31d8..e6a85424c28da 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@nonlocal_declaration_at_module_level.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@nonlocal_declaration_at_module_level.py.snap @@ -30,6 +30,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -47,9 +48,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@nonlocal_stmt.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@nonlocal_stmt.py.snap index da1fa3289eccc..78849e47495e3 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@nonlocal_stmt.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@nonlocal_stmt.py.snap @@ -30,6 +30,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -70,9 +71,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@other__atom.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@other__atom.py.snap index 07f19ba72a957..7ce5bf79f1fd3 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@other__atom.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@other__atom.py.snap @@ -61,6 +61,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@other__decorator.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@other__decorator.py.snap index f90d87e8c7e01..79c3253b87509 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@other__decorator.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@other__decorator.py.snap @@ -43,6 +43,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -53,6 +54,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ClassDef( @@ -88,6 +93,8 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), FunctionDef( @@ -123,6 +130,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -139,6 +147,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -198,6 +210,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -214,6 +227,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -285,6 +302,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -301,6 +319,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ClassDef( @@ -407,6 +429,8 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), FunctionDef( @@ -500,6 +524,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -507,6 +533,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -546,6 +573,7 @@ Module( }, ), ], + runtime_values: None, }, ), }, @@ -610,6 +638,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), }, @@ -628,6 +657,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -644,6 +674,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -694,6 +728,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -710,6 +745,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -757,6 +796,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -773,9 +813,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_annotation.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_annotation.py.snap index 03b7fab965ca2..983b08b4e4938 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_annotation.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_annotation.py.snap @@ -48,6 +48,8 @@ Module( }, ), ), + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -55,6 +57,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -71,6 +74,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -124,6 +131,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -131,6 +140,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -144,6 +154,8 @@ Module( }, ), ), + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -151,6 +163,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -167,9 +180,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_default.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_default.py.snap index 97ade21863414..2c896a7160580 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_default.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_default.py.snap @@ -39,6 +39,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( Lambda( @@ -63,6 +65,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -70,6 +74,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -88,6 +93,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -104,6 +110,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -135,6 +145,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( If( @@ -174,6 +186,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -190,6 +203,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -221,6 +238,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( Await( @@ -243,6 +262,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -259,6 +279,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -290,6 +314,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( Yield( @@ -314,6 +340,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -330,9 +357,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_star_annotation.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_star_annotation.py.snap index 6a3c7ccc9c98e..df934c99d4c4e 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_star_annotation.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_star_annotation.py.snap @@ -68,10 +68,13 @@ Module( }, ), ), + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -88,6 +91,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -144,16 +151,20 @@ Module( }, ), ], + runtime_values: None, }, ), ctx: Load, }, ), ), + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -170,9 +181,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_star_annotation_py310.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_star_annotation_py310.py.snap index 077d25796bcc5..23d849135dd21 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_star_annotation_py310.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_star_annotation_py310.py.snap @@ -45,6 +45,7 @@ Module( ], level: 0, is_lazy: false, + runtime_level: None, }, ), FunctionDef( @@ -83,10 +84,13 @@ Module( }, ), ), + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -103,6 +107,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -169,10 +177,13 @@ Module( }, ), ), + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -189,6 +200,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -267,16 +282,20 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ctx: Load, }, ), ), + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -293,6 +312,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -331,6 +354,8 @@ Module( }, ), ), + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), kwonlyargs: [], @@ -353,8 +378,11 @@ Module( }, ), ), + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), + runtime_defaults: None, }, returns: None, body: [ @@ -371,6 +399,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -424,10 +456,13 @@ Module( }, ), ), + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -444,9 +479,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_star_annotation_py311.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_star_annotation_py311.py.snap index 0853afb16c6b0..bbb0d31bca897 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_star_annotation_py311.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@param_with_star_annotation_py311.py.snap @@ -53,10 +53,13 @@ Module( }, ), ), + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -73,9 +76,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@params_non_default_after_star.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@params_non_default_after_star.py.snap index fba5d8d3ecdbe..c3213bdda9a7c 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@params_non_default_after_star.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@params_non_default_after_star.py.snap @@ -39,6 +39,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -67,6 +69,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -82,6 +86,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -107,11 +113,14 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, ], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -128,6 +137,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -159,6 +172,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -183,6 +198,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), kwonlyargs: [ @@ -198,6 +215,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -213,6 +232,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -238,11 +259,14 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, ], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -259,9 +283,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@params_seen_keyword_only_param_after_star.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@params_seen_keyword_only_param_after_star.py.snap index 755948038868a..f88551bf776a9 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@params_seen_keyword_only_param_after_star.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@params_seen_keyword_only_param_after_star.py.snap @@ -41,6 +41,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -55,8 +57,11 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), + runtime_defaults: None, }, returns: None, body: [ @@ -73,6 +78,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -106,6 +115,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -130,8 +141,11 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), + runtime_defaults: None, }, returns: None, body: [ @@ -148,9 +162,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_context_manager_py39.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_context_manager_py39.py.snap index 9d627ba68f530..4ffb547bbb9d1 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_context_manager_py39.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_context_manager_py39.py.snap @@ -75,6 +75,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -133,6 +136,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -191,9 +197,13 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_kwarg_py37.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_kwarg_py37.py.snap index 91e6d3ec220e8..e2075af26fba7 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_kwarg_py37.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_kwarg_py37.py.snap @@ -52,12 +52,15 @@ Module( ), }, ], + runtime_args: None, + runtime_bases: None, }, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_named_expr_index_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_named_expr_index_py38.py.snap index a422908b73639..c16c04411c72a 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_named_expr_index_py38.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_named_expr_index_py38.py.snap @@ -55,6 +55,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_named_expr_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_named_expr_py38.py.snap index 1f14d31def9b3..af44edcde324f 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_named_expr_py38.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_named_expr_py38.py.snap @@ -61,6 +61,7 @@ Module( }, ), ], + runtime_elts: None, }, ), }, @@ -134,11 +135,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -146,6 +151,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_star_index_py310.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_star_index_py310.py.snap index cfae3dd052d1f..0fac3250d3084 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_star_index_py310.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@parenthesized_star_index_py310.py.snap @@ -64,6 +64,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -106,11 +108,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], parenthesized: true, @@ -137,6 +143,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), ctx: Store, @@ -152,9 +159,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@pep701_f_string_py311.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@pep701_f_string_py311.py.snap index 3c61971e4c04e..f61a8f8f5e6e1 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@pep701_f_string_py311.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@pep701_f_string_py311.py.snap @@ -60,6 +60,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -73,6 +76,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -146,6 +151,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -158,6 +166,9 @@ Module( ], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -171,6 +182,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -248,6 +261,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -261,11 +277,16 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -279,11 +300,16 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -297,6 +323,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -414,6 +442,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -434,11 +465,16 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -459,11 +495,16 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -477,11 +518,16 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -502,6 +548,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -537,6 +585,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -550,6 +601,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -591,6 +644,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -611,6 +667,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -648,6 +706,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -697,6 +757,9 @@ Module( ], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -710,6 +773,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -759,6 +824,9 @@ Module( ], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -772,11 +840,14 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@pep701_f_string_py312.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@pep701_f_string_py312.py.snap index 8a0ddf367564d..1f4c811a257c2 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@pep701_f_string_py312.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@pep701_f_string_py312.py.snap @@ -75,6 +75,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -88,6 +91,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -162,12 +167,17 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -181,6 +191,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -250,6 +262,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -263,6 +278,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -389,6 +406,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -402,11 +422,16 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -420,11 +445,16 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -438,11 +468,16 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -456,11 +491,16 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -474,11 +514,16 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -492,6 +537,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -554,6 +601,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -574,11 +624,16 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -599,6 +654,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -634,6 +691,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -647,6 +707,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -688,6 +750,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -708,11 +773,14 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@pep750_t_string_py314.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@pep750_t_string_py314.py.snap index 0d5db2d14d437..4c1f6bd03cd42 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@pep750_t_string_py314.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@pep750_t_string_py314.py.snap @@ -74,6 +74,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -86,6 +89,8 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -159,12 +164,17 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -177,6 +187,8 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -245,6 +257,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -257,6 +272,8 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -377,6 +394,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -389,11 +409,16 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -406,11 +431,16 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -423,11 +453,16 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -440,11 +475,16 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -457,11 +497,16 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -474,6 +519,8 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -534,6 +581,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -553,11 +603,16 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -577,6 +632,8 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -617,6 +674,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -636,11 +696,14 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@pep_798_unpacking_comprehensions_py315.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@pep_798_unpacking_comprehensions_py315.py.snap index 7ed54cd39f48a..a761da49682a4 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@pep_798_unpacking_comprehensions_py315.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@pep_798_unpacking_comprehensions_py315.py.snap @@ -55,6 +55,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -106,6 +108,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -151,6 +155,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -202,6 +208,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], parenthesized: true, @@ -270,6 +278,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], parenthesized: false, @@ -277,6 +287,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -327,6 +339,8 @@ Module( ), ifs: [], is_async: true, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -378,6 +392,8 @@ Module( ), ifs: [], is_async: true, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -423,6 +439,8 @@ Module( ), ifs: [], is_async: true, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -474,6 +492,8 @@ Module( ), ifs: [], is_async: true, + runtime_ifs: None, + runtime_is_async: None, }, ], parenthesized: true, @@ -482,6 +502,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@pos_only_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@pos_only_py38.py.snap index fbf17fc8613eb..71c2aa705d6f6 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@pos_only_py38.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@pos_only_py38.py.snap @@ -38,6 +38,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -46,6 +48,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -62,9 +65,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@read_from_debug.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@read_from_debug.py.snap index 993a3512aacca..3473e8088041f 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@read_from_debug.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@read_from_debug.py.snap @@ -37,6 +37,7 @@ Module( ), ], elif_else_clauses: [], + runtime_body: None, }, ), Assign( @@ -61,9 +62,13 @@ Module( ctx: Load, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@simple_stmts_in_block.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@simple_stmts_in_block.py.snap index 6dbd6b9fbffe8..1bd1ec2f01451 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@simple_stmts_in_block.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@simple_stmts_in_block.py.snap @@ -30,6 +30,7 @@ Module( ), ], elif_else_clauses: [], + runtime_body: None, }, ), If( @@ -52,6 +53,7 @@ Module( ), ], elif_else_clauses: [], + runtime_body: None, }, ), If( @@ -80,6 +82,7 @@ Module( ), ], elif_else_clauses: [], + runtime_body: None, }, ), If( @@ -108,6 +111,7 @@ Module( ), ], elif_else_clauses: [], + runtime_body: None, }, ), Assign( @@ -133,9 +137,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@simple_stmts_with_semicolons.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@simple_stmts_with_semicolons.py.snap index d86dd6c0a6e4e..3b4fb026505f0 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@simple_stmts_with_semicolons.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@simple_stmts_with_semicolons.py.snap @@ -61,6 +61,7 @@ Module( ], level: 0, is_lazy: false, + runtime_level: None, }, ), Expr( @@ -101,6 +102,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@single_parenthesized_item_context_manager_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@single_parenthesized_item_context_manager_py38.py.snap index 09e2f6d782eaa..8be6e6c68a9b3 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@single_parenthesized_item_context_manager_py38.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@single_parenthesized_item_context_manager_py38.py.snap @@ -58,6 +58,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -87,6 +89,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -137,6 +142,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -157,9 +164,13 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@single_star_in_tuple.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@single_star_in_tuple.py.snap index ca0b875086d1b..949488d3c152d 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@single_star_in_tuple.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@single_star_in_tuple.py.snap @@ -30,6 +30,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -65,6 +66,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), ), @@ -73,6 +75,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -95,6 +101,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -126,12 +133,17 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), ), }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), For( @@ -170,6 +182,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), body: [ @@ -187,6 +200,10 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), For( @@ -217,6 +234,7 @@ Module( ], ctx: Store, parenthesized: true, + runtime_elts: None, }, ), iter: Name( @@ -242,9 +260,14 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@single_starred_assignment_target.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@single_starred_assignment_target.py.snap index 05dfde51fa531..08113224b4da6 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@single_starred_assignment_target.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@single_starred_assignment_target.py.snap @@ -38,6 +38,7 @@ Module( ], ctx: Store, parenthesized: true, + runtime_elts: None, }, ), ], @@ -58,8 +59,12 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -90,6 +95,7 @@ Module( ], ctx: Store, parenthesized: false, + runtime_elts: None, }, ), ], @@ -110,8 +116,12 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -141,6 +151,7 @@ Module( ), ], ctx: Store, + runtime_elts: None, }, ), ], @@ -161,11 +172,16 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@star_index_py311.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@star_index_py311.py.snap index 562a74ae6de00..f1399d369a4d6 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@star_index_py311.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@star_index_py311.py.snap @@ -49,6 +49,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ctx: Load, @@ -115,6 +116,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ctx: Load, @@ -122,6 +124,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, ), body: [ @@ -138,6 +142,8 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), Expr( @@ -195,6 +201,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ctx: Load, @@ -257,6 +264,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ctx: Load, @@ -318,6 +326,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ctx: Load, @@ -393,6 +402,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ctx: Load, @@ -401,6 +411,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@starred_comprehension_target.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@starred_comprehension_target.py.snap index 12e7c1d476f20..045e63c2d7095 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@starred_comprehension_target.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@starred_comprehension_target.py.snap @@ -53,6 +53,7 @@ Module( ], ctx: Store, parenthesized: true, + runtime_elts: None, }, ), iter: Name( @@ -65,6 +66,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -72,6 +75,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@starred_list_comp_py315.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@starred_list_comp_py315.py.snap index 650604e3be218..613eefdb11319 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@starred_list_comp_py315.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@starred_list_comp_py315.py.snap @@ -55,6 +55,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -118,6 +120,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -125,6 +129,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__ambiguous_lpar_with_items.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__ambiguous_lpar_with_items.py.snap index 5e948486b826f..b7b051b70dc92 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__ambiguous_lpar_with_items.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__ambiguous_lpar_with_items.py.snap @@ -44,6 +44,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -80,6 +83,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -116,6 +122,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -165,6 +174,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -214,6 +226,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -298,6 +313,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -333,6 +351,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), optional_vars: None, @@ -365,6 +384,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -400,6 +422,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), optional_vars: Some( @@ -428,6 +451,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -495,6 +521,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -562,6 +591,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -599,6 +631,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), optional_vars: None, @@ -618,6 +651,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -669,6 +705,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -711,6 +750,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), optional_vars: None, @@ -730,6 +770,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -764,6 +807,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), optional_vars: None, @@ -783,6 +827,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -847,6 +894,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -920,6 +970,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -948,6 +1001,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -968,6 +1023,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -996,6 +1054,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -1016,6 +1076,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -1044,6 +1107,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -1073,6 +1138,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -1124,6 +1192,9 @@ Module( ], }, ), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -1137,6 +1208,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), optional_vars: None, @@ -1156,6 +1229,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -1208,6 +1284,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -1221,6 +1300,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), optional_vars: None, @@ -1240,6 +1321,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -1302,11 +1386,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], parenthesized: true, @@ -1342,6 +1430,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -1417,11 +1508,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], parenthesized: true, @@ -1444,6 +1539,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -1519,11 +1617,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], parenthesized: true, @@ -1559,6 +1661,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -1631,6 +1736,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -1712,6 +1820,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -1757,6 +1868,8 @@ Module( ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], parenthesized: true, @@ -1788,6 +1901,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -1833,6 +1949,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -1884,6 +2003,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -1944,6 +2066,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -1995,6 +2120,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -2059,6 +2187,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -2114,6 +2245,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -2134,6 +2267,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -2189,6 +2325,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -2218,6 +2356,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -2246,6 +2387,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -2266,6 +2409,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -2294,6 +2440,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -2323,6 +2471,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -2351,6 +2502,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -2380,6 +2533,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -2461,6 +2617,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -2511,6 +2670,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), slice: NumberLiteral( @@ -2542,6 +2702,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -2592,6 +2755,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), slice: NumberLiteral( @@ -2632,6 +2796,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -2681,6 +2848,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -2731,6 +2901,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -2778,6 +2950,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -2798,6 +2972,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -2842,6 +3019,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -2886,6 +3066,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -2928,6 +3111,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -2970,6 +3156,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -3023,6 +3212,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -3055,6 +3247,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ), @@ -3086,6 +3279,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -3104,6 +3300,7 @@ Module( elts: [], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), optional_vars: None, @@ -3123,6 +3320,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -3141,6 +3341,7 @@ Module( elts: [], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), optional_vars: Some( @@ -3169,6 +3370,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -3211,6 +3415,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), optional_vars: None, @@ -3230,6 +3435,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -3281,6 +3489,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), optional_vars: None, @@ -3300,6 +3509,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -3350,6 +3562,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), optional_vars: None, @@ -3369,6 +3582,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -3427,6 +3643,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), optional_vars: Some( @@ -3455,6 +3672,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -3482,6 +3702,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), optional_vars: Some( @@ -3510,6 +3731,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -3544,6 +3768,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), optional_vars: None, @@ -3563,6 +3788,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -3597,6 +3825,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), optional_vars: Some( @@ -3625,6 +3854,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -3660,6 +3892,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), optional_vars: Some( @@ -3688,6 +3921,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -3723,6 +3959,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), optional_vars: Some( @@ -3751,6 +3988,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -3786,6 +4026,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), optional_vars: None, @@ -3818,6 +4059,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -3858,6 +4102,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), Name( @@ -3871,6 +4116,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), optional_vars: Some( @@ -3899,6 +4145,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -3926,6 +4175,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), optional_vars: None, @@ -3970,6 +4220,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), optional_vars: Some( @@ -3998,6 +4249,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -4033,6 +4287,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), optional_vars: Some( @@ -4083,6 +4338,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -4125,6 +4383,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), optional_vars: None, @@ -4144,6 +4403,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -4186,6 +4448,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), optional_vars: Some( @@ -4214,6 +4477,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -4271,6 +4537,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), optional_vars: None, @@ -4290,6 +4557,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -4347,6 +4617,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), optional_vars: None, @@ -4366,6 +4637,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -4428,11 +4702,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], parenthesized: true, @@ -4455,6 +4733,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -4517,11 +4798,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: true, + runtime_ifs: None, + runtime_is_async: None, }, ], parenthesized: true, @@ -4544,6 +4829,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -4606,11 +4894,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], parenthesized: true, @@ -4646,9 +4938,13 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__annotated_assignment.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__annotated_assignment.py.snap index dfcabffa7688b..0e92f83784011 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__annotated_assignment.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__annotated_assignment.py.snap @@ -32,6 +32,7 @@ Module( ), value: None, simple: true, + runtime_simple: None, }, ), AnnAssign( @@ -66,6 +67,7 @@ Module( ), ), simple: true, + runtime_simple: None, }, ), AnnAssign( @@ -107,6 +109,7 @@ Module( ), value: None, simple: false, + runtime_simple: None, }, ), AnnAssign( @@ -177,10 +180,12 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), ), simple: true, + runtime_simple: None, }, ), AnnAssign( @@ -236,6 +241,7 @@ Module( ), ), simple: true, + runtime_simple: None, }, ), AnnAssign( @@ -272,6 +278,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -279,6 +287,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -303,9 +312,11 @@ Module( ), ), simple: true, + runtime_simple: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__assert.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__assert.py.snap index ae3131d0c1b8d..f4b56c1e0b498 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__assert.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__assert.py.snap @@ -41,6 +41,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), msg: None, @@ -67,6 +68,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -100,6 +103,7 @@ Module( }, ), ], + runtime_values: None, }, ), msg: None, @@ -131,6 +135,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -138,6 +144,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -282,6 +289,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -289,6 +298,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -380,6 +390,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__assignment.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__assignment.py.snap index 7239c8b5307ec..bc5f0437ca3db 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__assignment.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__assignment.py.snap @@ -59,8 +59,12 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -92,6 +96,7 @@ Module( ], ctx: Store, parenthesized: true, + runtime_elts: None, }, ), ], @@ -130,8 +135,12 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -162,6 +171,7 @@ Module( ), ], ctx: Store, + runtime_elts: None, }, ), ], @@ -200,8 +210,12 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -265,8 +279,12 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -333,8 +351,12 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -373,6 +395,7 @@ Module( ], ctx: Store, parenthesized: true, + runtime_elts: None, }, ), ], @@ -411,8 +434,12 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -451,6 +478,7 @@ Module( ), ], ctx: Store, + runtime_elts: None, }, ), ], @@ -488,8 +516,12 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -529,6 +561,7 @@ Module( ], ctx: Store, parenthesized: true, + runtime_elts: None, }, ), ], @@ -567,8 +600,12 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -610,6 +647,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -652,6 +692,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -720,8 +763,12 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -791,8 +838,12 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -830,6 +881,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -880,6 +934,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -905,6 +962,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -918,6 +978,7 @@ Module( range: 682..684, elts: [], ctx: Store, + runtime_elts: None, }, ), ], @@ -944,8 +1005,12 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -960,6 +1025,7 @@ Module( elts: [], ctx: Store, parenthesized: true, + runtime_elts: None, }, ), ], @@ -986,8 +1052,12 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -1019,6 +1089,7 @@ Module( ], ctx: Store, parenthesized: false, + runtime_elts: None, }, ), ], @@ -1030,6 +1101,9 @@ Module( ctx: Load, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -1062,9 +1136,13 @@ Module( ctx: Load, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__augmented_assignment.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__augmented_assignment.py.snap index 3b4ad5727e073..8048dbc62120f 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__augmented_assignment.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__augmented_assignment.py.snap @@ -94,6 +94,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), }, @@ -161,6 +162,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), }, @@ -547,6 +549,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__class.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__class.py.snap index 9ce6fb674c9c4..5f405bb7fc806 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__class.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__class.py.snap @@ -36,6 +36,8 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), ClassDef( @@ -55,6 +57,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, ), body: [ @@ -87,6 +91,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -94,6 +100,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -104,9 +111,15 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), ClassDef( @@ -176,6 +189,8 @@ Module( ), }, ], + runtime_args: None, + runtime_bases: None, }, ), body: [ @@ -192,6 +207,8 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), ClassDef( @@ -227,6 +244,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -259,6 +277,7 @@ Module( ], ctx: Store, parenthesized: false, + runtime_elts: None, }, ), ], @@ -270,12 +289,21 @@ Module( ctx: Load, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), ClassDef( @@ -312,6 +340,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, ), body: [ @@ -344,6 +374,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -351,6 +383,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -361,6 +394,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -392,6 +429,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -407,6 +446,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( StringLiteral( @@ -436,6 +477,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -446,9 +488,15 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), ClassDef( @@ -480,6 +528,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), arguments: Some( @@ -488,6 +537,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, ), body: [ @@ -504,6 +555,8 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), ClassDef( @@ -544,6 +597,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), arguments: Some( @@ -552,6 +606,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, ), body: [ @@ -568,6 +624,8 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), ClassDef( @@ -608,6 +666,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), arguments: Some( @@ -616,6 +675,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, ), body: [ @@ -632,6 +693,8 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), ClassDef( @@ -696,6 +759,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), arguments: Some( @@ -704,6 +768,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, ), body: [ @@ -720,6 +786,8 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), ClassDef( @@ -771,6 +839,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), ), @@ -778,6 +847,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), arguments: Some( @@ -786,6 +856,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, ), body: [ @@ -802,6 +874,8 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), ClassDef( @@ -846,6 +920,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), arguments: Some( @@ -854,6 +929,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, ), body: [ @@ -870,6 +947,8 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), ClassDef( @@ -914,6 +993,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), arguments: Some( @@ -922,6 +1002,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, ), body: [ @@ -938,6 +1020,8 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), ClassDef( @@ -968,6 +1052,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), arguments: Some( @@ -976,6 +1061,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, ), body: [ @@ -992,6 +1079,8 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), ClassDef( @@ -1067,6 +1156,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ctx: Load, @@ -1079,6 +1169,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), arguments: Some( @@ -1087,6 +1178,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, ), body: [ @@ -1103,6 +1196,8 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), ClassDef( @@ -1170,6 +1265,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ctx: Load, @@ -1182,6 +1278,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), arguments: Some( @@ -1190,6 +1287,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, ), body: [ @@ -1206,6 +1305,8 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), ClassDef( @@ -1236,6 +1337,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), arguments: Some( @@ -1244,6 +1346,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, ), body: [ @@ -1260,6 +1364,8 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), ClassDef( @@ -1310,12 +1416,14 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), ), }, ), ], + runtime_type_params: None, }, ), arguments: Some( @@ -1324,6 +1432,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, ), body: [ @@ -1340,6 +1450,8 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), ClassDef( @@ -1417,6 +1529,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), arguments: Some( @@ -1425,6 +1538,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, ), body: [ @@ -1435,9 +1550,12 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__delete.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__delete.py.snap index 50f3cb4b0bacc..46156de2f749b 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__delete.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__delete.py.snap @@ -24,6 +24,7 @@ Module( }, ), ], + runtime_targets: None, }, ), Delete( @@ -40,6 +41,7 @@ Module( }, ), ], + runtime_targets: None, }, ), Delete( @@ -64,6 +66,7 @@ Module( }, ), ], + runtime_targets: None, }, ), Delete( @@ -103,6 +106,7 @@ Module( ], ctx: Del, parenthesized: true, + runtime_elts: None, }, ), Name( @@ -114,6 +118,7 @@ Module( }, ), ], + runtime_targets: None, }, ), Delete( @@ -144,9 +149,11 @@ Module( ), ], ctx: Del, + runtime_elts: None, }, ), ], + runtime_targets: None, }, ), Delete( @@ -190,6 +197,7 @@ Module( ), ], ctx: Del, + runtime_elts: None, }, ), Name( @@ -202,9 +210,11 @@ Module( ), ], ctx: Del, + runtime_elts: None, }, ), ], + runtime_targets: None, }, ), Delete( @@ -233,6 +243,7 @@ Module( }, ), ], + runtime_targets: None, }, ), Delete( @@ -264,6 +275,7 @@ Module( }, ), ], + runtime_targets: None, }, ), Delete( @@ -330,12 +342,15 @@ Module( ], ctx: Del, parenthesized: true, + runtime_elts: None, }, ), ], + runtime_targets: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__for.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__for.py.snap index 2687f08bc2259..e7740e0939a3d 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__for.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__for.py.snap @@ -40,6 +40,10 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), For( @@ -90,6 +94,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), body: [ @@ -101,6 +106,10 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), For( @@ -145,6 +154,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -157,6 +168,10 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), For( @@ -217,6 +232,10 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), For( @@ -257,6 +276,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), body: [ @@ -268,6 +288,10 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), For( @@ -306,6 +330,7 @@ Module( }, ), ], + runtime_values: None, }, ), body: [ @@ -317,6 +342,10 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), For( @@ -356,6 +385,7 @@ Module( ], ctx: Store, parenthesized: false, + runtime_elts: None, }, ), iter: Name( @@ -375,6 +405,10 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), For( @@ -406,6 +440,7 @@ Module( ], ctx: Store, parenthesized: true, + runtime_elts: None, }, ), iter: Name( @@ -425,6 +460,10 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), For( @@ -465,6 +504,7 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), body: [ @@ -476,6 +516,10 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), For( @@ -520,6 +564,10 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), For( @@ -557,6 +605,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -564,6 +614,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -591,6 +642,10 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), For( @@ -650,6 +705,10 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), If( @@ -695,6 +754,10 @@ Module( ), ], orelse: [], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, + runtime_orelse: None, }, ), ], @@ -711,11 +774,15 @@ Module( }, ), ], + runtime_body: None, + runtime_orelse: None, }, ], + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__from_import.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__from_import.py.snap index f0dda690b3629..9ee437da0a15d 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__from_import.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__from_import.py.snap @@ -35,6 +35,7 @@ Module( ], level: 0, is_lazy: false, + runtime_level: None, }, ), ImportFrom( @@ -56,6 +57,7 @@ Module( ], level: 1, is_lazy: false, + runtime_level: None, }, ), ImportFrom( @@ -105,6 +107,7 @@ Module( ], level: 0, is_lazy: false, + runtime_level: None, }, ), ImportFrom( @@ -132,6 +135,7 @@ Module( ], level: 1, is_lazy: false, + runtime_level: None, }, ), ImportFrom( @@ -153,6 +157,7 @@ Module( ], level: 3, is_lazy: false, + runtime_level: None, }, ), ImportFrom( @@ -174,6 +179,7 @@ Module( ], level: 26, is_lazy: false, + runtime_level: None, }, ), ImportFrom( @@ -201,6 +207,7 @@ Module( ], level: 26, is_lazy: false, + runtime_level: None, }, ), ImportFrom( @@ -254,6 +261,7 @@ Module( ], level: 0, is_lazy: false, + runtime_level: None, }, ), ImportFrom( @@ -281,9 +289,11 @@ Module( ], level: 0, is_lazy: false, + runtime_level: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__function.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__function.py.snap index b115bcc40987f..25b4bd7b18a1e 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__function.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__function.py.snap @@ -30,6 +30,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -40,6 +41,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -71,6 +76,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -86,6 +93,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -101,6 +110,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -108,6 +119,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -118,6 +130,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -149,6 +165,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -164,6 +182,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -189,6 +209,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -206,6 +228,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -216,6 +239,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -246,6 +273,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -261,6 +290,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -288,6 +319,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -305,6 +338,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -315,6 +349,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -345,6 +383,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -362,6 +402,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -377,6 +419,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -384,6 +428,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -394,6 +439,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -424,6 +473,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -439,6 +490,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -466,6 +519,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -490,6 +545,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), kwonlyargs: [], @@ -503,8 +560,11 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), + runtime_defaults: None, }, returns: None, body: [ @@ -515,6 +575,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -548,6 +612,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -563,6 +629,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -578,11 +646,14 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, ], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -593,6 +664,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -626,6 +701,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -641,6 +718,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -666,6 +745,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -681,6 +762,7 @@ Module( }, ], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -691,6 +773,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -720,6 +806,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), kwonlyargs: [ @@ -735,6 +823,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -750,6 +840,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -775,6 +867,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -790,6 +884,7 @@ Module( }, ], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -800,6 +895,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -833,6 +932,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -848,6 +949,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -873,6 +976,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -897,8 +1002,11 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), + runtime_defaults: None, }, returns: None, body: [ @@ -909,6 +1017,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -938,6 +1050,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), kwonlyargs: [ @@ -953,6 +1067,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -968,6 +1084,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -993,6 +1111,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -1017,8 +1137,11 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), + runtime_defaults: None, }, returns: None, body: [ @@ -1029,6 +1152,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -1059,6 +1186,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1074,6 +1203,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1091,6 +1222,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1109,6 +1242,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1124,6 +1259,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1139,11 +1276,14 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, ], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -1154,6 +1294,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -1184,6 +1328,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1199,6 +1345,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1216,6 +1364,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1234,6 +1384,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1249,6 +1401,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -1274,6 +1428,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -1289,6 +1445,7 @@ Module( }, ], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -1299,6 +1456,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -1329,6 +1490,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1344,6 +1507,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1361,6 +1526,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1375,6 +1542,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), kwonlyargs: [ @@ -1390,6 +1559,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1405,6 +1576,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -1430,6 +1603,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -1445,6 +1620,7 @@ Module( }, ], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -1455,6 +1631,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -1485,6 +1665,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1500,6 +1682,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1517,6 +1701,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1535,6 +1721,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1550,6 +1738,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -1575,6 +1765,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -1599,8 +1791,11 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), + runtime_defaults: None, }, returns: None, body: [ @@ -1611,6 +1806,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -1641,6 +1840,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1656,6 +1857,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1673,6 +1876,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1687,6 +1892,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), kwonlyargs: [ @@ -1702,6 +1909,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1717,6 +1926,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -1742,6 +1953,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -1766,8 +1979,11 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), + runtime_defaults: None, }, returns: None, body: [ @@ -1778,6 +1994,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -1809,6 +2029,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1824,6 +2046,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1839,6 +2063,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1857,6 +2083,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1872,6 +2100,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1887,11 +2117,14 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, ], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -1902,6 +2135,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -1933,6 +2170,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1948,6 +2187,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1963,6 +2204,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1981,6 +2224,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1996,6 +2241,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -2021,6 +2268,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -2036,6 +2285,7 @@ Module( }, ], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -2046,6 +2296,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -2077,6 +2331,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -2092,6 +2348,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -2107,6 +2365,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -2121,6 +2381,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), kwonlyargs: [ @@ -2136,6 +2398,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -2151,6 +2415,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -2176,6 +2442,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -2191,6 +2459,7 @@ Module( }, ], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -2201,6 +2470,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -2232,6 +2505,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -2247,6 +2522,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -2262,6 +2539,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -2276,6 +2555,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), kwonlyargs: [ @@ -2291,6 +2572,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -2306,6 +2589,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -2331,6 +2616,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -2355,8 +2642,11 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), + runtime_defaults: None, }, returns: None, body: [ @@ -2367,6 +2657,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -2399,6 +2693,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), parameters: Parameters { @@ -2427,6 +2722,8 @@ Module( }, ), ), + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -2434,6 +2731,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: Some( Name( @@ -2453,6 +2751,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -2494,6 +2796,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), parameters: Parameters { @@ -2522,6 +2825,8 @@ Module( }, ), ), + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -2529,6 +2834,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: Some( Name( @@ -2548,6 +2854,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -2600,6 +2910,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), ), @@ -2607,6 +2918,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), parameters: Parameters { @@ -2635,6 +2947,8 @@ Module( }, ), ), + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -2642,6 +2956,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: Some( Name( @@ -2661,6 +2976,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -2692,6 +3011,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), parameters: Parameters { @@ -2725,10 +3045,13 @@ Module( }, ), ), + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: Some( Subscript( @@ -2766,6 +3089,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ctx: Load, @@ -2780,6 +3104,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -2811,6 +3139,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), parameters: Parameters { @@ -2849,6 +3178,8 @@ Module( }, ), ), + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), kwonlyargs: [], @@ -2883,8 +3214,11 @@ Module( }, ), ), + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), + runtime_defaults: None, }, returns: None, body: [ @@ -2895,6 +3229,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -2973,6 +3311,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), parameters: Parameters { @@ -2983,6 +3322,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -2993,6 +3333,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -3015,6 +3359,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -3031,6 +3376,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -3053,6 +3402,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: Some( Name( @@ -3086,6 +3436,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -3110,6 +3462,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -3139,10 +3495,13 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -3153,6 +3512,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -3184,8 +3547,11 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), + runtime_defaults: None, }, returns: None, body: [ @@ -3196,6 +3562,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -3225,6 +3595,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), kwonlyargs: [], @@ -3238,8 +3610,11 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), + runtime_defaults: None, }, returns: None, body: [ @@ -3250,6 +3625,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -3280,6 +3659,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -3288,6 +3669,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -3298,6 +3680,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -3328,6 +3714,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -3345,6 +3733,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -3352,6 +3742,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -3362,6 +3753,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -3392,6 +3787,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -3410,6 +3807,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -3420,6 +3818,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -3450,6 +3852,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -3465,6 +3869,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -3484,11 +3890,14 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, ], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -3499,6 +3908,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -3530,6 +3943,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -3558,11 +3973,14 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, ], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -3573,6 +3991,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -3613,6 +4035,8 @@ Module( }, ), ), + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -3650,6 +4074,8 @@ Module( }, ), ), + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -3691,6 +4117,8 @@ Module( }, ), ), + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -3698,6 +4126,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -3708,6 +4137,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -3739,6 +4172,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -3754,6 +4189,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -3779,6 +4216,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -3804,6 +4243,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: Some( NumberLiteral( @@ -3821,6 +4262,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -3831,9 +4273,14 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__if.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__if.py.snap index 8a4b8262da467..8a60c393bb692 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__if.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__if.py.snap @@ -72,6 +72,8 @@ Module( }, ), ], + runtime_body: None, + runtime_orelse: None, }, ElifElseClause { range: 20..28, @@ -94,8 +96,11 @@ Module( }, ), ], + runtime_body: None, + runtime_orelse: None, }, ], + runtime_body: None, }, ), If( @@ -139,6 +144,7 @@ Module( ), ], elif_else_clauses: [], + runtime_body: None, }, ), If( @@ -171,6 +177,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), body: [ @@ -200,8 +207,11 @@ Module( }, ), ], + runtime_body: None, + runtime_orelse: None, }, ], + runtime_body: None, }, ), If( @@ -252,8 +262,11 @@ Module( }, ), ], + runtime_body: None, + runtime_orelse: None, }, ], + runtime_body: None, }, ), If( @@ -283,6 +296,7 @@ Module( }, ), ], + runtime_values: None, }, ), body: [ @@ -326,6 +340,8 @@ Module( }, ), ], + runtime_body: None, + runtime_orelse: None, }, ElifElseClause { range: 158..173, @@ -354,6 +370,8 @@ Module( }, ), ], + runtime_body: None, + runtime_orelse: None, }, ElifElseClause { range: 174..189, @@ -382,6 +400,8 @@ Module( }, ), ], + runtime_body: None, + runtime_orelse: None, }, ElifElseClause { range: 190..203, @@ -409,14 +429,19 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), }, ), ], + runtime_body: None, + runtime_orelse: None, }, ], + runtime_body: None, }, ), If( @@ -501,8 +526,11 @@ Module( }, ), ], + runtime_body: None, + runtime_orelse: None, }, ], + runtime_body: None, }, ), If( @@ -531,6 +559,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -538,6 +568,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -591,6 +622,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -598,6 +631,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -625,8 +659,11 @@ Module( }, ), ], + runtime_body: None, + runtime_orelse: None, }, ], + runtime_body: None, }, ), If( @@ -695,8 +732,11 @@ Module( }, ), ], + runtime_body: None, + runtime_orelse: None, }, ], + runtime_body: None, }, ), If( @@ -769,11 +809,15 @@ Module( }, ), ], + runtime_body: None, + runtime_orelse: None, }, ], + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__import.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__import.py.snap index 6a04816af6869..c2ecb48397bc2 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__import.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__import.py.snap @@ -154,6 +154,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__match.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__match.py.snap index 496319ea71a34..5beb6d8420e58 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__match.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__match.py.snap @@ -74,9 +74,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ], }, @@ -130,6 +134,9 @@ Module( ], keywords: [], }, + runtime_patterns: None, + runtime_kwd_attrs: None, + runtime_kwd_patterns: None, }, ), guard: None, @@ -157,9 +164,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ], }, @@ -230,9 +241,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, MatchCase { range: 234..260, @@ -287,9 +302,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ], }, @@ -377,6 +396,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -402,9 +422,13 @@ Module( value: true, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ], }, @@ -466,6 +490,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), MatchSequence( @@ -504,9 +529,11 @@ Module( }, ), ], + runtime_patterns: None, }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -534,9 +561,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ], }, @@ -570,6 +601,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -604,6 +636,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 494..523, @@ -615,6 +648,8 @@ Module( keys: [], patterns: [], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), guard: None, @@ -649,6 +684,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -727,13 +763,18 @@ Module( keys: [], patterns: [], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), ], + runtime_patterns: None, }, ), ], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), guard: None, @@ -761,9 +802,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, MatchCase { range: 599..687, @@ -836,9 +881,12 @@ Module( keys: [], patterns: [], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), ], + runtime_patterns: None, }, ), MatchSingleton( @@ -849,10 +897,13 @@ Module( }, ), ], + runtime_patterns: None, }, ), ], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), MatchMapping( @@ -881,13 +932,17 @@ Module( node_index: NodeIndex(None), range: 634..636, patterns: [], + runtime_patterns: None, }, ), ], + runtime_patterns: None, }, ), ], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), MatchMapping( @@ -948,13 +1003,18 @@ Module( keys: [], patterns: [], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), ], + runtime_patterns: None, }, ), ], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), MatchSequence( @@ -962,6 +1022,7 @@ Module( node_index: NodeIndex(None), range: 659..661, patterns: [], + runtime_patterns: None, }, ), MatchValue( @@ -998,9 +1059,12 @@ Module( keys: [], patterns: [], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -1028,9 +1092,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, MatchCase { range: 692..714, @@ -1040,6 +1108,7 @@ Module( node_index: NodeIndex(None), range: 697..699, patterns: [], + runtime_patterns: None, }, ), guard: None, @@ -1067,9 +1136,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ], }, @@ -1147,9 +1220,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ], }, @@ -1218,9 +1295,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ], }, @@ -1308,6 +1389,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -1333,9 +1415,13 @@ Module( value: true, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ], }, @@ -1405,9 +1491,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ], }, @@ -1461,6 +1551,8 @@ Module( ), ], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), guard: None, @@ -1488,9 +1580,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, MatchCase { range: 1042..1068, @@ -1528,6 +1624,8 @@ Module( ), ], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), guard: None, @@ -1555,9 +1653,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, MatchCase { range: 1073..1098, @@ -1575,6 +1677,8 @@ Module( node_index: NodeIndex(None), }, ), + runtime_keys: None, + runtime_patterns: None, }, ), guard: None, @@ -1602,9 +1706,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ], }, @@ -1630,6 +1738,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -1650,6 +1760,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -1677,9 +1788,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ], }, @@ -1740,9 +1855,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, MatchCase { range: 1224..1245, @@ -1787,9 +1906,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ], }, @@ -1854,6 +1977,8 @@ Module( ), ], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), guard: None, @@ -1880,9 +2005,13 @@ Module( ctx: Load, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ], }, @@ -1926,6 +2055,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), cases: [ @@ -1996,6 +2126,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -2023,9 +2154,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ], }, @@ -2067,6 +2202,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -2094,9 +2230,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, MatchCase { range: 1456..1498, @@ -2137,6 +2277,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), guard: Some( @@ -2213,9 +2354,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, MatchCase { range: 1503..1529, @@ -2256,6 +2401,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -2283,9 +2429,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ], }, @@ -2347,6 +2497,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -2374,9 +2525,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ], }, @@ -2461,9 +2616,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ], }, @@ -2488,6 +2647,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), cases: [ @@ -2514,6 +2674,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -2541,9 +2702,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ], }, @@ -2639,9 +2804,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ], }, @@ -2694,9 +2863,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ], }, @@ -2757,9 +2930,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ], }, @@ -2812,9 +2989,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ], }, @@ -2840,6 +3021,7 @@ Module( node_index: NodeIndex(None), range: 2008..2010, patterns: [], + runtime_patterns: None, }, ), guard: None, @@ -2867,9 +3049,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, MatchCase { range: 2030..2054, @@ -2907,6 +3093,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -2934,9 +3121,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, MatchCase { range: 2059..2081, @@ -2993,9 +3184,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ], }, @@ -3055,9 +3250,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ], }, @@ -3125,6 +3324,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -3152,9 +3352,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ], }, @@ -3271,6 +3475,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), guard: Some( @@ -3315,6 +3520,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), ), @@ -3342,9 +3548,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ], }, @@ -3423,13 +3633,18 @@ Module( keys: [], patterns: [], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), ], + runtime_patterns: None, }, ), ], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), guard: None, @@ -3457,9 +3672,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, MatchCase { range: 2383..2472, @@ -3532,9 +3751,12 @@ Module( keys: [], patterns: [], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), ], + runtime_patterns: None, }, ), MatchSingleton( @@ -3545,10 +3767,13 @@ Module( }, ), ], + runtime_patterns: None, }, ), ], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), MatchMapping( @@ -3577,13 +3802,17 @@ Module( node_index: NodeIndex(None), range: 2419..2421, patterns: [], + runtime_patterns: None, }, ), ], + runtime_patterns: None, }, ), ], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), MatchMapping( @@ -3644,13 +3873,18 @@ Module( keys: [], patterns: [], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), ], + runtime_patterns: None, }, ), ], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), MatchSequence( @@ -3658,6 +3892,7 @@ Module( node_index: NodeIndex(None), range: 2444..2446, patterns: [], + runtime_patterns: None, }, ), MatchValue( @@ -3694,9 +3929,12 @@ Module( keys: [], patterns: [], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -3724,9 +3962,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, MatchCase { range: 2477..2499, @@ -3736,6 +3978,7 @@ Module( node_index: NodeIndex(None), range: 2482..2484, patterns: [], + runtime_patterns: None, }, ), guard: None, @@ -3763,9 +4006,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ], }, @@ -3809,6 +4056,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), cases: [ @@ -3849,6 +4097,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -3876,9 +4125,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ], }, @@ -3922,6 +4175,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), cases: [ @@ -3962,6 +4216,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -3989,9 +4244,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ], }, @@ -4016,6 +4275,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), cases: [ @@ -4042,6 +4302,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -4069,9 +4330,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ], }, @@ -4104,6 +4369,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), cases: [ @@ -4144,6 +4410,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -4171,9 +4438,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ], }, @@ -4212,6 +4483,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), cases: [ @@ -4253,6 +4525,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -4280,9 +4553,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ], }, @@ -4333,6 +4610,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -4346,6 +4626,8 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), }, @@ -4359,6 +4641,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -4407,6 +4690,7 @@ Module( ), }, ], + runtime_values: None, }, ), cases: [ @@ -4426,6 +4710,8 @@ Module( node_index: NodeIndex(None), }, ), + runtime_keys: None, + runtime_patterns: None, }, ), guard: None, @@ -4460,12 +4746,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), }, ), ], + runtime_body: None, }, ], }, @@ -4526,6 +4815,7 @@ Module( ), }, ], + runtime_values: None, }, ), cases: [ @@ -4588,6 +4878,9 @@ Module( patterns: [], keywords: [], }, + runtime_patterns: None, + runtime_kwd_attrs: None, + runtime_kwd_patterns: None, }, ), MatchSingleton( @@ -4598,6 +4891,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), ), @@ -4612,6 +4906,8 @@ Module( ), ], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), guard: None, @@ -4646,12 +4942,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), }, ), ], + runtime_body: None, }, ], }, @@ -4708,6 +5007,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -4735,9 +5035,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ], }, @@ -4794,6 +5098,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -4821,9 +5126,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ], }, @@ -4865,6 +5174,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -4892,9 +5202,13 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), ], + runtime_body: None, }, ], }, @@ -4919,6 +5233,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), cases: [ @@ -4948,6 +5263,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -4980,6 +5296,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), cases: [ @@ -5009,6 +5326,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -5041,6 +5359,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), cases: [ @@ -5070,6 +5389,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -5112,6 +5432,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 3425..3447, @@ -5138,6 +5459,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 3452..3475, @@ -5164,6 +5486,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -5225,6 +5548,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 3536..3559, @@ -5282,6 +5606,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 3564..3584, @@ -5328,6 +5653,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 3589..3610, @@ -5374,6 +5700,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 3615..3634, @@ -5408,6 +5735,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 3639..3660, @@ -5442,6 +5770,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 3665..3687, @@ -5477,6 +5806,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 3692..3716, @@ -5528,6 +5858,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 3721..3741, @@ -5569,6 +5900,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 3746..3767, @@ -5610,6 +5942,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 3772..3795, @@ -5651,6 +5984,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 3800..3821, @@ -5685,6 +6019,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -5741,6 +6076,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -5758,6 +6094,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 3881..3927, @@ -5890,6 +6227,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -5907,6 +6245,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -5956,6 +6295,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -6020,6 +6360,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -6081,6 +6422,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), ), @@ -6108,6 +6450,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 4065..4096, @@ -6174,6 +6517,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 4101..4128, @@ -6234,6 +6578,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 4133..4157, @@ -6276,6 +6621,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -6319,6 +6665,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -6390,6 +6737,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -6407,6 +6755,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 4258..4286, @@ -6462,6 +6811,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -6479,6 +6829,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 4291..4331, @@ -6568,6 +6919,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -6585,6 +6937,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 4336..4370, @@ -6644,6 +6997,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), ), @@ -6671,6 +7025,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 4375..4407, @@ -6743,6 +7098,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -6760,6 +7116,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 4412..4440, @@ -6805,6 +7162,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), MatchValue( @@ -6823,6 +7181,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -6840,6 +7199,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 4445..4466, @@ -6865,6 +7225,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -6882,6 +7243,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -6921,6 +7283,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -6938,6 +7301,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 4526..4547, @@ -6955,6 +7319,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -6972,6 +7337,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 4552..4583, @@ -7025,6 +7391,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -7042,6 +7409,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 4588..4616, @@ -7089,6 +7457,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), guard: None, @@ -7106,6 +7475,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -7144,6 +7514,9 @@ Module( patterns: [], keywords: [], }, + runtime_patterns: None, + runtime_kwd_attrs: None, + runtime_kwd_patterns: None, }, ), guard: None, @@ -7161,6 +7534,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 4681..4710, @@ -7207,6 +7581,9 @@ Module( patterns: [], keywords: [], }, + runtime_patterns: None, + runtime_kwd_attrs: None, + runtime_kwd_patterns: None, }, ), guard: None, @@ -7224,6 +7601,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 4715..4745, @@ -7271,6 +7649,9 @@ Module( }, ], }, + runtime_patterns: None, + runtime_kwd_attrs: None, + runtime_kwd_patterns: None, }, ), guard: None, @@ -7288,6 +7669,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 4750..4786, @@ -7359,6 +7741,9 @@ Module( }, ], }, + runtime_patterns: None, + runtime_kwd_attrs: None, + runtime_kwd_patterns: None, }, ), guard: None, @@ -7376,6 +7761,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 4791..4822, @@ -7429,6 +7815,9 @@ Module( ], keywords: [], }, + runtime_patterns: None, + runtime_kwd_attrs: None, + runtime_kwd_patterns: None, }, ), guard: None, @@ -7446,6 +7835,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 4827..4865, @@ -7502,6 +7892,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), ], @@ -7532,6 +7923,9 @@ Module( }, ], }, + runtime_patterns: None, + runtime_kwd_attrs: None, + runtime_kwd_patterns: None, }, ), guard: None, @@ -7549,6 +7943,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 4870..4910, @@ -7614,6 +8009,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), }, @@ -7643,6 +8039,9 @@ Module( }, ], }, + runtime_patterns: None, + runtime_kwd_attrs: None, + runtime_kwd_patterns: None, }, ), guard: None, @@ -7660,6 +8059,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -7720,6 +8120,8 @@ Module( ), ], rest: None, + runtime_keys: None, + runtime_patterns: None, }, ), guard: None, @@ -7737,6 +8139,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 4981..5028, @@ -7825,6 +8228,7 @@ Module( }, ), ], + runtime_patterns: None, }, ), ], @@ -7835,6 +8239,8 @@ Module( node_index: NodeIndex(None), }, ), + runtime_keys: None, + runtime_patterns: None, }, ), guard: None, @@ -7852,6 +8258,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -7924,6 +8331,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 5085..5106, @@ -7970,6 +8378,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), ), @@ -7987,6 +8396,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -8049,6 +8459,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), }, @@ -8111,6 +8522,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), }, @@ -8175,6 +8587,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -8343,6 +8757,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -8395,6 +8811,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -8439,10 +8857,13 @@ Module( elts: [], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -8487,10 +8908,13 @@ Module( elts: [], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -8581,6 +9005,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ctx: Load, @@ -8632,6 +9057,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), ctx: Load, @@ -8672,6 +9098,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -8743,6 +9171,7 @@ Module( ), ], elif_else_clauses: [], + runtime_body: None, }, ), Match( @@ -8785,6 +9214,7 @@ Module( }, ), ], + runtime_body: None, }, MatchCase { range: 5695..5715, @@ -8813,6 +9243,7 @@ Module( }, ), ], + runtime_body: None, }, ], }, @@ -8853,6 +9284,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -8860,6 +9293,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Compare( @@ -8887,10 +9321,14 @@ Module( }, ), ], + runtime_comparators: None, }, ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Expr( @@ -8940,17 +9378,22 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__raise.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__raise.py.snap index 698cce3151c08..ba45b4878684b 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__raise.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__raise.py.snap @@ -64,6 +64,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), ), @@ -102,6 +103,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), ), @@ -136,6 +138,7 @@ Module( }, ), ], + runtime_values: None, }, ), ), @@ -169,6 +172,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -176,6 +181,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -318,6 +324,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), ), @@ -365,6 +372,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), ), @@ -408,6 +416,7 @@ Module( }, ), ], + runtime_values: None, }, ), ), @@ -450,6 +459,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -457,6 +468,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -552,6 +564,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__return.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__return.py.snap index cfedbc7332f91..2c79b7787d7cd 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__return.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__return.py.snap @@ -76,6 +76,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ), @@ -154,6 +155,7 @@ Module( }, ), ], + runtime_values: None, }, ), ), @@ -191,6 +193,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), ), @@ -227,6 +230,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ), @@ -254,6 +258,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -294,6 +300,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -349,6 +357,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -356,6 +366,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -372,6 +383,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__simple.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__simple.py.snap index ee65e7f1fd4fe..ee393e08c678d 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__simple.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__simple.py.snap @@ -49,6 +49,7 @@ Module( ), ], elif_else_clauses: [], + runtime_body: None, }, ), If( @@ -71,6 +72,7 @@ Module( ), ], elif_else_clauses: [], + runtime_body: None, }, ), Expr( @@ -213,6 +215,7 @@ Module( }, ), ], + runtime_targets: None, }, ), ], @@ -237,8 +240,11 @@ Module( }, ), ], + runtime_body: None, + runtime_orelse: None, }, ], + runtime_body: None, }, ), If( @@ -278,9 +284,11 @@ Module( ), ], elif_else_clauses: [], + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__try.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__try.py.snap index 6aae2f4228b2a..a8b6254b65bd9 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__try.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__try.py.snap @@ -49,12 +49,17 @@ Module( }, ), ], + runtime_body: None, }, ), ], orelse: [], finalbody: [], is_star: false, + runtime_body: None, + runtime_handlers: None, + runtime_orelse: None, + runtime_finalbody: None, }, ), Try( @@ -111,6 +116,7 @@ Module( }, ), ], + runtime_body: None, }, ), ExceptHandler( @@ -148,12 +154,17 @@ Module( }, ), ], + runtime_body: None, }, ), ], orelse: [], finalbody: [], is_star: false, + runtime_body: None, + runtime_handlers: None, + runtime_orelse: None, + runtime_finalbody: None, }, ), Try( @@ -210,6 +221,7 @@ Module( }, ), ], + runtime_body: None, }, ), ExceptHandler( @@ -232,6 +244,7 @@ Module( }, ), ], + runtime_body: None, }, ), ], @@ -251,6 +264,10 @@ Module( ), ], is_star: false, + runtime_body: None, + runtime_handlers: None, + runtime_orelse: None, + runtime_finalbody: None, }, ), Try( @@ -292,6 +309,7 @@ Module( }, ), ], + runtime_body: None, }, ), ], @@ -311,6 +329,10 @@ Module( ], finalbody: [], is_star: false, + runtime_body: None, + runtime_handlers: None, + runtime_orelse: None, + runtime_finalbody: None, }, ), Try( @@ -352,6 +374,7 @@ Module( }, ), ], + runtime_body: None, }, ), ], @@ -384,6 +407,10 @@ Module( ), ], is_star: false, + runtime_body: None, + runtime_handlers: None, + runtime_orelse: None, + runtime_finalbody: None, }, ), Try( @@ -421,6 +448,10 @@ Module( ), ], is_star: false, + runtime_body: None, + runtime_handlers: None, + runtime_orelse: None, + runtime_finalbody: None, }, ), Try( @@ -471,6 +502,10 @@ Module( ), ], is_star: false, + runtime_body: None, + runtime_handlers: None, + runtime_orelse: None, + runtime_finalbody: None, }, ), Try( @@ -527,6 +562,7 @@ Module( }, ), ], + runtime_body: None, }, ), ExceptHandler( @@ -558,12 +594,17 @@ Module( }, ), ], + runtime_body: None, }, ), ], orelse: [], finalbody: [], is_star: true, + runtime_body: None, + runtime_handlers: None, + runtime_orelse: None, + runtime_finalbody: None, }, ), Try( @@ -603,6 +644,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -702,12 +745,17 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -721,16 +769,21 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), }, ), ], + runtime_body: None, }, ), ExceptHandler( @@ -823,12 +876,17 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -842,22 +900,31 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), }, ), ], + runtime_body: None, }, ), ], orelse: [], finalbody: [], is_star: false, + runtime_body: None, + runtime_handlers: None, + runtime_orelse: None, + runtime_finalbody: None, }, ), Try( @@ -939,6 +1006,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -969,6 +1038,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -999,6 +1070,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -1029,15 +1102,20 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ], ctx: Load, + runtime_elts: None, }, ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -1137,12 +1215,17 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -1179,6 +1262,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -1192,16 +1278,21 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), }, ), ], + runtime_body: None, }, ), ExceptHandler( @@ -1294,12 +1385,17 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), Literal( @@ -1336,6 +1432,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -1349,22 +1448,31 @@ Module( ), ), }, + runtime_joined_str: None, + runtime_values: None, }, ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), }, ), ], + runtime_body: None, }, ), ], orelse: [], finalbody: [], is_star: true, + runtime_body: None, + runtime_handlers: None, + runtime_orelse: None, + runtime_finalbody: None, }, ), Try( @@ -1416,6 +1524,7 @@ Module( }, ), ], + runtime_body: None, }, ), ExceptHandler( @@ -1442,6 +1551,7 @@ Module( }, ), ], + runtime_body: None, }, ), ExceptHandler( @@ -1466,6 +1576,7 @@ Module( }, ), ], + runtime_body: None, }, ), ExceptHandler( @@ -1508,6 +1619,7 @@ Module( }, ), ], + runtime_body: None, }, ), ExceptHandler( @@ -1548,6 +1660,7 @@ Module( }, ), ], + runtime_body: None, }, ), ExceptHandler( @@ -1578,6 +1691,7 @@ Module( }, ), ], + runtime_values: None, }, ), ), @@ -1590,6 +1704,7 @@ Module( }, ), ], + runtime_body: None, }, ), ExceptHandler( @@ -1621,6 +1736,7 @@ Module( }, ), ], + runtime_body: None, }, ), ExceptHandler( @@ -1650,6 +1766,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -1657,6 +1775,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -1679,6 +1798,7 @@ Module( }, ), ], + runtime_body: None, }, ), ExceptHandler( @@ -1725,12 +1845,17 @@ Module( }, ), ], + runtime_body: None, }, ), ], orelse: [], finalbody: [], is_star: false, + runtime_body: None, + runtime_handlers: None, + runtime_orelse: None, + runtime_finalbody: None, }, ), If( @@ -1768,6 +1893,10 @@ Module( ), ], is_star: false, + runtime_body: None, + runtime_handlers: None, + runtime_orelse: None, + runtime_finalbody: None, }, ), ], @@ -1784,11 +1913,15 @@ Module( }, ), ], + runtime_body: None, + runtime_orelse: None, }, ], + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__type.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__type.py.snap index 6b807b46b05e4..e7c435533ed18 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__type.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__type.py.snap @@ -153,6 +153,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: BinOp( @@ -241,6 +242,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -284,6 +286,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: BinOp( @@ -396,6 +399,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Tuple( @@ -430,6 +434,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), }, @@ -498,6 +503,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Tuple( @@ -532,6 +538,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), }, @@ -587,6 +594,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), ), @@ -618,6 +626,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Tuple( @@ -652,6 +661,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), }, @@ -696,6 +706,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: BinOp( @@ -787,6 +798,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: BinOp( @@ -896,6 +908,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ctx: Load, @@ -908,6 +921,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Subscript( @@ -961,6 +975,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ctx: Load, @@ -1018,12 +1033,14 @@ Module( ), ], ctx: Load, + runtime_elts: None, }, ), ), }, ), ], + runtime_type_params: None, }, ), value: Subscript( @@ -1062,6 +1079,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ctx: Load, @@ -1330,6 +1348,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -1373,6 +1392,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -1416,6 +1436,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -1534,6 +1555,8 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), TypeAlias( @@ -1585,6 +1608,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ctx: Load, @@ -1623,6 +1647,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Subscript( @@ -1661,6 +1686,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ctx: Load, @@ -1698,6 +1724,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Subscript( @@ -1736,6 +1763,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ctx: Load, @@ -1773,6 +1801,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Subscript( @@ -1818,6 +1847,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ctx: Load, @@ -1865,6 +1895,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Subscript( @@ -1943,6 +1974,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), ), @@ -1950,6 +1982,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Subscript( @@ -2035,6 +2068,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), }, @@ -2097,6 +2131,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), }, @@ -2161,6 +2196,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -2329,6 +2366,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -2381,6 +2420,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -2425,10 +2466,13 @@ Module( elts: [], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -2473,10 +2517,13 @@ Module( elts: [], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -2567,6 +2614,7 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), ctx: Load, @@ -2618,6 +2666,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), ctx: Load, @@ -2658,6 +2707,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -2729,6 +2780,7 @@ Module( ), ], elif_else_clauses: [], + runtime_body: None, }, ), Assign( @@ -2767,6 +2819,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -2774,6 +2828,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Compare( @@ -2801,10 +2856,14 @@ Module( }, ), ], + runtime_comparators: None, }, ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Expr( @@ -2854,11 +2913,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -2894,6 +2957,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -2938,8 +3003,12 @@ Module( }, ), ], + runtime_comparators: None, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -2982,9 +3051,14 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Expr( @@ -3028,6 +3102,8 @@ Module( ), }, ], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -3056,6 +3132,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -3089,6 +3168,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Assign( @@ -3122,6 +3204,9 @@ Module( ), }, ), + runtime_targets: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, ), Expr( @@ -3150,6 +3235,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -3157,6 +3244,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -3172,6 +3260,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__while.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__while.py.snap index 211ddf7e05637..fcb3a5d0189f7 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__while.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__while.py.snap @@ -37,6 +37,8 @@ Module( ), ], orelse: [], + runtime_body: None, + runtime_orelse: None, }, ), While( @@ -75,6 +77,7 @@ Module( }, ), ], + runtime_comparators: None, }, ), Name( @@ -86,6 +89,7 @@ Module( }, ), ], + runtime_values: None, }, ), body: [ @@ -110,6 +114,8 @@ Module( }, ), ], + runtime_body: None, + runtime_orelse: None, }, ), While( @@ -139,6 +145,7 @@ Module( }, ), ], + runtime_values: None, }, ), body: [ @@ -197,6 +204,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -247,6 +256,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -265,6 +276,8 @@ Module( }, ), ], + runtime_body: None, + runtime_orelse: None, }, ), While( @@ -308,6 +321,8 @@ Module( ), ], orelse: [], + runtime_body: None, + runtime_orelse: None, }, ), While( @@ -351,6 +366,7 @@ Module( }, ), ], + runtime_values: None, }, ), body: [ @@ -368,6 +384,8 @@ Module( ), ], orelse: [], + runtime_body: None, + runtime_orelse: None, }, ), While( @@ -396,6 +414,8 @@ Module( node_index: NodeIndex(None), }, annotation: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -403,6 +423,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, ), body: Name( @@ -430,6 +451,8 @@ Module( ), ], orelse: [], + runtime_body: None, + runtime_orelse: None, }, ), While( @@ -465,6 +488,8 @@ Module( ), ], orelse: [], + runtime_body: None, + runtime_orelse: None, }, ), If( @@ -507,6 +532,8 @@ Module( }, ), ], + runtime_body: None, + runtime_orelse: None, }, ), ], @@ -523,11 +550,15 @@ Module( }, ), ], + runtime_body: None, + runtime_orelse: None, }, ], + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__with.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__with.py.snap index 7919e803c86e6..6a7ad34327b98 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__with.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@statement__with.py.snap @@ -44,6 +44,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -89,6 +92,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -138,6 +144,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -205,6 +214,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -262,6 +274,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -328,6 +343,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -356,6 +374,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -385,6 +405,9 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), With( @@ -413,6 +436,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), @@ -454,9 +479,13 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@template_strings_py314.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@template_strings_py314.py.snap index e714e59451e56..b43823b8474c1 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@template_strings_py314.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@template_strings_py314.py.snap @@ -39,6 +39,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -51,6 +54,8 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -84,6 +89,9 @@ Module( debug_text: None, conversion: None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, ), ], @@ -96,6 +104,8 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, @@ -131,11 +141,14 @@ Module( }, ), }, + runtime_template_str: None, + runtime_values: None, }, ), }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@tuple_context_manager_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@tuple_context_manager_py38.py.snap index 230855ad42411..4fe4642e0b1a2 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@tuple_context_manager_py38.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@tuple_context_manager_py38.py.snap @@ -51,6 +51,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), optional_vars: Some( @@ -79,9 +80,13 @@ Module( }, ), ], + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_param_default_py313.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_param_default_py313.py.snap index df2192d1fb262..d7383a7ca264e 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_param_default_py313.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_param_default_py313.py.snap @@ -50,6 +50,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -101,6 +102,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), parameters: Parameters { @@ -111,6 +113,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -127,6 +130,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ClassDef( @@ -167,6 +174,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), arguments: Some( @@ -175,6 +183,8 @@ Module( node_index: NodeIndex(None), args: [], keywords: [], + runtime_args: None, + runtime_bases: None, }, ), body: [ @@ -191,9 +201,12 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_param_param_spec.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_param_param_spec.py.snap index abeecd8020139..e2fb9d35b742b 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_param_param_spec.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_param_param_spec.py.snap @@ -40,6 +40,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -91,6 +92,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -146,6 +148,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -210,6 +213,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -223,6 +227,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_param_type_var.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_param_type_var.py.snap index e3aad35342136..0104c3f30fd4c 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_param_type_var.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_param_type_var.py.snap @@ -41,6 +41,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -93,6 +94,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -154,6 +156,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -217,6 +220,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), ), @@ -233,6 +237,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -327,6 +332,7 @@ Module( ], ctx: Load, parenthesized: true, + runtime_elts: None, }, ), ), @@ -343,6 +349,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -356,6 +363,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_param_type_var_tuple.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_param_type_var_tuple.py.snap index 715499e6fd210..e70bb1ff777a1 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_param_type_var_tuple.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_param_type_var_tuple.py.snap @@ -40,6 +40,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -91,6 +92,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -149,6 +151,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -204,6 +207,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -268,6 +272,7 @@ Module( }, ), ], + runtime_type_params: None, }, ), value: Name( @@ -281,6 +286,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_stmt_py312.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_stmt_py312.py.snap index c1849f86cc312..a422a9436d147 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_stmt_py312.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@type_stmt_py312.py.snap @@ -34,6 +34,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@unparenthesized_named_expr_index_py39.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@unparenthesized_named_expr_index_py39.py.snap index 1f121dbd2d856..6931ce797ed5c 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@unparenthesized_named_expr_index_py39.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@unparenthesized_named_expr_index_py39.py.snap @@ -55,6 +55,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@unparenthesized_named_expr_py39.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@unparenthesized_named_expr_py39.py.snap index e95fef868f1a9..9882da1b40741 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@unparenthesized_named_expr_py39.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@unparenthesized_named_expr_py39.py.snap @@ -61,6 +61,7 @@ Module( }, ), ], + runtime_elts: None, }, ), }, @@ -134,11 +135,15 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, }, ), ifs: [], is_async: false, + runtime_ifs: None, + runtime_is_async: None, }, ], }, @@ -146,6 +151,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@valid_annotation_class.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@valid_annotation_class.py.snap index 87c63be67c450..32fc3e6556383 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@valid_annotation_class.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@valid_annotation_class.py.snap @@ -50,6 +50,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, ), body: [ @@ -66,6 +68,8 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), FunctionDef( @@ -88,6 +92,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -126,6 +131,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, ), body: [ @@ -142,6 +149,8 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), ClassDef( @@ -177,6 +186,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, ), body: [ @@ -193,9 +204,15 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -218,6 +235,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -254,6 +272,8 @@ Module( ), ], keywords: [], + runtime_args: None, + runtime_bases: None, }, ), body: [ @@ -270,12 +290,19 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_body: None, }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@valid_annotation_function_py313.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@valid_annotation_function_py313.py.snap index c70dedf89f148..81786ebbb1f1f 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@valid_annotation_function_py313.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@valid_annotation_function_py313.py.snap @@ -30,6 +30,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: Some( Named( @@ -70,6 +71,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -125,6 +130,8 @@ Module( }, ), ), + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -132,6 +139,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -148,6 +156,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -170,6 +182,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -220,6 +233,8 @@ Module( }, ), ), + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -227,6 +242,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -243,6 +259,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -265,6 +285,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: Some( Yield( @@ -299,6 +320,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -346,6 +371,8 @@ Module( }, ), ), + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -353,6 +380,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -369,6 +397,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -391,6 +423,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: Some( YieldFrom( @@ -423,9 +456,17 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -448,6 +489,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -471,6 +513,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: Some( Await( @@ -503,6 +546,10 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -550,6 +597,8 @@ Module( }, ), ), + runtime_type_comment: None, + runtime_type_comment_bytes: None, }, default: None, }, @@ -557,6 +606,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -573,12 +623,21 @@ Module( }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@valid_annotation_py313.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@valid_annotation_py313.py.snap index b8f364cf8bed0..f295038db3078 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@valid_annotation_py313.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@valid_annotation_py313.py.snap @@ -47,6 +47,7 @@ Module( ), value: None, simple: true, + runtime_simple: None, }, ), FunctionDef( @@ -69,6 +70,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -103,6 +105,7 @@ Module( ), value: None, simple: true, + runtime_simple: None, }, ), AnnAssign( @@ -134,9 +137,14 @@ Module( ), value: None, simple: true, + runtime_simple: None, }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), FunctionDef( @@ -159,6 +167,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -191,12 +200,18 @@ Module( ), value: None, simple: true, + runtime_simple: None, }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@valid_future_feature.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@valid_future_feature.py.snap index 6ccb3ace97c0b..e76157abcac12 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@valid_future_feature.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@valid_future_feature.py.snap @@ -35,9 +35,11 @@ Module( ], level: 0, is_lazy: false, + runtime_level: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@walrus_py38.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@walrus_py38.py.snap index 0dba7ff0cd00e..844b80c29cefd 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@walrus_py38.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@walrus_py38.py.snap @@ -40,6 +40,7 @@ Module( }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_parser/tests/snapshots/valid_syntax@yield_after_comma_parenthesized.py.snap b/crates/ruff_python_parser/tests/snapshots/valid_syntax@yield_after_comma_parenthesized.py.snap index a81d9c64dd58c..b53c2c4bd706e 100644 --- a/crates/ruff_python_parser/tests/snapshots/valid_syntax@yield_after_comma_parenthesized.py.snap +++ b/crates/ruff_python_parser/tests/snapshots/valid_syntax@yield_after_comma_parenthesized.py.snap @@ -30,6 +30,7 @@ Module( vararg: None, kwonlyargs: [], kwarg: None, + runtime_defaults: None, }, returns: None, body: [ @@ -71,14 +72,20 @@ Module( ], ctx: Load, parenthesized: false, + runtime_elts: None, }, ), }, ), ], + runtime_decorator_list: None, + runtime_type_comment: None, + runtime_type_comment_bytes: None, + runtime_body: None, }, ), ], + runtime_body: None, }, ) ``` diff --git a/crates/ruff_python_semantic/src/analyze/type_inference.rs b/crates/ruff_python_semantic/src/analyze/type_inference.rs index b2573a31db415..27230ac5a0849 100644 --- a/crates/ruff_python_semantic/src/analyze/type_inference.rs +++ b/crates/ruff_python_semantic/src/analyze/type_inference.rs @@ -342,6 +342,7 @@ impl From<&Expr> for ResolvedPythonType { ResolvedPythonType::Unknown } Expr::Lambda(_) + | Expr::Constant(_) | Expr::Await(_) | Expr::Yield(_) | Expr::YieldFrom(_) diff --git a/crates/ruff_python_semantic/src/imports.rs b/crates/ruff_python_semantic/src/imports.rs index 5fe5382929619..0c0d8f190ea26 100644 --- a/crates/ruff_python_semantic/src/imports.rs +++ b/crates/ruff_python_semantic/src/imports.rs @@ -232,6 +232,7 @@ impl<'de> serde::de::Deserialize<'de> for NameImports { is_lazy: _, range: _, node_index: _, + runtime_level: _, }) => names .iter() .map(|name| { diff --git a/crates/ruff_python_trivia/Cargo.toml b/crates/ruff_python_trivia/Cargo.toml index a94655cb9db63..9d8c416599eb4 100644 --- a/crates/ruff_python_trivia/Cargo.toml +++ b/crates/ruff_python_trivia/Cargo.toml @@ -1,7 +1,7 @@ [package] -name = "ruff_python_trivia" -version = "0.0.11" -description = "This is an internal component crate of Ruff" +description = "Unofficial fork for RustPython" +name = "rustpython-ruff_python_trivia" +version = "0.16.5" authors = { workspace = true } edition = { workspace = true } rust-version = { workspace = true } @@ -11,6 +11,7 @@ repository = { workspace = true } license = { workspace = true } [lib] +name = "ruff_python_trivia" [dependencies] ruff_source_file = { workspace = true } diff --git a/crates/ruff_source_file/Cargo.toml b/crates/ruff_source_file/Cargo.toml index e286f36f798d8..cdfaa64415337 100644 --- a/crates/ruff_source_file/Cargo.toml +++ b/crates/ruff_source_file/Cargo.toml @@ -1,7 +1,7 @@ [package] -name = "ruff_source_file" -version = "0.0.11" -description = "This is an internal component crate of Ruff" +description = "Unofficial fork for RustPython" +name = "rustpython-ruff_source_file" +version = "0.16.5" authors = { workspace = true } edition = { workspace = true } rust-version = { workspace = true } @@ -11,6 +11,7 @@ repository = { workspace = true } license = { workspace = true } [lib] +name = "ruff_source_file" [dependencies] ruff_text_size = { workspace = true } diff --git a/crates/ruff_text_size/Cargo.toml b/crates/ruff_text_size/Cargo.toml index eed85f6a64e56..debe28c0cca2d 100644 --- a/crates/ruff_text_size/Cargo.toml +++ b/crates/ruff_text_size/Cargo.toml @@ -1,7 +1,7 @@ [package] -name = "ruff_text_size" -version = "0.0.11" -description = "This is an internal component crate of Ruff" +description = "Unofficial fork for RustPython" +name = "rustpython-ruff_text_size" +version = "0.16.5" authors = { workspace = true } edition = { workspace = true } rust-version = { workspace = true } @@ -32,4 +32,5 @@ path = "tests/serde.rs" required-features = ["serde"] [lib] +name = "ruff_text_size" test = false diff --git a/crates/ty_module_resolver/src/module_name.rs b/crates/ty_module_resolver/src/module_name.rs index 9267a9c372d39..ca94eba8b5f1c 100644 --- a/crates/ty_module_resolver/src/module_name.rs +++ b/crates/ty_module_resolver/src/module_name.rs @@ -321,6 +321,7 @@ impl ModuleName { is_lazy: _, range: _, node_index: _, + runtime_level: _, } = node; Self::from_identifier_parts(db, importing_file, module.as_deref(), *level) } diff --git a/crates/ty_python_core/src/builder.rs b/crates/ty_python_core/src/builder.rs index aae20b116d4d4..9a97eb747ebf1 100644 --- a/crates/ty_python_core/src/builder.rs +++ b/crates/ty_python_core/src/builder.rs @@ -3432,6 +3432,10 @@ impl<'db, 'ast> SemanticIndexBuilder<'db, 'ast> { is_async: _, range: _, node_index: _, + runtime_decorator_list: _, + runtime_type_comment: _, + runtime_type_comment_bytes: _, + runtime_body: _, } = function_def; for decorator in decorator_list { self.visit_decorator(decorator); @@ -4162,6 +4166,8 @@ impl<'db, 'ast> SemanticIndexBuilder<'db, 'ast> { orelse, range: _, node_index: _, + runtime_body: _, + runtime_orelse: _, }, ) => { // Pre-walk the loop to collect all the bound places, then create a loop header @@ -4340,6 +4346,10 @@ impl<'db, 'ast> SemanticIndexBuilder<'db, 'ast> { iter, body, orelse, + runtime_type_comment: _, + runtime_type_comment_bytes: _, + runtime_body: _, + runtime_orelse: _, }, ) => { debug_assert_eq!(&self.current_assignments, &[]); @@ -4624,6 +4634,10 @@ impl<'db, 'ast> SemanticIndexBuilder<'db, 'ast> { is_star, range: _, node_index: _, + runtime_body: _, + runtime_handlers: _, + runtime_orelse: _, + runtime_finalbody: _, }) => { let was_in_try_statement = std::mem::replace(&mut self.in_try_statement, true); self.record_ambiguous_reachability(); @@ -4685,6 +4699,7 @@ impl<'db, 'ast> SemanticIndexBuilder<'db, 'ast> { body: handler_body, range: _, node_index: _, + runtime_body: _, } = except_handler; if let Some(handled_exceptions) = handled_exceptions { @@ -5016,6 +5031,7 @@ impl<'db, 'ast> SemanticIndexBuilder<'db, 'ast> { targets, range: _, node_index: _, + runtime_targets: _, }) => { // We will check the target expressions and then delete them. walk_stmt(self, stmt); @@ -5924,6 +5940,8 @@ fn dunder_all_extend_argument(value: &ast::Expr) -> Option<&ast::Expr> { keywords, range: _, node_index: _, + runtime_args: _, + runtime_bases: _, }, .. } = value.as_call_expr()?; diff --git a/crates/ty_python_core/src/re_exports.rs b/crates/ty_python_core/src/re_exports.rs index c8c8d680473de..0a7b8ce38ccb6 100644 --- a/crates/ty_python_core/src/re_exports.rs +++ b/crates/ty_python_core/src/re_exports.rs @@ -147,6 +147,8 @@ impl<'db> Visitor<'db> for ExportFinder<'db> { keys: _, range: _, node_index: _, + runtime_keys: _, + runtime_patterns: _, }) => { for pattern in patterns { self.visit_pattern(pattern); @@ -183,6 +185,8 @@ impl<'db> Visitor<'db> for ExportFinder<'db> { body: _, // We don't want to visit the body of the class range: _, node_index: _, + runtime_decorator_list: _, + runtime_body: _, }) => { self.possibly_add_export(&name.id, PossibleExportKind::Normal); for decorator in decorator_list { @@ -203,6 +207,10 @@ impl<'db> Visitor<'db> for ExportFinder<'db> { range: _, node_index: _, is_async: _, + runtime_decorator_list: _, + runtime_type_comment: _, + runtime_type_comment_bytes: _, + runtime_body: _, }) => { self.possibly_add_export(&name.id, PossibleExportKind::Normal); for decorator in decorator_list { @@ -221,6 +229,7 @@ impl<'db> Visitor<'db> for ExportFinder<'db> { simple: _, range: _, node_index: _, + runtime_simple: _, }) => { if value.is_some() || self.visiting_stub_file { self.visit_expr(target); @@ -323,6 +332,7 @@ impl<'db> Visitor<'db> for ExportFinder<'db> { | ast::Expr::BytesLiteral(_) | ast::Expr::EllipsisLiteral(_) | ast::Expr::StringLiteral(_) => {} + ast::Expr::Constant(_) => {} // Walrus definitions "leak" from comprehension scopes into the comprehension's // enclosing scope; they thus need special handling @@ -377,6 +387,7 @@ impl<'db> Visitor<'db> for WalrusFinder<'_, 'db> { | ast::Expr::BytesLiteral(_) | ast::Expr::EllipsisLiteral(_) | ast::Expr::StringLiteral(_) + | ast::Expr::Constant(_) | ast::Expr::Name(_) => {} ast::Expr::Named(ast::ExprNamed { diff --git a/crates/ty_python_semantic/src/semantic_model.rs b/crates/ty_python_semantic/src/semantic_model.rs index 79df386633843..92ae43518853a 100644 --- a/crates/ty_python_semantic/src/semantic_model.rs +++ b/crates/ty_python_semantic/src/semantic_model.rs @@ -891,6 +891,7 @@ impl HasType for ast::Expr { Expr::Tuple(inner) => inner.inferred_type(model), Expr::Slice(inner) => inner.inferred_type(model), Expr::IpyEscapeCommand(inner) => inner.inferred_type(model), + Expr::Constant(_) => None, } } } diff --git a/crates/ty_python_semantic/src/types/infer/builder.rs b/crates/ty_python_semantic/src/types/infer/builder.rs index 4f8b5c639557f..d9ed7d3fe4ace 100644 --- a/crates/ty_python_semantic/src/types/infer/builder.rs +++ b/crates/ty_python_semantic/src/types/infer/builder.rs @@ -2194,6 +2194,7 @@ impl<'db, 'ast> TypeInferenceBuilder<'db, 'ast> { test, body, elif_else_clauses, + runtime_body: _, } = if_statement; let test_ty = self.infer_standalone_expression(test, TypeContext::default()); @@ -2210,6 +2211,8 @@ impl<'db, 'ast> TypeInferenceBuilder<'db, 'ast> { node_index: _, test, body, + runtime_body: _, + runtime_orelse: _, } = clause; if let Some(test) = &test { @@ -2233,6 +2236,10 @@ impl<'db, 'ast> TypeInferenceBuilder<'db, 'ast> { orelse, finalbody, is_star: _, + runtime_body: _, + runtime_handlers: _, + runtime_orelse: _, + runtime_finalbody: _, } = try_statement; self.infer_body(body); @@ -2245,6 +2252,7 @@ impl<'db, 'ast> TypeInferenceBuilder<'db, 'ast> { body, range: _, node_index: _, + runtime_body: _, } = handler; // If `symbol_name` is `Some()` and `handled_exceptions` is `None`, @@ -2272,6 +2280,9 @@ impl<'db, 'ast> TypeInferenceBuilder<'db, 'ast> { is_async, items, body, + runtime_type_comment: _, + runtime_type_comment_bytes: _, + runtime_body: _, } = with_statement; for item in items { let target = item.optional_vars.as_deref(); @@ -2666,6 +2677,7 @@ impl<'db, 'ast> TypeInferenceBuilder<'db, 'ast> { body, pattern, guard, + runtime_body: _, } = case; self.infer_match_pattern(pattern); @@ -2784,6 +2796,9 @@ impl<'db, 'ast> TypeInferenceBuilder<'db, 'ast> { node_index: _, cls, arguments, + runtime_patterns: _, + runtime_kwd_attrs: _, + runtime_kwd_patterns: _, } = match_class; for pattern in &arguments.patterns { self.infer_nested_match_pattern(pattern); @@ -2822,6 +2837,8 @@ impl<'db, 'ast> TypeInferenceBuilder<'db, 'ast> { keys, patterns, rest, + runtime_keys: _, + runtime_patterns: _, } = match_mapping; for key in keys { self.infer_maybe_standalone_expression(key, TypeContext::default()); @@ -2839,6 +2856,9 @@ impl<'db, 'ast> TypeInferenceBuilder<'db, 'ast> { node_index: _, cls, arguments, + runtime_patterns: _, + runtime_kwd_attrs: _, + runtime_kwd_patterns: _, } = match_class; for pattern in &arguments.patterns { self.infer_nested_match_pattern(pattern); @@ -2877,6 +2897,9 @@ impl<'db, 'ast> TypeInferenceBuilder<'db, 'ast> { node_index: _, targets, value, + runtime_targets: _, + runtime_type_comment: _, + runtime_type_comment_bytes: _, } = assignment; if let [ast::Expr::Name(name)] = targets.as_slice() { @@ -3673,6 +3696,8 @@ impl<'db, 'ast> TypeInferenceBuilder<'db, 'ast> { keywords, range: _, node_index: _, + runtime_args: _, + runtime_bases: _, } = &call_expr.arguments; if args.iter().any(ast::Expr::is_starred_expr) { @@ -4193,6 +4218,7 @@ impl<'db, 'ast> TypeInferenceBuilder<'db, 'ast> { value, target, simple: _, + runtime_simple: _, } = assignment; let annotated = self.infer_annotation_expression( annotation, @@ -5085,6 +5111,10 @@ impl<'db, 'ast> TypeInferenceBuilder<'db, 'ast> { body, orelse, is_async, + runtime_type_comment: _, + runtime_type_comment_bytes: _, + runtime_body: _, + runtime_orelse: _, } = for_statement; self.infer_target(target, iter, &|builder, tcx| { @@ -5168,6 +5198,8 @@ impl<'db, 'ast> TypeInferenceBuilder<'db, 'ast> { test, body, orelse, + runtime_body: _, + runtime_orelse: _, } = while_statement; let test_ty = self.infer_standalone_expression(test, TypeContext::default()); @@ -5284,6 +5316,7 @@ impl<'db, 'ast> TypeInferenceBuilder<'db, 'ast> { range: _, node_index: _, targets, + runtime_targets: _, } = delete; for target in targets { self.infer_expression(target, TypeContext::default()); @@ -6553,6 +6586,7 @@ impl<'db, 'ast> TypeInferenceBuilder<'db, 'ast> { ast::Expr::IpyEscapeCommand(_) => { todo_type!("Ipy escape command support") } + ast::Expr::Constant(_) => Type::unknown(), }; let ty = self.apply_type_context(expression, ty, tcx); @@ -6874,6 +6908,8 @@ impl<'db, 'ast> TypeInferenceBuilder<'db, 'ast> { range: _, node_index: _, value, + runtime_joined_str: _, + runtime_values: _, } = fstring; let mut collector = StringPartsCollector::new(); @@ -6895,6 +6931,9 @@ impl<'db, 'ast> TypeInferenceBuilder<'db, 'ast> { debug_text, conversion, format_spec, + runtime_str: _, + runtime_interpolation_format_spec: _, + runtime_formatted_value_format_spec: _, } = expression; let ty = self.infer_expression(expression, TypeContext::default()); @@ -6993,6 +7032,7 @@ impl<'db, 'ast> TypeInferenceBuilder<'db, 'ast> { elts, ctx: _, parenthesized: _, + runtime_elts: _, } = tuple; // Remove any union elements of the annotation that are unrelated to the tuple type. @@ -7111,6 +7151,7 @@ impl<'db, 'ast> TypeInferenceBuilder<'db, 'ast> { node_index: _, elts, ctx: _, + runtime_elts: _, } = list; let elts = elts.iter().map(|elt| [Some(elt)]).collect_vec(); @@ -7139,6 +7180,7 @@ impl<'db, 'ast> TypeInferenceBuilder<'db, 'ast> { range: _, node_index: _, elts, + runtime_elts: _, } = set; let elts = elts.iter().map(|elt| [Some(elt)]).collect_vec(); @@ -7226,6 +7268,7 @@ impl<'db, 'ast> TypeInferenceBuilder<'db, 'ast> { range: _, node_index: _, items, + runtime_values: _, } = dict; let mut item_types = FxHashMap::default(); @@ -8324,6 +8367,8 @@ impl<'db, 'ast> TypeInferenceBuilder<'db, 'ast> { iter, ifs, is_async: _, + runtime_ifs: _, + runtime_is_async: _, } = comprehension; self.infer_target(target, iter, &|builder, tcx| { @@ -11062,6 +11107,7 @@ impl<'db, 'ast> TypeInferenceBuilder<'db, 'ast> { node_index: _, op, values, + runtime_values: _, } = bool_op; // The first operand has no peers. If no later operand is a collection literal, // accumulating prior types cannot affect inference. @@ -11181,6 +11227,7 @@ impl<'db, 'ast> TypeInferenceBuilder<'db, 'ast> { left, ops, comparators, + runtime_comparators: _, } = compare; self.infer_expression(left, TypeContext::default()); @@ -11244,6 +11291,7 @@ impl<'db, 'ast> TypeInferenceBuilder<'db, 'ast> { range: _, node_index: _, type_params, + runtime_type_params: _, } = type_parameters; for type_param in type_params { match type_param { diff --git a/crates/ty_python_semantic/src/types/infer/builder/class.rs b/crates/ty_python_semantic/src/types/infer/builder/class.rs index fd75502d832f2..e53875bac909f 100644 --- a/crates/ty_python_semantic/src/types/infer/builder/class.rs +++ b/crates/ty_python_semantic/src/types/infer/builder/class.rs @@ -90,6 +90,8 @@ impl<'db> TypeInferenceBuilder<'db, '_> { decorator_list, arguments: _, body: _, + runtime_decorator_list: _, + runtime_body: _, } = class_node; let db = self.db(); diff --git a/crates/ty_python_semantic/src/types/infer/builder/enum_call.rs b/crates/ty_python_semantic/src/types/infer/builder/enum_call.rs index 8f28fb6b4bfe9..ce1cd64e28568 100644 --- a/crates/ty_python_semantic/src/types/infer/builder/enum_call.rs +++ b/crates/ty_python_semantic/src/types/infer/builder/enum_call.rs @@ -304,6 +304,8 @@ impl<'db> TypeInferenceBuilder<'db, '_> { keywords, range: _, node_index: _, + runtime_args: _, + runtime_bases: _, } = &call_expr.arguments; for kw in keywords { diff --git a/crates/ty_python_semantic/src/types/infer/builder/function.rs b/crates/ty_python_semantic/src/types/infer/builder/function.rs index 3bd043207b983..8977e6972bd2c 100644 --- a/crates/ty_python_semantic/src/types/infer/builder/function.rs +++ b/crates/ty_python_semantic/src/types/infer/builder/function.rs @@ -416,6 +416,10 @@ impl<'db, 'ast> TypeInferenceBuilder<'db, 'ast> { returns: _, body: _, decorator_list, + runtime_decorator_list: _, + runtime_type_comment: _, + runtime_type_comment_bytes: _, + runtime_body: _, } = function; let db = self.db(); @@ -838,6 +842,7 @@ impl<'db, 'ast> TypeInferenceBuilder<'db, 'ast> { vararg, kwonlyargs: _, kwarg, + runtime_defaults: _, } = parameters; self.context.inference_flags |= InferenceFlags::IN_PARAMETER_ANNOTATION; @@ -970,6 +975,8 @@ impl<'db, 'ast> TypeInferenceBuilder<'db, 'ast> { node_index: _, name: _, annotation, + runtime_type_comment: _, + runtime_type_comment_bytes: _, } = parameter; if let Some(annotation) = annotation.as_deref() { diff --git a/crates/ty_python_semantic/src/types/infer/builder/imports.rs b/crates/ty_python_semantic/src/types/infer/builder/imports.rs index 32a29e68b501a..afebe28a9158b 100644 --- a/crates/ty_python_semantic/src/types/infer/builder/imports.rs +++ b/crates/ty_python_semantic/src/types/infer/builder/imports.rs @@ -237,6 +237,7 @@ impl<'db, 'ast> TypeInferenceBuilder<'db, 'ast> { is_lazy: _, range: _, node_index: _, + runtime_level: _, } = import; let db = self.db(); diff --git a/crates/ty_python_semantic/src/types/infer/builder/named_tuple.rs b/crates/ty_python_semantic/src/types/infer/builder/named_tuple.rs index 099da7e8f30c8..adeaa7aa06984 100644 --- a/crates/ty_python_semantic/src/types/infer/builder/named_tuple.rs +++ b/crates/ty_python_semantic/src/types/infer/builder/named_tuple.rs @@ -60,6 +60,8 @@ impl<'db> TypeInferenceBuilder<'db, '_> { keywords, range: _, node_index: _, + runtime_args: _, + runtime_bases: _, } = &call_expr.arguments; // Check for variadic arguments early, before extracting positional args. diff --git a/crates/ty_python_semantic/src/types/infer/builder/new_class.rs b/crates/ty_python_semantic/src/types/infer/builder/new_class.rs index 25b03eb133bdb..cefe6a86c5b47 100644 --- a/crates/ty_python_semantic/src/types/infer/builder/new_class.rs +++ b/crates/ty_python_semantic/src/types/infer/builder/new_class.rs @@ -35,6 +35,8 @@ impl<'db> TypeInferenceBuilder<'db, '_> { keywords, range: _, node_index: _, + runtime_args: _, + runtime_bases: _, } = &call_expr.arguments; // `new_class(name, bases=(), kwds=None, exec_body=None)` diff --git a/crates/ty_python_semantic/src/types/infer/builder/type_call.rs b/crates/ty_python_semantic/src/types/infer/builder/type_call.rs index b0b70027fe558..d60020219d3d9 100644 --- a/crates/ty_python_semantic/src/types/infer/builder/type_call.rs +++ b/crates/ty_python_semantic/src/types/infer/builder/type_call.rs @@ -39,6 +39,8 @@ impl<'db> TypeInferenceBuilder<'db, '_> { keywords, range: _, node_index: _, + runtime_args: _, + runtime_bases: _, } = &call_expr.arguments; for keyword in keywords { diff --git a/crates/ty_python_semantic/src/types/infer/builder/type_expression.rs b/crates/ty_python_semantic/src/types/infer/builder/type_expression.rs index 45ed89119743c..9297320d0b8aa 100644 --- a/crates/ty_python_semantic/src/types/infer/builder/type_expression.rs +++ b/crates/ty_python_semantic/src/types/infer/builder/type_expression.rs @@ -1080,6 +1080,8 @@ impl<'db> TypeInferenceBuilder<'db, '_> { Type::unknown() } + ast::Expr::Constant(_) => Type::unknown(), + ast::Expr::Starred(starred) => self.infer_starred_type_expression(starred), } } diff --git a/crates/ty_python_semantic/src/types/infer/builder/typed_dict.rs b/crates/ty_python_semantic/src/types/infer/builder/typed_dict.rs index b85a69bf0ae87..6015b127224e1 100644 --- a/crates/ty_python_semantic/src/types/infer/builder/typed_dict.rs +++ b/crates/ty_python_semantic/src/types/infer/builder/typed_dict.rs @@ -107,6 +107,8 @@ impl<'db> TypeInferenceBuilder<'db, '_> { keywords, range: _, node_index: _, + runtime_args: _, + runtime_bases: _, } = &call_expr.arguments; let starred_arguments: SmallVec<[&ast::Expr; 1]> = @@ -361,6 +363,7 @@ impl<'db> TypeInferenceBuilder<'db, '_> { range: _, node_index: _, items, + runtime_values: _, } = dict; let key_tcx = diff --git a/crates/ty_python_semantic/src/types/narrow.rs b/crates/ty_python_semantic/src/types/narrow.rs index 737d86a51300d..c92411124a0aa 100644 --- a/crates/ty_python_semantic/src/types/narrow.rs +++ b/crates/ty_python_semantic/src/types/narrow.rs @@ -3830,6 +3830,7 @@ impl<'db> NarrowingConstraintsBuilder<'db, '_> { left, ops, comparators, + runtime_comparators: _, } = expr_compare; // Performance optimization: early return if there are no potential narrowing targets. diff --git a/crates/ty_python_semantic/src/types/signatures.rs b/crates/ty_python_semantic/src/types/signatures.rs index e3b905c943f5d..5ae3bddf0f0d5 100644 --- a/crates/ty_python_semantic/src/types/signatures.rs +++ b/crates/ty_python_semantic/src/types/signatures.rs @@ -4867,6 +4867,7 @@ impl<'db> Parameters<'db> { kwarg, range: _, node_index: _, + runtime_defaults: _, } = parameters; let index = semantic_index(db, definition.program_file(db)); diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml index 92c7b21e30fcc..268a22c98350d 100644 --- a/fuzz/Cargo.toml +++ b/fuzz/Cargo.toml @@ -19,11 +19,11 @@ cargo-fuzz = true [dependencies] ruff_db = { path = "../crates/ruff_db" } ruff_linter = { path = "../crates/ruff_linter" } -ruff_python_ast = { path = "../crates/ruff_python_ast" } +ruff_python_ast = { package = "rustpython-ruff_python_ast", path = "../crates/ruff_python_ast" } ruff_python_codegen = { path = "../crates/ruff_python_codegen" } -ruff_python_parser = { path = "../crates/ruff_python_parser" } +ruff_python_parser = { package = "rustpython-ruff_python_parser", path = "../crates/ruff_python_parser" } ruff_python_formatter = { path = "../crates/ruff_python_formatter" } -ruff_text_size = { path = "../crates/ruff_text_size" } +ruff_text_size = { package = "rustpython-ruff_text_size", path = "../crates/ruff_text_size" } ty_module_resolver = { path = "../crates/ty_module_resolver" } ty_python_semantic = { path = "../crates/ty_python_semantic", features = ["testing"] } diff --git a/hawk.toml b/hawk.toml index fe7edf7afb67b..b009fd8f60551 100644 --- a/hawk.toml +++ b/hawk.toml @@ -56,22 +56,22 @@ package = "ruff_notebook" package = "ruff_options_metadata" [[doctest]] -package = "ruff_python_ast" +package = "rustpython-ruff_python_ast" [[doctest]] -package = "ruff_python_parser" +package = "rustpython-ruff_python_parser" [[doctest]] package = "ruff_python_stdlib" [[doctest]] -package = "ruff_python_trivia" +package = "rustpython-ruff_python_trivia" [[doctest]] -package = "ruff_source_file" +package = "rustpython-ruff_source_file" [[doctest]] -package = "ruff_text_size" +package = "rustpython-ruff_text_size" [[doctest]] package = "ruff_workspace"