Skip to content
This repository has been archived by the owner on Jul 27, 2023. It is now read-only.

Merge upstream changes for PEP695 support (cherry-pick ours) #26

Closed
wants to merge 31 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
25b2399
Update Python ASDL for Python 3.12
zanieb Jul 10, 2023
df2b5df
Regenerate code with latest ASDL
zanieb Jul 10, 2023
7b0aeee
Add stub `type_params` handling for class and function definitions
zanieb Jul 10, 2023
30f461b
Revert formatting changes to `python.rs`
zanieb Jul 10, 2023
3617a6c
Bump size assertion for `Stmt` from 136 to 160 bytes
zanieb Jul 10, 2023
7516c42
Move `type_param` stubs into LALRPOP definition
zanieb Jul 11, 2023
c8092b2
Update to the latest ASDL
MichaReiser Jul 13, 2023
d923aa9
Parse type parameters in class definitions
zanieb Jul 12, 2023
76a3245
Remove test for empty generic `class Foo[]: ...`
zanieb Jul 12, 2023
b06b266
Add test for tuple bounds
zanieb Jul 12, 2023
e0a8f5b
Add bound to test case `test_parse_class_with_all_possible_generic_ty…
zanieb Jul 12, 2023
3ec64e1
Consolidate tests and add coverage for trailing comma
zanieb Jul 13, 2023
c33fbee
Parse type parameters in class definitions
MichaReiser Jul 14, 2023
6980037
Parse type parameters in function definitions (#96)
zanieb Jul 14, 2023
704eb40
Add parsing of type alias statements i.e. the `type` keyword (#97)
zanieb Jul 17, 2023
b481437
Include decorators in `Class` and `FunctionDef` range
MichaReiser May 17, 2023
c3bbaad
Add test
MichaReiser May 19, 2023
da246d8
Add test
MichaReiser May 19, 2023
403906c
Include argument parentheses in range (#5)
MichaReiser Jun 7, 2023
7ea94c1
Add `Decorator` node (#7)
MichaReiser Jun 8, 2023
3cdffa2
Update snapshot tests
charliermarsh Jun 19, 2023
2872a7b
Optimize `validate_arguments` (#10)
charliermarsh Jun 19, 2023
fbdc987
Make malachite-bigint an optional dependency for rustpython-format (#12)
charliermarsh Jun 19, 2023
037dc28
Remove `fold`, `unparse`, and `location` features (#9)
charliermarsh Jun 19, 2023
f39a6de
Add `TextRange` to `Identifier` (#8)
charliermarsh Jun 20, 2023
dc8f422
Fix ArgWithDefault TextRange (#13)
MichaReiser Jun 20, 2023
b8cbc29
Fix range of keyword identifier (#14)
MichaReiser Jun 22, 2023
a95112d
Remove Range type parameter from AST nodes (#15)
MichaReiser Jun 23, 2023
cad61d2
impl<T> Ranged for &T where T: Ranged (#16)
konstin Jun 26, 2023
9f5dcfe
impl Ranged for TextRange (#20)
konstin Jul 2, 2023
3fa1d94
Remove asdl (#21)
konstin Jul 5, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
- name: run tests with num-bigint
run: cargo test --all --no-default-features --features num-bigint
- name: run tests with malachite-bigint and all features
run: cargo test --all --features location,malachite-bigint,constant-optimization,fold,unparse,visitor,all-nodes-with-ranges,full-lexer,serde --exclude rustpython-ast-pyo3
run: cargo test --all --features malachite-bigint,full-lexer,serde

lint:
name: Check Rust code with rustfmt and clippy
Expand All @@ -55,7 +55,7 @@ jobs:
- name: run clippy
run: cargo clippy --all --no-default-features --features num-bigint
- name: run clippy
run: cargo clippy --all --features location,malachite-bigint,constant-optimization,fold,unparse,visitor,all-nodes-with-ranges,full-lexer,serde --exclude rustpython-ast-pyo3 -- -Dwarnings
run: cargo clippy --all --features malachite-bigint,full-lexer,serde -- -Dwarnings

- uses: actions/setup-python@v4
with:
Expand All @@ -73,4 +73,3 @@ jobs:
'core/**/*.rs'
'literal/**/*.rs'
'parser/**/*.rs'
'ast/asdl_rs.py'
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ __pycache__
.*sw*
.vscode
.idea/
.venv/

flame-graph.html
flame.txt
Expand Down
4 changes: 1 addition & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ include = ["LICENSE", "Cargo.toml", "src/**/*.rs"]
[workspace]
resolver = "2"
members = [
"ast", "core", "format", "literal", "parser",
"ast-pyo3",
"ruff_text_size", "ruff_source_location",
"ast", "core", "format", "literal", "parser", "ruff_text_size",
]

[workspace.dependencies]
Expand Down
72 changes: 0 additions & 72 deletions ast-pyo3/.gitignore

This file was deleted.

23 changes: 0 additions & 23 deletions ast-pyo3/Cargo.toml

This file was deleted.

15 changes: 0 additions & 15 deletions ast-pyo3/pyproject.toml

This file was deleted.

3 changes: 0 additions & 3 deletions ast-pyo3/rustpython_ast/__init__.py

This file was deleted.

Loading