Move Configuration to ruff_workspace crate (#6920)

astral-sh · Aug 28, 2023 · a6aa166 · a6aa166
1 parent 039694a
commit a6aa166
Show file tree

Hide file tree

Showing 77 changed files with 3,703 additions and 4,107 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/flake8_to_ruff/Cargo.toml b/crates/flake8_to_ruff/Cargo.toml
@@ -14,16 +14,23 @@ license = { workspace = true }
 
 [dependencies]
 ruff = { path = "../ruff", default-features = false }
+ruff_workspace = { path = "../ruff_workspace" }
 
 anyhow = { workspace = true }
 clap = { workspace = true }
 colored = { workspace = true }
 configparser = { version = "3.0.2" }
+itertools = { workspace = true }
+log = { workspace = true }
 once_cell = { workspace = true }
+pep440_rs = { version = "0.3.1", features = ["serde"] }
 regex = { workspace = true }
 rustc-hash = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 strum = { workspace = true }
 strum_macros = { workspace = true }
 toml = { workspace = true }
+
+[dev-dependencies]
+pretty_assertions = "1.3.0"
diff --git a/crates/ruff/src/flake8_to_ruff/black.rs → crates/flake8_to_ruff/src/black.rs b/crates/ruff/src/flake8_to_ruff/black.rs → crates/flake8_to_ruff/src/black.rs
@@ -1,13 +1,12 @@
 //! Extract Black configuration settings from a pyproject.toml.
 
+use ruff::settings::types::PythonVersion;
 use serde::{Deserialize, Serialize};
 
-use crate::settings::types::PythonVersion;
-
 #[derive(Debug, PartialEq, Eq, Serialize, Deserialize, Default)]
-pub struct Black {
+pub(crate) struct Black {
     #[serde(alias = "line-length", alias = "line_length")]
-    pub line_length: Option<usize>,
+    pub(crate) line_length: Option<usize>,
     #[serde(alias = "target-version", alias = "target_version")]
-    pub target_version: Option<Vec<PythonVersion>>,
+    pub(crate) target_version: Option<Vec<PythonVersion>>,
 }