cargo-rail: fixing the release pipe; Issues #6 & 7 are addressed. added the improved macros for cleaner outputs w/o the log/tracing.

Author: loadingalias

src/backup/manager.rs

@@ -85,15 +85,15 @@ impl BackupManager {
 
     let metadata = BackupMetadata::load(&backup_dir)?;
 
-    eprintln!("restoring backup: {}", metadata.timestamp);
-    eprintln!("  {} files", metadata.files_modified.len());
+    crate::status!("restoring backup: {}", metadata.timestamp);
+    crate::status!("  {} files", metadata.files_modified.len());
 
     for file in &metadata.files_modified {
       let src = backup_dir.join(file);
       let dest = self.workspace_root.join(file);
 
       if !src.exists() {
-        eprintln!("  skipped (missing): {}", file.display());
+        crate::status!("  skipped (missing): {}", file.display());
         continue;
       }
 
@@ -104,7 +104,7 @@ impl BackupManager {
 
       fs::copy(&src, &dest).map_err(|e| RailError::message(format!("failed to restore {}: {}", file.display(), e)))?;
 
-      eprintln!("  restored: {}", file.display());
+      crate::status!("  restored: {}", file.display());
     }
 
     println!("backup restored");
@@ -141,7 +141,7 @@ impl BackupManager {
           backups.push(BackupRecord::new(backup_id, metadata, path));
         }
         Err(e) => {
-          eprintln!("warning: skipping corrupted backup '{}': {}", backup_id, e);
+          crate::warn!("skipping corrupted backup '{}': {}", backup_id, e);
           continue;
         }
       }

src/cargo/manifest_analyzer.rs

@@ -1,7 +1,6 @@
 //! Unified manifest analysis for feature classification
 //!
-//! This module handles ALL manifest parsing and analysis, replacing the duplicate
-//! handling between manifest.rs and unify/manifest_parser.rs
+//! This module handles ALL manifest parsing and analysis
 
 use crate::error::{RailResult, ResultExt};
 use cargo_metadata::DependencyKind as MetadataDepKind;
@@ -11,11 +10,9 @@ use std::path::{Path, PathBuf};
 use std::sync::Arc;
 use toml_edit::{DocumentMut, Item, Value};
 
-// ============================================================================
 // Core Types
-// ============================================================================
 
-/// Unique identifier for a dependency
+/// Unique identifier for a dep
 ///
 /// Uses `Arc<str>` for the name fields to avoid expensive clones in hot loops.
 /// Cloning a DepKey is cheap (just Arc refcount bumps).
@@ -161,9 +158,7 @@ pub struct ParsedManifest {
   pub dependencies: HashMap<DepKey, DepUsage>,
 }
 
-// ============================================================================
 // Parse Context
-// ============================================================================
 
 /// Context for parsing dependency sections within a single manifest.
 /// Bundles common parameters to reduce function argument count.
@@ -176,9 +171,7 @@ struct ParseContext<'a> {
   dependencies: &'a mut HashMap<DepKey, DepUsage>,
 }
 
-// ============================================================================
 // Main Analyzer
