chore: cleanup remaining feature gates

psteinroe · psteinroe · commit d3d3b0143878 · 2025-03-14T19:13:23.000+01:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/pglt_cli/Cargo.toml b/crates/pglt_cli/Cargo.toml
@@ -55,8 +55,6 @@ tikv-jemallocator = "0.6.0"
 [lib]
 doctest = false
 
-[features]
-
 [[bin]]
 name = "pglt"
 path = "src/main.rs"
diff --git a/crates/pglt_commands/Cargo.toml b/crates/pglt_commands/Cargo.toml
@@ -19,5 +19,3 @@ sqlx.workspace           = true
 
 [lib]
 doctest = false
-
-[features]
diff --git a/crates/pglt_completions/Cargo.toml b/crates/pglt_completions/Cargo.toml
@@ -33,5 +33,3 @@ pglt_test_utils.workspace = true
 
 [lib]
 doctest = false
-
-[features]
diff --git a/crates/pglt_console/Cargo.toml b/crates/pglt_console/Cargo.toml
@@ -25,7 +25,8 @@ unicode-width        = { workspace = true }
 trybuild = "1.0.99"
 
 [features]
-serde_markup = ["serde", "schemars"]
+schema = ["dep:schemars", "pglt_text_size/schema"]
+serde  = ["dep:serde"]
 
 [lib]
 doctest = false
diff --git a/crates/pglt_console/src/markup.rs b/crates/pglt_console/src/markup.rs
@@ -11,10 +11,8 @@ use crate::fmt::{Display, Formatter, MarkupElements, Write};
 
 /// Enumeration of all the supported markup elements
 #[derive(Clone, Debug, PartialEq, Eq, Hash)]
-#[cfg_attr(
-    feature = "serde",
-    derive(serde::Serialize, serde::Deserialize, schemars::JsonSchema)
-)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
 pub enum MarkupElement<'fmt> {
     Emphasis,
     Dim,
@@ -122,10 +120,8 @@ pub struct MarkupNode<'fmt> {
 }
 
 #[derive(Clone, PartialEq, Eq, Hash)]
-#[cfg_attr(
-    feature = "serde",
-    derive(serde::Serialize, serde::Deserialize, schemars::JsonSchema)
-)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
 pub struct MarkupNodeBuf {
     pub elements: Vec<MarkupElement<'static>>,
     pub content: String,
@@ -181,10 +177,8 @@ impl Markup<'_> {
 }
 
 #[derive(Clone, Default, PartialEq, Eq, Hash)]
-#[cfg_attr(
-    feature = "serde",
-    derive(serde::Serialize, serde::Deserialize, schemars::JsonSchema)
-)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
 pub struct MarkupBuf(pub Vec<MarkupNodeBuf>);
 
 impl MarkupBuf {
diff --git a/crates/pglt_diagnostics/Cargo.toml b/crates/pglt_diagnostics/Cargo.toml
@@ -15,10 +15,10 @@ version              = "0.0.0"
 backtrace                   = "0.3.74"
 bpaf                        = { workspace = true }
 enumflags2                  = { workspace = true }
-pglt_console                = { workspace = true, features = ["serde_markup"] }
+pglt_console                = { workspace = true, features = ["serde"] }
 pglt_diagnostics_categories = { workspace = true, features = ["serde"] }
 pglt_diagnostics_macros     = { workspace = true }
-pglt_text_edit              = { workspace = true }
+pglt_text_edit              = { workspace = true, features = ["serde"] }
 pglt_text_size.workspace    = true
 schemars                    = { workspace = true, optional = true }
 serde                       = { workspace = true, features = ["derive"] }
@@ -27,7 +27,7 @@ termcolor                   = { workspace = true }
 unicode-width               = { workspace = true }
 
 [features]
-schema = ["schemars", "pglt_text_edit/schemars", "pglt_diagnostics_categories/schemars"]
+schema = ["dep:schemars", "pglt_text_edit/schema", "pglt_diagnostics_categories/schema", "pglt_console/schema"]
 
 [dev-dependencies]
 
diff --git a/crates/pglt_diagnostics_categories/Cargo.toml b/crates/pglt_diagnostics_categories/Cargo.toml
@@ -15,5 +15,9 @@ version              = "0.0.0"
 schemars = { workspace = true, optional = true }
 serde    = { workspace = true, optional = true }
 
+[features]
+schema = ["dep:schemars"]
+serde  = ["dep:serde"]
+
 [build-dependencies]
 quote = "1.0.14"
diff --git a/crates/pglt_diagnostics_categories/build.rs b/crates/pglt_diagnostics_categories/build.rs
@@ -64,7 +64,7 @@ pub fn main() -> io::Result<()> {
             }
         }
 
