From 17adbde6503b635827d5565e027ee217600f5161 Mon Sep 17 00:00:00 2001 From: "Jeong, YunWon" Date: Sun, 29 Mar 2026 17:16:06 +0900 Subject: [PATCH] ruff from fork --- Cargo.lock | 173 +++++++++++++++++++++++++++-------------------------- Cargo.toml | 15 +++-- 2 files changed, 100 insertions(+), 88 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5fe1d944c8..ec08473394 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2877,72 +2877,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "ruff_python_ast" -version = "0.0.0" -source = "git+https://github.com/astral-sh/ruff.git?rev=c2a8815842f9dc5d24ec19385eae0f1a7188b0d9#c2a8815842f9dc5d24ec19385eae0f1a7188b0d9" -dependencies = [ - "aho-corasick", - "bitflags 2.11.0", - "compact_str", - "get-size2", - "is-macro", - "memchr", - "ruff_python_trivia", - "ruff_source_file", - "ruff_text_size", - "rustc-hash", - "thiserror 2.0.18", -] - -[[package]] -name = "ruff_python_parser" -version = "0.0.0" -source = "git+https://github.com/astral-sh/ruff.git?rev=c2a8815842f9dc5d24ec19385eae0f1a7188b0d9#c2a8815842f9dc5d24ec19385eae0f1a7188b0d9" -dependencies = [ - "bitflags 2.11.0", - "bstr", - "compact_str", - "get-size2", - "memchr", - "ruff_python_ast", - "ruff_python_trivia", - "ruff_text_size", - "rustc-hash", - "static_assertions", - "unicode-ident", - "unicode-normalization", - "unicode_names2 1.3.0", -] - -[[package]] -name = "ruff_python_trivia" -version = "0.0.0" -source = "git+https://github.com/astral-sh/ruff.git?rev=c2a8815842f9dc5d24ec19385eae0f1a7188b0d9#c2a8815842f9dc5d24ec19385eae0f1a7188b0d9" -dependencies = [ - "itertools 0.14.0", - "ruff_source_file", - "ruff_text_size", - "unicode-ident", -] - -[[package]] -name = "ruff_source_file" -version = "0.0.0" -source = "git+https://github.com/astral-sh/ruff.git?rev=c2a8815842f9dc5d24ec19385eae0f1a7188b0d9#c2a8815842f9dc5d24ec19385eae0f1a7188b0d9" -dependencies = [ - "memchr", - "ruff_text_size", -] - -[[package]] -name = "ruff_text_size" -version = "0.0.0" -source = "git+https://github.com/astral-sh/ruff.git?rev=c2a8815842f9dc5d24ec19385eae0f1a7188b0d9#c2a8815842f9dc5d24ec19385eae0f1a7188b0d9" -dependencies = [ - "get-size2", -] - [[package]] name = "rustc-hash" version = "2.1.1" @@ -3068,9 +3002,9 @@ dependencies = [ "libc", "log", "pyo3", - "ruff_python_parser", "rustpython-compiler", "rustpython-pylib", + "rustpython-ruff_python_parser", "rustpython-stdlib", "rustpython-vm", "rustyline", @@ -3091,11 +3025,11 @@ dependencies = [ "memchr", "num-complex", "num-traits", - "ruff_python_ast", - "ruff_python_parser", - "ruff_text_size", "rustpython-compiler-core", "rustpython-literal", + "rustpython-ruff_python_ast", + "rustpython-ruff_python_parser", + "rustpython-ruff_text_size", "rustpython-wtf8", "thiserror 2.0.18", "unicode_names2 2.0.0", @@ -3132,12 +3066,12 @@ dependencies = [ name = "rustpython-compiler" version = "0.5.0" dependencies = [ - "ruff_python_ast", - "ruff_python_parser", - "ruff_source_file", - "ruff_text_size", "rustpython-codegen", "rustpython-compiler-core", + "rustpython-ruff_python_ast", + "rustpython-ruff_python_parser", + "rustpython-ruff_source_file", + "rustpython-ruff_text_size", "thiserror 2.0.18", ] @@ -3151,7 +3085,7 @@ dependencies = [ "lz4_flex", "malachite-bigint", "num-complex", - "ruff_source_file", + "rustpython-ruff_source_file", "rustpython-wtf8", ] @@ -3159,8 +3093,8 @@ dependencies = [ name = "rustpython-compiler-source" version = "0.5.0+deprecated" dependencies = [ - "ruff_source_file", - "ruff_text_size", + "rustpython-ruff_source_file", + "rustpython-ruff_text_size", ] [[package]] @@ -3232,6 +3166,77 @@ dependencies = [ "rustpython-derive", ] +[[package]] +name = "rustpython-ruff_python_ast" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f021ff72cabf5e2cd6d8ec8813d376a8445a228dc610ab56c27bd9054cda70d4" +dependencies = [ + "aho-corasick", + "bitflags 2.11.0", + "compact_str", + "get-size2", + "is-macro", + "memchr", + "rustc-hash", + "rustpython-ruff_python_trivia", + "rustpython-ruff_source_file", + "rustpython-ruff_text_size", + "thiserror 2.0.18", +] + +[[package]] +name = "rustpython-ruff_python_parser" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01e6ee78bd9671fb5766664b2695fe1f2a92a961f4d9101646c570d8acdb1e0b" +dependencies = [ + "bitflags 2.11.0", + "bstr", + "compact_str", + "get-size2", + "memchr", + "rustc-hash", + "rustpython-ruff_python_ast", + "rustpython-ruff_python_trivia", + "rustpython-ruff_text_size", + "static_assertions", + "unicode-ident", + "unicode-normalization", + "unicode_names2 1.3.0", +] + +[[package]] +name = "rustpython-ruff_python_trivia" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79e7cfd1056f3a02ff0d2d0e4474286ca963260782f878b7b81c1dd87432e682" +dependencies = [ + "itertools 0.14.0", + "rustpython-ruff_source_file", + "rustpython-ruff_text_size", + "unicode-ident", +] + +[[package]] +name = "rustpython-ruff_source_file" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "948107aad62ddb12a11fc7bf68a49e52a0b0a3737d415a2505e54f5a9edac737" +dependencies = [ + "memchr", + "rustpython-ruff_text_size", +] + +[[package]] +name = "rustpython-ruff_text_size" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8291ee0f5a779e54ccd4e0151a0c426f8b49a123f99b5b6545db17ccdd4277aa" +dependencies = [ + "get-size2", +] + [[package]] name = "rustpython-sre_engine" version = "0.5.0" @@ -3300,10 +3305,6 @@ dependencies = [ "pkcs8", "pymath", "rand_core 0.9.5", - "ruff_python_ast", - "ruff_python_parser", - "ruff_source_file", - "ruff_text_size", "rustix", "rustls", "rustls-native-certs", @@ -3311,6 +3312,10 @@ dependencies = [ "rustls-platform-verifier", "rustpython-common", "rustpython-derive", + "rustpython-ruff_python_ast", + "rustpython-ruff_python_parser", + "rustpython-ruff_source_file", + "rustpython-ruff_text_size", "rustpython-vm", "schannel", "sha-1", @@ -3384,9 +3389,6 @@ dependencies = [ "paste", "psm", "result-like", - "ruff_python_ast", - "ruff_python_parser", - "ruff_text_size", "rustix", "rustpython-codegen", "rustpython-common", @@ -3395,6 +3397,9 @@ dependencies = [ "rustpython-derive", "rustpython-jit", "rustpython-literal", + "rustpython-ruff_python_ast", + "rustpython-ruff_python_parser", + "rustpython-ruff_text_size", "rustpython-sre_engine", "rustyline", "scoped-tls", diff --git a/Cargo.toml b/Cargo.toml index 0fa3b05561..af5d834c03 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -156,12 +156,19 @@ rustpython-sre_engine = { path = "crates/sre_engine", version = "0.5.0" } rustpython-wtf8 = { path = "crates/wtf8", version = "0.5.0" } rustpython-doc = { path = "crates/doc", version = "0.5.0" } +# Use RustPython-packaged Ruff crates from the published fork while keeping +# existing crate names in the codebase. +ruff_python_parser = { package = "rustpython-ruff_python_parser", version = "0.15.8" } +ruff_python_ast = { package = "rustpython-ruff_python_ast", version = "0.15.8" } +ruff_text_size = { package = "rustpython-ruff_text_size", version = "0.15.8" } +ruff_source_file = { package = "rustpython-ruff_source_file", version = "0.15.8" } +# To update ruff crates, comment out the above lines and uncomment the following lines to pull directly from the Ruff repository at the specified commit hash. # Ruff tag 0.15.8 is based on commit c2a8815842f9dc5d24ec19385eae0f1a7188b0d9 # at the time of this capture. We use the commit hash to ensure reproducible builds. -ruff_python_parser = { git = "https://github.com/astral-sh/ruff.git", rev = "c2a8815842f9dc5d24ec19385eae0f1a7188b0d9" } -ruff_python_ast = { git = "https://github.com/astral-sh/ruff.git", rev = "c2a8815842f9dc5d24ec19385eae0f1a7188b0d9" } -ruff_text_size = { git = "https://github.com/astral-sh/ruff.git", rev = "c2a8815842f9dc5d24ec19385eae0f1a7188b0d9" } -ruff_source_file = { git = "https://github.com/astral-sh/ruff.git", rev = "c2a8815842f9dc5d24ec19385eae0f1a7188b0d9" } +# ruff_python_parser = { git = "https://github.com/astral-sh/ruff.git", rev = "c2a8815842f9dc5d24ec19385eae0f1a7188b0d9" } +# ruff_python_ast = { git = "https://github.com/astral-sh/ruff.git", rev = "c2a8815842f9dc5d24ec19385eae0f1a7188b0d9" } +# ruff_text_size = { git = "https://github.com/astral-sh/ruff.git", rev = "c2a8815842f9dc5d24ec19385eae0f1a7188b0d9" } +# ruff_source_file = { git = "https://github.com/astral-sh/ruff.git", rev = "c2a8815842f9dc5d24ec19385eae0f1a7188b0d9" } phf = { version = "0.13.1", default-features = false, features = ["macros"]} ahash = "0.8.12"