cargo-rail: added proper TOML formatter for the codebase and cleaned out the manual TOML editing/etc. added a proper backup && undo command.

Author: loadingalias

src/cargo/manifest.rs

@@ -12,12 +12,10 @@
 //! - `manifest` - Lossless Cargo.toml transformation
 //! - `unify` - Workspace dependency unification engine (replaces cargo-hakari)
 //! - `validate` - Optional per-target validation with Rayon parallelism
-
-/// Lossless Cargo.toml transformation
+/// Workspace dependency unification engine
 pub mod manifest;
 /// Comprehensive cargo_metadata wrapper
 pub mod metadata;
-/// Workspace dependency unification engine
 pub mod unify;
 /// Per-target validation with parallel execution
 pub mod validate;

src/cargo/mod.rs

@@ -5,6 +5,7 @@
 
 use crate::config::{RailConfig, UnifyConfig, WorkspaceConfig};
 use crate::error::{RailError, RailResult};
+use crate::toml::builder::RailConfigBuilder;
 use crate::workspace::WorkspaceContext;
 use std::fs;
 use std::io::{self, Write};
@@ -69,8 +70,14 @@ pub fn run_init(
   // 4. Build config
   let config = build_rail_config(workspace_root.to_path_buf(), unify);
 
-  // 6. Serialize with comments
-  let toml_content = serialize_config_with_comments(&config)?;
+  // 6. Serialize with comments using Builder
+  let toml_content = RailConfigBuilder::new()
+    .header()
+    .workspace(&config.workspace.root)
+    .unify(&config.unify)
+    .release(&config.release)
+    .splits_template()
+    .build()?;
 
   // 5. Write or print
   if dry_run {
@@ -112,178 +119,10 @@ fn build_rail_config(_workspace_root: PathBuf, unify: UnifyConfig) -> RailConfig
     unify,
     release: crate::config::ReleaseConfig::default(),
     splits: vec![], // Empty by default - use 'cargo rail split init' to configure
+    formatting: crate::config::FormattingConfig::default(),
   }
 }
 