-        #[cfg(feature = "schemars")]
+        #[cfg(feature = "schema")]
         impl schemars::JsonSchema for &'static Category {
             fn schema_name() -> String {
                 String::from("Category")
diff --git a/crates/pglt_diagnostics_macros/Cargo.toml b/crates/pglt_diagnostics_macros/Cargo.toml
@@ -21,5 +21,3 @@ quote            = { workspace = true }
 syn              = { workspace = true }
 
 [dev-dependencies]
-
-[features]
diff --git a/crates/pglt_flags/Cargo.toml b/crates/pglt_flags/Cargo.toml
@@ -15,5 +15,3 @@ version              = "0.0.0"
 pglt_console = { workspace = true }
 
 [dev-dependencies]
-
-[features]
diff --git a/crates/pglt_fs/Cargo.toml b/crates/pglt_fs/Cargo.toml
@@ -20,14 +20,13 @@ pglt_diagnostics = { workspace = true }
 rayon            = { workspace = true }
 rustc-hash       = { workspace = true }
 schemars         = { workspace = true, optional = true }
-serde            = { workspace = true }
+serde            = { workspace = true, optional = true }
 smallvec         = { workspace = true }
 tracing          = { workspace = true }
 
 [features]
-serde = ["schemars", "pglt_diagnostics/schema"]
-
-[dev-dependencies]
+schema = ["dep:schemars", "pglt_diagnostics/schema"]
+serde  = ["dep:serde"]
 
 [lib]
 doctest = false
diff --git a/crates/pglt_fs/src/path.rs b/crates/pglt_fs/src/path.rs
@@ -17,10 +17,8 @@ use crate::ConfigName;
 #[derive(Debug, Clone, Copy, Default, PartialEq, Eq, Ord, PartialOrd, Hash)]
 #[repr(u8)]
 #[bitflags]
-#[cfg_attr(
-    feature = "serde",
-    derive(serde::Serialize, serde::Deserialize, schemars::JsonSchema)
-)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
 // NOTE: The order of the variants is important, the one on the top has the highest priority
 pub enum FileKind {
     /// A configuration file has the highest priority. It's usually `pglt.toml`
@@ -85,10 +83,8 @@ impl From<FileKind> for FileKinds {
 }
 
 #[derive(Debug, Clone, Eq, PartialEq, Hash, Default)]
-#[cfg_attr(
-    feature = "serde",
-    derive(serde::Serialize, serde::Deserialize, schemars::JsonSchema)
-)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
 pub struct PgLTPath {
     path: PathBuf,
     /// Determines the kind of the file inside PgLT. Some files are considered as configuration files, others as manifest files, and others as files to handle
@@ -201,7 +197,7 @@ impl PgLTPath {
     }
 }
 