-// ============================================================================
 
 /// Analyzes all workspace manifests for dependency usage patterns
 pub struct ManifestAnalyzer {
@@ -616,7 +609,7 @@ impl ManifestAnalyzer {
 
   /// Count how many crates use a package (aggregated across renamed and non-renamed deps)
   ///
-  /// Issue #6: When include_renamed = true, count all usages of the package
+  /// When include_renamed = true, count all usages of the package
   /// Uses package_index for O(1) key lookup instead of O(n) scan.
   pub fn package_usage_count(&self, package_name: &str) -> usize {
     let Some(dep_keys) = self.package_index.get(package_name) else {
@@ -637,7 +630,7 @@ impl ManifestAnalyzer {
 
   /// Get all dep keys that refer to a specific package (including renamed)
   ///
-  /// Issue #6: Used to find all renamed variants of a package
+  /// Used to find all renamed variants of a package
   /// Uses package_index for O(1) lookup instead of O(n) scan.
   pub fn dep_keys_for_package(&self, package_name: &str) -> Vec<&DepKey> {
     self
@@ -649,7 +642,7 @@ impl ManifestAnalyzer {
 
   /// Get aggregated usage sites for a package (all renamed and non-renamed usages)
   ///
-  /// Issue #6: Used when include_renamed = true to merge features across all usages
+  /// Used when include_renamed = true to merge features across all usages
   /// Uses package_index for O(1) key lookup instead of O(n) scan.
   pub fn get_package_usage_sites(&self, package_name: &str) -> Vec<&DepUsage> {
     let Some(dep_keys) = self.package_index.get(package_name) else {
@@ -668,7 +661,7 @@ impl ManifestAnalyzer {
 
   /// Compute union of features across all usages of a package (including renamed)
   ///
-  /// Issue #6: When include_renamed = true, aggregate features from all variants
+  /// When include_renamed = true, aggregate features from all variants
   pub fn compute_package_union(&self, package_name: &str) -> BTreeSet<String> {
     let mut union = BTreeSet::new();
 
@@ -683,7 +676,7 @@ impl ManifestAnalyzer {
 
   /// Check if a package has mixed default-features across all usages (including renamed)
   ///
-  /// Issue #6: When include_renamed = true, check across all variants
+  /// When include_renamed = true, check across all variants
   pub fn package_has_mixed_defaults(&self, package_name: &str) -> bool {
     let usages: Vec<_> = self
       .get_package_usage_sites(package_name)
@@ -701,7 +694,7 @@ impl ManifestAnalyzer {
 
   /// Get default-features policy across all usages of a package (including renamed)
   ///
-  /// Issue #6: When include_renamed = true, use conservative policy across all variants
+  /// When include_renamed = true, use conservative policy across all variants
   pub fn package_default_features_policy(&self, package_name: &str) -> Option<bool> {
     let usages: Vec<_> = self
       .get_package_usage_sites(package_name)
@@ -723,15 +716,13 @@ impl ManifestAnalyzer {
 
   /// Get unique package names from all dependencies
   ///
-  /// Issue #6: Used to iterate by package rather than by dep key
+  /// Used to iterate by package rather than by dep key
   pub fn unique_packages(&self) -> HashSet<Arc<str>> {
     self.usage_index.keys().map(|k| Arc::clone(&k.name)).collect()
   }
 }
 
-// ============================================================================
 // Workspace Dependencies Parser
-// ============================================================================
 
 /// Information about an existing workspace dependency
 #[derive(Debug, Clone)]
@@ -843,9 +834,7 @@ fn parse_workspace_dep_entry(name: &str, value: &Item) -> ExistingWorkspaceDep {
   dep
 }
 
-// ============================================================================
 // Unit Tests
-// ============================================================================
 
 #[cfg(test)]
 mod tests {

src/cargo/manifest_ops/fields.rs

@@ -3,9 +3,7 @@
 use crate::error::{RailError, RailResult};
 use toml_edit::{Array, InlineTable, Item, Table, Value};
 
-// ============================================================================
 // Feature Array Operations
-// ============================================================================
 
 /// Build feature array from strings
 pub fn build_feature_array(features: &[String]) -> Value {
@@ -55,9 +53,7 @@ pub fn set_features(item: &mut Item, features: Vec<String>) -> RailResult<()> {
   }
 }
 
-// ============================================================================
 // Path Dependency Operations
-// ============================================================================
 
 /// Remove path field from dependency
 pub fn remove_path(item: &mut Item) -> bool {

src/cargo/manifest_ops/navigation.rs

@@ -3,9 +3,7 @@
 use crate::error::{RailError, RailResult};
 use toml_edit::{DocumentMut, Item, Table};
 
-// ============================================================================
 // TOML Section Navigation
-// ============================================================================
 
 /// Ensure a section exists, creating if necessary
 pub fn ensure_section(doc: &mut DocumentMut, path: &str) -> RailResult<()> {
@@ -70,9 +68,7 @@ pub fn insert_dependency(section: &mut Table, name: &str, entry: Item) -> RailRe
   Ok(())
 }
 
-// ============================================================================
 // Target-Specific Dependencies
-// ============================================================================
 
 /// Add target-specific dependency
 pub fn insert_target_dependency(

src/cargo/manifest_ops/transform.rs

@@ -6,9 +6,7 @@ use toml_edit::{DocumentMut, Item, Table, Value};
 
 use super::workspace_ref::is_package_workspace_inherited;
 
-// ============================================================================
 // Batch Transformation Operations
-// ============================================================================
 
 /// Transform all dependencies in a section
 pub fn transform_dependencies_in_section<F>(doc: &mut DocumentMut, section: &str, mut transform_fn: F) -> RailResult<()>

src/cargo/multi_target_metadata.rs

@@ -749,9 +749,7 @@ mod tests {
     assert_ne!(MsrvSourceUsed::MaxWorkspace, MsrvSourceUsed::MaxDeps);
   }
 
-  // ============================================================================
   // Determinism Regression Tests
-  // ============================================================================
   // These tests verify that outputs are deterministic (sorted) to prevent
   // non-deterministic behavior from HashMap/HashSet iteration order.
 

src/cargo/unify_analyzer.rs

@@ -2,6 +2,7 @@
 //!
 //! This is the core of the unify implementation that properly integrates
 //! with WorkspaceContext and uses multi-target metadata + manifest analysis.
+//! The undeclared features detection lives here.
 
 use crate::cargo::{
   manifest_analyzer::{ExistingWorkspaceDep, ManifestAnalyzer, parse_existing_workspace_deps},
@@ -21,11 +22,7 @@ use semver::VersionReq;
 use std::collections::{HashMap, HashSet};
 use std::path::{Path, PathBuf};
 
-// ============================================================================
-// Main Analyzer
-// ============================================================================
-
-/// Analyzes workspace for dependency unification opportunities
+/// Analyzes workspace for dependency unifications
 pub struct UnifyAnalyzer {
   metadata: MultiTargetMetadata,
   manifests: ManifestAnalyzer,
@@ -129,7 +126,7 @@ impl UnifyAnalyzer {
       let dep_key = candidate.dep_key;
       let usage_sites = candidate.usages;
 
-      // === Check for major version conflicts ===
+      // Check for major version conflicts
       // Different major versions cannot be safely merged - behavior depends on config.
       let major_versions = find_major_version_conflicts(&usage_sites);
       if major_versions.len() > 1 {
@@ -165,7 +162,7 @@ impl UnifyAnalyzer {
         }
       }
 
-      // === Issue B: Check for exact version pins ===
+      // Check for exact version pins
       let has_exact_pin = usage_sites
         .iter()
         .any(|u| u.declared_version.as_ref().map(|v| is_exact_pin(v)).unwrap_or(false));
@@ -235,7 +232,7 @@ impl UnifyAnalyzer {
         VersionReq::parse(&format!("^{}", version)).unwrap_or_else(|_| VersionReq::parse(&version.to_string()).unwrap())
       };
 
-      // === Issue A: Check for version mismatches with existing workspace.dependencies ===
+      // Check for version mismatches with existing workspace.dependencies
       if let Some(existing_ws_dep) = self.existing_workspace_deps.get(&*dep_key.name)
         && let Some(ref ws_version) = existing_ws_dep.version
       {
@@ -326,7 +323,7 @@ impl UnifyAnalyzer {
       // Get users - convert Arc<str> to String for output
       let users: HashSet<String> = usage_sites.iter().map(|u| u.used_by.to_string()).collect();
 
-      // === Issue C: Check include_paths config before processing path dependencies ===
+      // Check include_paths config before processing path dependencies
       let dep_path: Option<PathBuf> = if self.config.include_paths {
         // Check if any usage has a path (path dependencies)
         // If so, check if the dep is a workspace member to include path in workspace.dependencies
@@ -442,7 +439,7 @@ impl UnifyAnalyzer {
       (Vec::new(), Vec::new())
     };
 
-    // === Issue D: Detect unused dependencies ===
+    // Detect unused dependencies
     let unused_finder = UnusedDepFinder::new(&self.metadata, &self.manifests);
     let unused_deps = if self.config.detect_unused {
       progress!("Detecting unused dependencies...");
@@ -467,7 +464,7 @@ impl UnifyAnalyzer {
       member_edits.entry(crate_name).or_default().extend(edits);
     }
 
-    // === Detect undeclared features ===
+    // Detect undeclared features
     // Find cases where a crate uses features that it didn't declare in Cargo.toml
     // This happens when Cargo's feature unification "borrows" features from other members
     let undeclared_features = if self.config.detect_undeclared_features {
@@ -605,7 +602,7 @@ impl UnifyAnalyzer {
   fn detect_undeclared_features(&self) -> Vec<UndeclaredFeature> {
     let mut undeclared = Vec::new();
 
-    // Step 1: Get workspace baseline (features declared in [workspace.dependencies])
+    // Get workspace baseline (features declared in [workspace.dependencies])
     // These are workspace policy - members don't need to re-declare them
     let workspace_baseline: HashMap<String, HashSet<String>> = self
       .existing_workspace_deps
@@ -619,7 +616,7 @@ impl UnifyAnalyzer {
       })
       .collect();
 
-    // Step 2: Build a map of what each member explicitly declares for each dependency
+    // Build a map of what each member explicitly declares for each dependency
     // Include both unconditional_features AND conditional_features (from [features] table)
     // Also track which features each member contributes (for borrowed_from)
     let mut member_declared_features: HashMap<String, HashMap<String, HashSet<String>>> = HashMap::new();
@@ -640,7 +637,7 @@ impl UnifyAnalyzer {
       member_declared_features.insert(member.package_name.clone(), dep_features);
     }
 
-    // Step 3: Track which members contribute which features (beyond workspace baseline)
+    // Track which members contribute which features (beyond workspace baseline)
     // This powers the `borrowed_from` field for transparency
     // Structure: dep_name -> feature -> set of member names
     let mut feature_sources: HashMap<String, HashMap<String, HashSet<String>>> = HashMap::new();
@@ -665,7 +662,7 @@ impl UnifyAnalyzer {
       }
     }
 
-    // Step 4: Find borrowed features for each member
+    // Find borrowed features for each member
     // A feature is borrowed if:
     // - It's contributed by OTHER members (not this member)
     // - It's NOT in workspace baseline (workspace policy doesn't count as borrowing)

src/cargo/unify_types.rs

@@ -12,11 +12,9 @@ use semver::VersionReq;
 use std::collections::{BTreeMap, HashMap, HashSet};
 use std::path::PathBuf;
 
-// ============================================================================
 // Core Types
-// ============================================================================
 
-/// A dependency that will be unified in [workspace.dependencies]
+/// A dep that will be unified in [workspace.dependencies]
 #[derive(Debug, Clone)]
 pub struct UnifiedDep {
   /// Dependency package name
@@ -35,10 +33,10 @@ pub struct UnifiedDep {
   pub path: Option<PathBuf>,
 }
 
-/// An edit to apply to a member's Cargo.toml
+/// An edit to apply to a member's `Cargo.toml`
 #[derive(Debug, Clone)]
 pub enum MemberEdit {
-  /// Replace dependency with workspace inheritance
+  /// Replace dep with workspace inheritance
   UseWorkspace {
     /// Name of the dependency to replace
     dep_name: String,
@@ -51,7 +49,7 @@ pub enum MemberEdit {
     /// Whether the dependency is optional
     is_optional: bool,
   },
-  /// Remove an unused dependency
+  /// Remove an unused dep
   RemoveDep {
     /// Name of the dependency to remove
     dep_name: String,
@@ -217,9 +215,7 @@ pub struct UndeclaredFeature {
   pub borrowed_from: Vec<String>,
 }
 
-// ============================================================================
 // UnificationPlan
-// ============================================================================
 
 /// Complete unification plan
 #[derive(Debug)]
@@ -591,9 +587,7 @@ mod tests {
     }
   }
 
-  // ============================================================================
   // UndeclaredFeature Tests
-  // ============================================================================
 
   #[test]
   fn test_undeclared_feature_struct() {
@@ -650,9 +644,7 @@ mod tests {
     assert_eq!(uf.dep_kind, DepKind::Dev);
   }
 
-  // ============================================================================
   // UnificationPlan Summary Tests
-  // ============================================================================
 
   #[test]
   fn test_summary_with_add_features_edit() {