-/// Serialize RailConfig to TOML string with minimal, clean comments
-fn serialize_config_with_comments(config: &RailConfig) -> RailResult<String> {
-  let mut output = String::new();
-
-  // Header
-  output.push_str("# cargo-rail configuration\n");
-  output.push_str("# Generated by: cargo rail init\n");
-  output.push_str("# Documentation: https://github.com/loadingalias/cargo-rail\n\n");
-
-  // Workspace
-  output.push_str("[workspace]\n");
-  output.push_str(&format!("root = \"{}\"\n\n", config.workspace.root.display()));
-
-  // Dependency Unification
-  output.push_str("[unify]\n");
-  output.push_str(&format!("use_all_features = {}\n", config.unify.use_all_features));
-  output.push_str(&format!("allow_renamed = {}\n", config.unify.allow_renamed));
-
-  if !config.unify.exclude.is_empty() {
-    output.push_str("exclude = [");
-    for (i, dep) in config.unify.exclude.iter().enumerate() {
-      if i > 0 {
-        output.push_str(", ");
-      }
-      output.push_str(&format!("\"{}\"", dep));
-    }
-    output.push_str("]\n");
-  } else {
-    output.push_str("exclude = []  # Dependencies to skip unification\n");
-  }
-
-  if !config.unify.include.is_empty() {
-    output.push_str("include = [");
-    for (i, dep) in config.unify.include.iter().enumerate() {
-      if i > 0 {
-        output.push_str(", ");
-      }
-      output.push_str(&format!("\"{}\"", dep));
-    }
-    output.push_str("]\n");
-  } else {
-    output.push_str("include = []  # Dependencies to force unification\n");
-  }
-
-  output.push('\n');
-
-  // Conflict handling
-  output.push_str("[unify.conflicts]\n");
-  output.push_str(&format!(
-    "auto_resolve = {}  # Pick highest version automatically\n",
-    config.unify.conflicts.auto_resolve
-  ));
-  output.push_str(&format!(
-    "resolution_mode = \"{}\"  # \"permissive\" or \"strict\"\n",
-    config.unify.conflicts.resolution_mode
-  ));
-  output.push_str(&format!(
-    "add_markers = {}  # Add # ⚠️ comments to Cargo.toml\n\n",
-    config.unify.conflicts.add_markers
-  ));
-
-  // Transitive optimization
-  output.push_str("[unify.transitives]\n");
-  output.push_str(&format!(
-    "consolidate_features = {}  # Add fragmented transitive deps to workspace\n",
-    config.unify.transitives.consolidate_features
-  ));
-
-  // Serialize host_selection
-  match &config.unify.transitives.host_selection {
-    crate::config::TransitiveFeatureHost::Auto => {
-      output.push_str("host_selection = \"auto\"  # \"auto\", \"root\", \"largest\", or [\"crate-name\"]\n\n");
-    }
-    crate::config::TransitiveFeatureHost::Root => {
-      output.push_str("host_selection = \"root\"\n\n");
-    }
-    crate::config::TransitiveFeatureHost::Largest => {
-      output.push_str("host_selection = \"largest\"\n\n");
-    }
-    crate::config::TransitiveFeatureHost::Explicit(names) => {
-      output.push_str("host_selection = [");
-      for (i, name) in names.iter().enumerate() {
-        if i > 0 {
-          output.push_str(", ");
-        }
-        output.push_str(&format!("\"{}\"", name));
-      }
-      output.push_str("]\n\n");
-    }
-  }
-
-  // Validation
-  output.push_str("[unify.validation]\n");
-  if !config.unify.validation.targets.is_empty() {
-    output.push_str("targets = [");
-    for (i, target) in config.unify.validation.targets.iter().enumerate() {
-      if i > 0 {
-        output.push_str(", ");
-      }
-      output.push_str(&format!("\"{}\"", target));
-    }
-    output.push_str("]\n");
-  } else {
-    output.push_str("targets = []  # Platform-specific validation (e.g., [\"x86_64-unknown-linux-gnu\"])\n");
-  }
-  output.push_str(&format!(
-    "max_parallel_jobs = {}  # 0 = auto-detect\n\n",
-    config.unify.validation.max_parallel_jobs
-  ));
-
-  // Output
-  output.push_str("[unify.output]\n");
-  output.push_str(&format!(
-    "generate_report = {}\n\n",
-    config.unify.output.generate_report
-  ));
-
-  // Release
-  output.push_str("[release]\n");
-  output.push_str(&format!("tag_prefix = \"{}\"\n", config.release.tag_prefix));
-  output.push_str(&format!(
-    "tag_format = \"{}\"  # Variables: {{crate}}, {{version}}\n",
-    config.release.tag_format
-  ));
-  output.push_str(&format!("require_clean = {}\n", config.release.require_clean));
-  output.push_str(&format!("publish_delay = {}\n", config.release.publish_delay));
-  output.push_str(&format!(
-    "create_github_release = {}\n",
-    config.release.create_github_release
-  ));
-  output.push_str(&format!("sign_tags = {}\n", config.release.sign_tags));
-  output.push_str(&format!("changelog_path = \"{}\"\n", config.release.changelog_path));
-  output.push_str(&format!(
-    "skip_changelog_for = {}\n",
-    if config.release.skip_changelog_for.is_empty() {
-      "[]".to_string()
-    } else {
-      format!(
-        "[{}]",
-        config
-          .release
-          .skip_changelog_for
-          .iter()
-          .map(|s| format!("\"{}\"", s))
-          .collect::<Vec<_>>()
-          .join(", ")
-      )
-    }
-  ));
-  output.push_str(&format!(
-    "require_changelog_entries = {}\n\n",
-    config.release.require_changelog_entries
-  ));
-
-  // Splits - Don't include in default init
-  output.push_str("# Split/Sync: Use 'cargo rail split init <crate>' to configure individual crates\n");
-  output.push_str("# [[splits]]\n");
-  output.push_str("# name = \"my-crate\"\n");
-  output.push_str("# remote = \"[email protected]:org/my-crate.git\"\n");
-  output.push_str("# branch = \"main\"\n");
-  output.push_str("# mode = \"single\"\n");
-  output.push_str("# publish = true\n");
-  output.push_str("#\n");
-  output.push_str("# [[splits.paths]]\n");
-  output.push_str("# crate = \"crates/my-crate\"\n");
-
-  Ok(output)
-}
-
 /// Check if config file already exists at any location
 fn check_existing_config(workspace_root: &Path) -> Option<PathBuf> {
   crate::config::RailConfig::find_config_path(workspace_root)
@@ -372,10 +211,17 @@ pub fn run_init_standalone(
     },
     release: crate::config::ReleaseConfig::default(),
     splits: vec![],
+    formatting: crate::config::FormattingConfig::default(),
   };
 