-#[cfg(feature = "serde")]
+#[cfg(feature = "schema")]
 impl schemars::JsonSchema for FileKinds {
     fn schema_name() -> String {
         String::from("FileKind")
diff --git a/crates/pglt_lsp/Cargo.toml b/crates/pglt_lsp/Cargo.toml
@@ -41,5 +41,3 @@ tower           = { version = "0.4.13", features = ["timeout"] }
 
 [lib]
 doctest = false
-
-[features]
diff --git a/crates/pglt_lsp_converters/Cargo.toml b/crates/pglt_lsp_converters/Cargo.toml
@@ -21,5 +21,3 @@ tower-lsp                = { version = "0.20.0" }
 
 [lib]
 doctest = false
-
-[features]
diff --git a/crates/pglt_markup/Cargo.toml b/crates/pglt_markup/Cargo.toml
@@ -20,5 +20,3 @@ quote            = "1.0.14"
 
 [lib]
 proc-macro = true
-
-[features]
diff --git a/crates/pglt_text_edit/Cargo.toml b/crates/pglt_text_edit/Cargo.toml
@@ -12,13 +12,14 @@ version              = "0.0.0"
 
 
 [dependencies]
-pglt_text_size = { workspace = true, features = ["serde"] }
+pglt_text_size = { workspace = true }
 schemars       = { workspace = true, optional = true }
-serde          = { workspace = true, features = ["derive"] }
+serde          = { workspace = true, features = ["derive"], optional = true }
 similar        = { workspace = true, features = ["unicode"] }
 
 [features]
-schemars = ["dep:schemars"]
+schema = ["dep:schemars", "pglt_text_size/schema"]
+serde  = ["dep:serde", "pglt_text_size/serde"]
 
 [dev-dependencies]
 
diff --git a/crates/pglt_text_edit/src/lib.rs b/crates/pglt_text_edit/src/lib.rs
@@ -11,26 +11,40 @@
 use std::{cmp::Ordering, num::NonZeroU32};
 
 use pglt_text_size::{TextRange, TextSize};
-use serde::{Deserialize, Serialize};
 pub use similar::ChangeTag;
 use similar::{TextDiff, utils::TextDiffRemapper};
 
-#[derive(Default, Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
+#[derive(Default, Debug, Clone, PartialEq, Eq, Hash)]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[cfg_attr(
+    feature = "serde",
+    derive(serde::Serialize, serde::Deserialize),
+    serde(rename_all = "camelCase")
+)]
 pub struct TextEdit {
     dictionary: String,
     ops: Vec<CompressedOp>,
 }
 
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[cfg_attr(
+    feature = "serde",
+    derive(serde::Serialize, serde::Deserialize),
+    serde(rename_all = "camelCase")
+)]
 pub enum CompressedOp {
     DiffOp(DiffOp),
     EqualLines { line_count: NonZeroU32 },
 }
 
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[cfg_attr(
+    feature = "serde",
+    derive(serde::Serialize, serde::Deserialize),
+    serde(rename_all = "camelCase")
+)]
 pub enum DiffOp {
     Equal { range: TextRange },
     Insert { range: TextRange },
diff --git a/crates/pglt_text_size/Cargo.toml b/crates/pglt_text_size/Cargo.toml
@@ -15,7 +15,7 @@ schemars = { workspace = true, optional = true }
 serde    = { workspace = true, optional = true }
 
 [features]
-schema = ["dep:schemars", "serde"]
+schema = ["dep:schemars"]
 serde  = ["dep:serde"]
 
 [dev-dependencies]
diff --git a/crates/pglt_text_size/src/lib.rs b/crates/pglt_text_size/src/lib.rs
@@ -26,6 +26,9 @@ mod traits;
 #[cfg(feature = "serde")]
 mod serde_impls;
 
+#[cfg(feature = "schema")]
+mod schemars_impls;
+
 pub use crate::{range::TextRange, size::TextSize, traits::TextLen};
 
 #[cfg(target_pointer_width = "16")]
diff --git a/crates/pglt_treesitter_queries/Cargo.toml b/crates/pglt_treesitter_queries/Cargo.toml
@@ -20,5 +20,3 @@ tree_sitter_sql.workspace = true
 
 [lib]
 doctest = false
-
-[features]
diff --git a/crates/pglt_type_resolver/Cargo.toml b/crates/pglt_type_resolver/Cargo.toml
@@ -19,5 +19,3 @@ pglt_schema_cache.workspace = true
 
 [lib]
 doctest = false
-
-[features]
diff --git a/crates/pglt_typecheck/Cargo.toml b/crates/pglt_typecheck/Cargo.toml
@@ -28,5 +28,3 @@ pglt_test_utils.workspace = true
 
 [lib]
 doctest = false
-
-[features]
diff --git a/crates/pglt_workspace/Cargo.toml b/crates/pglt_workspace/Cargo.toml
@@ -29,6 +29,7 @@ pglt_statement_splitter   = { workspace = true }
 pglt_text_size.workspace  = true
 pglt_typecheck            = { workspace = true }
 rustc-hash                = { workspace = true }
+schemars                  = { workspace = true, optional = true }
 serde                     = { workspace = true, features = ["derive"] }
 serde_json                = { workspace = true, features = ["raw_value"] }
 sqlx.workspace            = true
@@ -38,10 +39,12 @@ tracing                   = { workspace = true, features = ["attributes", "log"]
 tree-sitter.workspace     = true
 tree_sitter_sql.workspace = true
 
+
+[features]
+schema = ["dep:schemars", "pglt_configuration/schema", "pglt_fs/schema"]
+
 [dev-dependencies]
 tempfile = "3.15.0"
 
 [lib]
 doctest = false
-
-[features]
diff --git a/crates/pglt_workspace/src/workspace.rs b/crates/pglt_workspace/src/workspace.rs

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ pub fn main() -> io::Result<()> {`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`
`67`		`- #[cfg(feature = "schemars")]`
	`67`	`+ #[cfg(feature = "schema")]`
`68`	`68`	`impl schemars::JsonSchema for &'static Category {`
`69`	`69`	`fn schema_name() -> String {`
`70`	`70`	`String::from("Category")`