mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-09-27 20:39:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Update RustPython to use the correct BinOp location (#1355)

Browse source
This commit is contained in:
Harutaka Kawamura 2022-12-24 12:58:39 +09:00 • committed by GitHub
parent 102b049a32
commit 201e1250de
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 39 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Cargo.lock generated
View file

@ -1965,7 +1965,7 @@ dependencies = [
[[package]] [[package]]
name = "rustpython-ast" name = "rustpython-ast"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/RustPython/RustPython.git?rev=c01f014b1269eedcf4bdb45d5fbc62ae2beecf31#c01f014b1269eedcf4bdb45d5fbc62ae2beecf31" source = "git+https://github.com/RustPython/RustPython.git?rev=1b6cb170e925a43d605b3fed9f6b878e63e47744#1b6cb170e925a43d605b3fed9f6b878e63e47744"
dependencies = [ dependencies = [
"num-bigint", "num-bigint",
"rustpython-common", "rustpython-common",
@ -1975,7 +1975,7 @@ dependencies = [
[[package]] [[package]]
name = "rustpython-common" name = "rustpython-common"
version = "0.0.0" version = "0.0.0"
source = "git+https://github.com/RustPython/RustPython.git?rev=c01f014b1269eedcf4bdb45d5fbc62ae2beecf31#c01f014b1269eedcf4bdb45d5fbc62ae2beecf31" source = "git+https://github.com/RustPython/RustPython.git?rev=1b6cb170e925a43d605b3fed9f6b878e63e47744#1b6cb170e925a43d605b3fed9f6b878e63e47744"
dependencies = [ dependencies = [
"ascii", "ascii",
"cfg-if 1.0.0", "cfg-if 1.0.0",
@ -1998,7 +1998,7 @@ dependencies = [
[[package]] [[package]]
name = "rustpython-compiler-core" name = "rustpython-compiler-core"
version = "0.1.2" version = "0.1.2"
source = "git+https://github.com/RustPython/RustPython.git?rev=c01f014b1269eedcf4bdb45d5fbc62ae2beecf31#c01f014b1269eedcf4bdb45d5fbc62ae2beecf31" source = "git+https://github.com/RustPython/RustPython.git?rev=1b6cb170e925a43d605b3fed9f6b878e63e47744#1b6cb170e925a43d605b3fed9f6b878e63e47744"
dependencies = [ dependencies = [
"bincode", "bincode",
"bitflags", "bitflags",
@ -2015,7 +2015,7 @@ dependencies = [
[[package]] [[package]]
name = "rustpython-parser" name = "rustpython-parser"
version = "0.1.2" version = "0.1.2"
source = "git+https://github.com/RustPython/RustPython.git?rev=c01f014b1269eedcf4bdb45d5fbc62ae2beecf31#c01f014b1269eedcf4bdb45d5fbc62ae2beecf31" source = "git+https://github.com/RustPython/RustPython.git?rev=1b6cb170e925a43d605b3fed9f6b878e63e47744#1b6cb170e925a43d605b3fed9f6b878e63e47744"
dependencies = [ dependencies = [
"ahash", "ahash",
"anyhow", "anyhow",

6
Cargo.toml
View file

@ -45,9 +45,9 @@ regex = { version = "1.6.0" }
ropey = { version = "1.5.0", features = ["cr_lines", "simd"], default-features = false } ropey = { version = "1.5.0", features = ["cr_lines", "simd"], default-features = false }
ruff_macros = { version = "0.0.192", path = "ruff_macros" } ruff_macros = { version = "0.0.192", path = "ruff_macros" }
rustc-hash = { version = "1.1.0" } rustc-hash = { version = "1.1.0" }
rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "c01f014b1269eedcf4bdb45d5fbc62ae2beecf31" } rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "1b6cb170e925a43d605b3fed9f6b878e63e47744" }
rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "c01f014b1269eedcf4bdb45d5fbc62ae2beecf31" } rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "1b6cb170e925a43d605b3fed9f6b878e63e47744" }
rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "c01f014b1269eedcf4bdb45d5fbc62ae2beecf31" } rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "1b6cb170e925a43d605b3fed9f6b878e63e47744" }
serde = { version = "1.0.147", features = ["derive"] } serde = { version = "1.0.147", features = ["derive"] }
serde_json = { version = "1.0.87" } serde_json = { version = "1.0.87" }
shellexpand = { version = "3.0.0" } shellexpand = { version = "3.0.0" }

8
flake8_to_ruff/Cargo.lock generated
View file

@ -2028,7 +2028,7 @@ dependencies = [
[[package]] [[package]]
name = "rustpython-ast" name = "rustpython-ast"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/RustPython/RustPython.git?rev=c01f014b1269eedcf4bdb45d5fbc62ae2beecf31#c01f014b1269eedcf4bdb45d5fbc62ae2beecf31" source = "git+https://github.com/RustPython/RustPython.git?rev=1b6cb170e925a43d605b3fed9f6b878e63e47744#1b6cb170e925a43d605b3fed9f6b878e63e47744"
dependencies = [ dependencies = [
"num-bigint", "num-bigint",
"rustpython-common", "rustpython-common",
@ -2038,7 +2038,7 @@ dependencies = [
[[package]] [[package]]
name = "rustpython-common" name = "rustpython-common"
version = "0.0.0" version = "0.0.0"
source = "git+https://github.com/RustPython/RustPython.git?rev=c01f014b1269eedcf4bdb45d5fbc62ae2beecf31#c01f014b1269eedcf4bdb45d5fbc62ae2beecf31" source = "git+https://github.com/RustPython/RustPython.git?rev=1b6cb170e925a43d605b3fed9f6b878e63e47744#1b6cb170e925a43d605b3fed9f6b878e63e47744"
dependencies = [ dependencies = [
"ascii", "ascii",
"cfg-if 1.0.0", "cfg-if 1.0.0",
@ -2061,7 +2061,7 @@ dependencies = [
[[package]] [[package]]
name = "rustpython-compiler-core" name = "rustpython-compiler-core"
version = "0.1.2" version = "0.1.2"
source = "git+https://github.com/RustPython/RustPython.git?rev=c01f014b1269eedcf4bdb45d5fbc62ae2beecf31#c01f014b1269eedcf4bdb45d5fbc62ae2beecf31" source = "git+https://github.com/RustPython/RustPython.git?rev=1b6cb170e925a43d605b3fed9f6b878e63e47744#1b6cb170e925a43d605b3fed9f6b878e63e47744"
dependencies = [ dependencies = [
"bincode", "bincode",
"bitflags", "bitflags",
@ -2078,7 +2078,7 @@ dependencies = [
[[package]] [[package]]
name = "rustpython-parser" name = "rustpython-parser"
version = "0.1.2" version = "0.1.2"
source = "git+https://github.com/RustPython/RustPython.git?rev=c01f014b1269eedcf4bdb45d5fbc62ae2beecf31#c01f014b1269eedcf4bdb45d5fbc62ae2beecf31" source = "git+https://github.com/RustPython/RustPython.git?rev=1b6cb170e925a43d605b3fed9f6b878e63e47744#1b6cb170e925a43d605b3fed9f6b878e63e47744"
dependencies = [ dependencies = [
"ahash", "ahash",
"anyhow", "anyhow",

6
ruff_dev/Cargo.toml
View file

@ -11,8 +11,8 @@ itertools = { version = "0.10.5" }
libcst = { git = "https://github.com/charliermarsh/LibCST", rev = "f2f0b7a487a8725d161fe8b3ed73a6758b21e177" } libcst = { git = "https://github.com/charliermarsh/LibCST", rev = "f2f0b7a487a8725d161fe8b3ed73a6758b21e177" }
once_cell = { version = "1.16.0" } once_cell = { version = "1.16.0" }
ruff = { path = ".." } ruff = { path = ".." }
rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "c01f014b1269eedcf4bdb45d5fbc62ae2beecf31" } rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "1b6cb170e925a43d605b3fed9f6b878e63e47744" }
rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "c01f014b1269eedcf4bdb45d5fbc62ae2beecf31" } rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "1b6cb170e925a43d605b3fed9f6b878e63e47744" }
rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "c01f014b1269eedcf4bdb45d5fbc62ae2beecf31" } rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "1b6cb170e925a43d605b3fed9f6b878e63e47744" }
strum = { version = "0.24.1", features = ["strum_macros"] } strum = { version = "0.24.1", features = ["strum_macros"] }
strum_macros = { version = "0.24.3" } strum_macros = { version = "0.24.3" }

2
src/pyflakes/snapshots/ruff__pyflakes__tests__F501_F50x.py.snap
View file

@ -6,7 +6,7 @@ expression: checks
PercentFormatInvalidFormat: incomplete format PercentFormatInvalidFormat: incomplete format
location: location:
row: 1 row: 1
column: 9 column: 0
end_location: end_location:
row: 1 row: 1
column: 25 column: 25

14
src/pyflakes/snapshots/ruff__pyflakes__tests__F502_F502.py.snap
View file

@ -5,7 +5,7 @@ expression: checks
- kind: PercentFormatExpectedMapping - kind: PercentFormatExpectedMapping
location: location:
row: 6 row: 6
column: 10 column: 0
end_location: end_location:
row: 6 row: 6
column: 19 column: 19
@ -13,7 +13,7 @@ expression: checks
- kind: PercentFormatExpectedMapping - kind: PercentFormatExpectedMapping
location: location:
row: 7 row: 7
column: 10 column: 0
end_location: end_location:
row: 7 row: 7
column: 20 column: 20
@ -21,7 +21,7 @@ expression: checks
- kind: PercentFormatExpectedMapping - kind: PercentFormatExpectedMapping
location: location:
row: 8 row: 8
column: 10 column: 0
end_location: end_location:
row: 8 row: 8
column: 19 column: 19
@ -29,7 +29,7 @@ expression: checks
- kind: PercentFormatExpectedMapping - kind: PercentFormatExpectedMapping
location: location:
row: 9 row: 9
column: 10 column: 0
end_location: end_location:
row: 9 row: 9
column: 22 column: 22
@ -37,7 +37,7 @@ expression: checks
- kind: PercentFormatExpectedMapping - kind: PercentFormatExpectedMapping
location: location:
row: 11 row: 11
column: 10 column: 0
end_location: end_location:
row: 11 row: 11
column: 37 column: 37
@ -45,7 +45,7 @@ expression: checks
- kind: PercentFormatExpectedMapping - kind: PercentFormatExpectedMapping
location: location:
row: 12 row: 12
column: 10 column: 0
end_location: end_location:
row: 12 row: 12
column: 37 column: 37
@ -53,7 +53,7 @@ expression: checks
- kind: PercentFormatExpectedMapping - kind: PercentFormatExpectedMapping
location: location:
row: 13 row: 13
column: 10 column: 0
end_location: end_location:
row: 13 row: 13
column: 37 column: 37

2
src/pyflakes/snapshots/ruff__pyflakes__tests__F502_F50x.py.snap
View file

@ -5,7 +5,7 @@ expression: checks
- kind: PercentFormatExpectedMapping - kind: PercentFormatExpectedMapping
location: location:
row: 9 row: 9
column: 10 column: 0
end_location: end_location:
row: 9 row: 9
column: 21 column: 21

6
src/pyflakes/snapshots/ruff__pyflakes__tests__F503_F503.py.snap
View file

@ -5,7 +5,7 @@ expression: checks
- kind: PercentFormatExpectedSequence - kind: PercentFormatExpectedSequence
location: location:
row: 17 row: 17
column: 8 column: 0
end_location: end_location:
row: 17 row: 17
column: 24 column: 24
@ -13,7 +13,7 @@ expression: checks
- kind: PercentFormatExpectedSequence - kind: PercentFormatExpectedSequence
location: location:
row: 18 row: 18
column: 8 column: 0
end_location: end_location:
row: 18 row: 18
column: 28 column: 28
@ -21,7 +21,7 @@ expression: checks
- kind: PercentFormatExpectedSequence - kind: PercentFormatExpectedSequence
location: location:
row: 23 row: 23
column: 8 column: 0
end_location: end_location:
row: 23 row: 23
column: 42 column: 42

2
src/pyflakes/snapshots/ruff__pyflakes__tests__F503_F50x.py.snap
View file

@ -5,7 +5,7 @@ expression: checks
- kind: PercentFormatExpectedSequence - kind: PercentFormatExpectedSequence
location: location:
row: 10 row: 10
column: 8 column: 0
end_location: end_location:
row: 10 row: 10
column: 20 column: 20

6
src/pyflakes/snapshots/ruff__pyflakes__tests__F504_F504.py.snap
View file

@ -7,7 +7,7 @@ expression: checks
- b - b
location: location:
row: 3 row: 3
column: 14 column: 0
end_location: end_location:
row: 3 row: 3
column: 34 column: 34
@ -24,7 +24,7 @@ expression: checks
- b - b
location: location:
row: 8 row: 8
column: 8 column: 0
end_location: end_location:
row: 8 row: 8
column: 29 column: 29
@ -41,7 +41,7 @@ expression: checks
- b - b
location: location:
row: 9 row: 9
column: 8 column: 0
end_location: end_location:
row: 9 row: 9
column: 29 column: 29

2
src/pyflakes/snapshots/ruff__pyflakes__tests__F504_F50x.py.snap
View file

@ -7,7 +7,7 @@ expression: checks
- baz - baz
location: location:
row: 8 row: 8
column: 10 column: 0
end_location: end_location:
row: 8 row: 8
column: 32 column: 32

2
src/pyflakes/snapshots/ruff__pyflakes__tests__F505_F50x.py.snap
View file

@ -7,7 +7,7 @@ expression: checks
- bar - bar
location: location:
row: 7 row: 7
column: 10 column: 0
end_location: end_location:
row: 7 row: 7
column: 14 column: 14

6
src/pyflakes/snapshots/ruff__pyflakes__tests__F506_F50x.py.snap
View file

@ -5,7 +5,7 @@ expression: checks
- kind: PercentFormatMixedPositionalAndNamed - kind: PercentFormatMixedPositionalAndNamed
location: location:
row: 2 row: 2
column: 13 column: 0
end_location: end_location:
row: 2 row: 2
column: 29 column: 29
@ -13,7 +13,7 @@ expression: checks
- kind: PercentFormatMixedPositionalAndNamed - kind: PercentFormatMixedPositionalAndNamed
location: location:
row: 3 row: 3
column: 13 column: 0
end_location: end_location:
row: 3 row: 3
column: 29 column: 29
@ -21,7 +21,7 @@ expression: checks
- kind: PercentFormatMixedPositionalAndNamed - kind: PercentFormatMixedPositionalAndNamed
location: location:
row: 11 row: 11
column: 11 column: 0
end_location: end_location:
row: 11 row: 11
column: 27 column: 27

4
src/pyflakes/snapshots/ruff__pyflakes__tests__F507_F50x.py.snap
View file

@ -8,7 +8,7 @@ expression: checks
- 1 - 1
location: location:
row: 5 row: 5
column: 8 column: 0
end_location: end_location:
row: 5 row: 5
column: 14 column: 14
@ -19,7 +19,7 @@ expression: checks
- 3 - 3
location: location:
row: 6 row: 6
column: 8 column: 0
end_location: end_location:
row: 6 row: 6
column: 19 column: 19

2
src/pyflakes/snapshots/ruff__pyflakes__tests__F508_F50x.py.snap
View file

@ -5,7 +5,7 @@ expression: checks
- kind: PercentFormatStarRequiresSequence - kind: PercentFormatStarRequiresSequence
location: location:
row: 11 row: 11
column: 11 column: 0
end_location: end_location:
row: 11 row: 11
column: 27 column: 27

2
src/pyflakes/snapshots/ruff__pyflakes__tests__F509_F50x.py.snap
View file

@ -6,7 +6,7 @@ expression: checks
PercentFormatUnsupportedFormatCharacter: j PercentFormatUnsupportedFormatCharacter: j
location: location:
row: 4 row: 4
column: 5 column: 0
end_location: end_location:
row: 4 row: 4
column: 11 column: 11