-  // 5. Serialize with comments
-  let config_toml = serialize_config_with_comments(&config)?;
+  // 5. Serialize with comments using Builder
+  let config_toml = RailConfigBuilder::new()
+    .header()
+    .workspace(&config.workspace.root)
+    .unify(&config.unify)
+    .release(&config.release)
+    .splits_template()
+    .build()?;
 
   // 4. Output
   if dry_run {
@@ -403,19 +249,28 @@ pub fn run_init_standalone(
 #[cfg(test)]
 mod tests {
   use super::*;
+  use crate::config::{FormattingConfig, ReleaseConfig};
 
   #[test]
-  fn test_serialize_config_with_comments() {
+  fn test_serialize_config_with_builder() {
     let config = RailConfig {
       workspace: WorkspaceConfig {
         root: PathBuf::from("."),
       },
       unify: UnifyConfig::default(),
-      release: crate::config::ReleaseConfig::default(),
+      release: ReleaseConfig::default(),
       splits: vec![],
+      formatting: FormattingConfig::default(),
     };
 
-    let toml = serialize_config_with_comments(&config).unwrap();
+    let toml = RailConfigBuilder::new()
+      .header()
+      .workspace(&config.workspace.root)
+      .unify(&config.unify)
+      .release(&config.release)
+      .splits_template()
+      .build()
+      .unwrap();
 
     // Should contain section headers
     assert!(toml.contains("[workspace]"));

src/commands/init.rs

@@ -192,6 +192,7 @@ pub fn run_split_init(ctx: &WorkspaceContext, crates: Option<&str>, dry_run: boo
     unify: crate::config::UnifyConfig::default(),
     release: crate::config::ReleaseConfig::default(),
     splits: vec![],
+    formatting: crate::config::FormattingConfig::default(),
   });
 
   // Add new splits (avoid duplicates)

src/commands/split.rs

@@ -10,6 +10,8 @@ use crate::workspace::{ChangeImpact, WorkspaceContext};
 pub struct TestConfig {
   /// Git ref to compare against (if None, auto-detect)
   pub since: Option<String>,
+  /// Skip change detection and run all tests
+  pub full: bool,
   /// Explain why tests are being run
   pub explain: bool,
   /// Prefer cargo-nextest if available
@@ -33,7 +35,18 @@ pub fn run_test(ctx: &WorkspaceContext, config: TestConfig) -> RailResult<()> {
   let impact = analyzer.analyze_changes(&base_ref, None)?;
 
   // Get minimal test set
-  let test_targets = impact.minimal_test_set();
+  let test_targets = if config.full {
+    println!("⚡ Full mode active - running all tests");
+    ctx
+      .cargo
+      .metadata()
+      .list_crates()
+      .iter()
+      .map(|p| p.name.to_string())
+      .collect()
+  } else {
+    impact.minimal_test_set()
+  };
 
   if test_targets.is_empty() {
     println!("✓ No affected crates - all tests skipped");

src/commands/test.rs

@@ -444,7 +444,7 @@ pub fn run_unify_apply(
   }
 
   // Create transformer (use the same metadata we used for analysis)
-  let transformer = CargoTransform::new(metadata.clone());
+  let transformer = CargoTransform::new(ctx.cargo.metadata().clone());
 
   // 1. Write [workspace.dependencies]
   let workspace_toml = ctx.workspace_root().join("Cargo.toml");

src/commands/unify.rs

@@ -155,8 +155,12 @@ fn format_watch_test_command(config: &TestConfig) -> String {
     rail_cmd.push_str(&format!(" --since {}", since));
   }
 
-  if config.prefer_nextest {
-    rail_cmd.push_str(" --nextest");
+  if config.full {
+    rail_cmd.push_str(" --full");
+  }
+
+  if !config.prefer_nextest {
+    rail_cmd.push_str(" --no-nextest");
   }
 
   if !config.test_args.is_empty() {
@@ -207,6 +211,7 @@ mod tests {
   fn test_format_watch_test_command_includes_flags_and_args() {
     let cfg = TestConfig {
       since: Some("main".to_string()),
+      full: false,
       explain: false,
       prefer_nextest: true,
       test_args: vec!["--nocapture".into(), "some::test".into()],
@@ -215,7 +220,22 @@ mod tests {
     let cmd = format_watch_test_command(&cfg);
     assert!(cmd.starts_with("rail test"));
     assert!(cmd.contains("--since main"));
-    assert!(cmd.contains("--nextest"));
+    assert!(!cmd.contains("--no-nextest"));
     assert!(cmd.contains("-- --nocapture some::test"));
   }
+
+  #[test]
+  fn test_format_watch_test_command_no_nextest() {
+    let cfg = TestConfig {
+      since: None,
+      full: true,
+      explain: false,
+      prefer_nextest: false,
+      test_args: vec![],
+    };
+
+    let cmd = format_watch_test_command(&cfg);
+    assert!(cmd.contains("--full"));
+    assert!(cmd.contains("--no-nextest"));
+  }
 }

src/commands/watch.rs

@@ -18,6 +18,9 @@ pub struct RailConfig {
   /// Split/sync configurations for crates
   #[serde(default)]
   pub splits: Vec<SplitConfig>,
+  /// TOML formatting settings
+  #[serde(default)]
+  pub formatting: FormattingConfig,
 }
 
 /// Workspace location configuration
@@ -441,6 +444,14 @@ impl Default for ReleaseConfig {
   }
 }
 
+/// Configuration for TOML formatting
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
+pub struct FormattingConfig {
+  /// Add "Managed by cargo-rail" header (default: false)
+  #[serde(default)]
+  pub add_header: bool,
+}
+
 fn default_tag_prefix() -> String {
   "v".to_string()
 }