Patch Ruff packages for RustPython release

Author: youknowone

Cargo.lock

@@ -27,19 +27,19 @@ ruff_markdown = { path = "crates/ruff_markdown" }
 ruff_memory_usage = { path = "crates/ruff_memory_usage" }
 ruff_notebook = { path = "crates/ruff_notebook" }
 ruff_options_metadata = { path = "crates/ruff_options_metadata" }
-ruff_python_ast = { path = "crates/ruff_python_ast" }
+ruff_python_ast = { package = "rustpython-ruff_python_ast", path = "crates/ruff_python_ast", version = "0.15.9" }
 ruff_python_codegen = { path = "crates/ruff_python_codegen" }
 ruff_python_formatter = { path = "crates/ruff_python_formatter" }
 ruff_python_importer = { path = "crates/ruff_python_importer" }
 ruff_python_index = { path = "crates/ruff_python_index" }
 ruff_python_literal = { path = "crates/ruff_python_literal" }
-ruff_python_parser = { path = "crates/ruff_python_parser" }
+ruff_python_parser = { package = "rustpython-ruff_python_parser", path = "crates/ruff_python_parser", version = "0.15.9" }
 ruff_python_semantic = { path = "crates/ruff_python_semantic" }
 ruff_python_stdlib = { path = "crates/ruff_python_stdlib" }
-ruff_python_trivia = { path = "crates/ruff_python_trivia" }
+ruff_python_trivia = { package = "rustpython-ruff_python_trivia", path = "crates/ruff_python_trivia", version = "0.15.9" }
 ruff_server = { path = "crates/ruff_server" }
-ruff_source_file = { path = "crates/ruff_source_file" }
-ruff_text_size = { path = "crates/ruff_text_size" }
+ruff_source_file = { package = "rustpython-ruff_source_file", path = "crates/ruff_source_file", version = "0.15.9" }
+ruff_text_size = { package = "rustpython-ruff_text_size", path = "crates/ruff_text_size", version = "0.15.9" }
 ruff_workspace = { path = "crates/ruff_workspace" }
 
 ty = { path = "crates/ty" }
@@ -285,9 +285,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
@@ -309,7 +309,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

Cargo.toml

@@ -18,7 +18,7 @@ ruff_db = { workspace = true, features = ["junit", "serde"] }
 ruff_diagnostics = { workspace = true, features = ["serde"] }
 ruff_macros = { workspace = true }
 ruff_notebook = { workspace = true }
-ruff_python_ast = { workspace = true, features = ["serde", "cache"] }
+ruff_python_ast = { workspace = true }
 ruff_python_codegen = { workspace = true }
 ruff_python_importer = { workspace = true }
 ruff_python_index = { workspace = true }

crates/ruff_linter/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
-name = "ruff_python_ast"
-version = "0.0.0"
-publish = false
+description = "Unofficial fork for RustPython"
+name = "rustpython-ruff_python_ast"
+version = "0.15.9"
 authors = { workspace = true }
 edition = { workspace = true }
 rust-version = { workspace = true }
@@ -17,8 +17,8 @@ ignored = ["ruff_cache"]
 [lib]
 
 [dependencies]
-ruff_cache = { workspace = true, optional = true }
-ruff_macros = { workspace = true, optional = true }
+# ruff_cache = { workspace = true, optional = true }
+# ruff_macros = { workspace = true, optional = true }
 ruff_python_trivia = { workspace = true }
 ruff_source_file = { workspace = true }
 ruff_text_size = { workspace = true }
@@ -30,21 +30,21 @@ get-size2 = { workspace = true, optional = true }
 is-macro = { workspace = true }
 memchr = { workspace = true }
 rustc-hash = { workspace = true }
-salsa = { workspace = true, optional = true }
+# salsa = { workspace = true, optional = true }
 schemars = { workspace = true, optional = true }
 serde = { workspace = true, optional = true }
 serde_json = { workspace = true, optional = true }
 thiserror = { workspace = true }
 
 [features]
 schemars = ["dep:schemars", "dep:serde_json"]
-cache = ["dep:ruff_cache", "dep:ruff_macros"]
-serde = [
-    "dep:serde",
-    "ruff_text_size/serde",
-    "dep:ruff_cache",
-    "compact_str/serde",
-]
+# cache = ["dep:ruff_cache", "dep:ruff_macros"]
+# serde = [
+#     "dep:serde",
+#     "ruff_text_size/serde",
+#     "dep:ruff_cache",
+#     "compact_str/serde",
+# ]
 get-size = ["dep:get-size2", "ruff_text_size/get-size"]
 
 [lints]

crates/ruff_python_ast/Cargo.toml

@@ -8,8 +8,6 @@ use crate::generated::ExprName;
 
 #[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Default)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[cfg_attr(feature = "cache", derive(ruff_macros::CacheKey))]
-#[cfg_attr(feature = "salsa", derive(salsa::Update))]
 #[cfg_attr(feature = "get-size", derive(get_size2::GetSize))]
 #[cfg_attr(
     feature = "schemars",

crates/ruff_python_ast/src/name.rs

@@ -4,7 +4,6 @@ use std::{fmt, str::FromStr};
 ///
 /// N.B. This does not necessarily represent a Python version that we actually support.
 #[derive(Debug, Clone, Copy, Eq, PartialEq, Ord, PartialOrd, Hash)]
-#[cfg_attr(feature = "cache", derive(ruff_macros::CacheKey))]
 #[cfg_attr(feature = "get-size", derive(get_size2::GetSize))]
 pub struct PythonVersion {
     pub major: u8,

crates/ruff_python_ast/src/python_version.rs

@@ -1,7 +1,7 @@
 [package]
-name = "ruff_python_parser"
-version = "0.0.0"
-publish = false
+description = "Unofficial fork for RustPython"
+name = "rustpython-ruff_python_parser"
+version = "0.15.9"
 authors = ["Charlie Marsh <charlie.r.marsh@gmail.com>", "RustPython Team"]
 edition = { workspace = true }
 rust-version = { workspace = true }

crates/ruff_python_parser/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
-name = "ruff_python_trivia"
-version = "0.0.0"
-publish = false
+description = "Unofficial fork for RustPython"
+name = "rustpython-ruff_python_trivia"
+version = "0.15.9"
 authors = { workspace = true }
 edition = { workspace = true }
 rust-version = { workspace = true }

crates/ruff_python_trivia/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
-name = "ruff_source_file"
-version = "0.0.0"
-publish = false
+description = "Unofficial fork for RustPython"
+name = "rustpython-ruff_source_file"
+version = "0.15.9"
 authors = { workspace = true }
 edition = { workspace = true }
 rust-version = { workspace = true }

crates/ruff_source_file/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
-name = "ruff_text_size"
-version = "0.0.0"
-publish = false
+description = "Unofficial fork for RustPython"
+name = "rustpython-ruff_text_size"
+version = "0.15.9"
 authors = { workspace = true }
 edition = { workspace = true }
 rust-version = { workspace = true }