Merge pull request #760 from epage/shell

refactor: Clean up
crate-ci · Feb 27, 2024 · a5cb47e · a5cb47e
2 parents 3d0b8ad + 4346ef1
commit a5cb47e
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 82 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -7,8 +7,6 @@
 #![cfg_attr(docsrs, feature(doc_auto_cfg))]
 
 pub mod config;
-mod diff;
 pub mod error;
 pub mod ops;
-pub mod shell;
 pub mod steps;
diff --git a/src/ops/cargo.rs b/src/ops/cargo.rs
@@ -180,8 +180,12 @@ pub fn set_workspace_version(
 
     if dry_run {
         if manifest != original_manifest {
-            let diff =
-                crate::diff::unified_diff(&original_manifest, &manifest, manifest_path, "updated");
+            let diff = crate::ops::diff::unified_diff(
+                &original_manifest,
+                &manifest,
+                manifest_path,
+                "updated",
+            );
             log::debug!("change:\n{diff}");
         }
     } else {
@@ -278,8 +282,12 @@ pub fn set_package_version(manifest_path: &Path, version: &str, dry_run: bool) -
 
     if dry_run {
         if manifest != original_manifest {
-            let diff =
-                crate::diff::unified_diff(&original_manifest, &manifest, manifest_path, "updated");
+            let diff = crate::ops::diff::unified_diff(
+                &original_manifest,
+                &manifest,
+                manifest_path,
+                "updated",
+            );
             log::debug!("change:\n{diff}");
         }
     } else {
@@ -314,8 +322,12 @@ pub fn upgrade_dependency_req(
     let manifest = manifest.to_string();
     if manifest != original_manifest {
         if dry_run {
-            let diff =
-                crate::diff::unified_diff(&original_manifest, &manifest, manifest_path, "updated");
+            let diff = crate::ops::diff::unified_diff(
+                &original_manifest,
+                &manifest,
+                manifest_path,
+                "updated",
+            );
             log::debug!("change:\n{diff}");
         } else {
             atomic_write(manifest_path, &manifest)?;

diff --git a/src/diff.rs → src/ops/diff.rs b/src/diff.rs → src/ops/diff.rs
diff --git a/src/ops/mod.rs b/src/ops/mod.rs
@@ -5,3 +5,5 @@ pub mod index;
 pub mod replace;
 pub mod shell;
 pub mod version;
+
+pub(crate) mod diff;
diff --git a/src/ops/replace.rs b/src/ops/replace.rs
@@ -124,7 +124,7 @@ pub fn do_file_replacements(
                         format!(
                             "in {}\n{}",
                             path.display(),
-                            crate::diff::unified_diff(&data, &replaced, &path, "replaced")
+                            crate::ops::diff::unified_diff(&data, &replaced, &path, "replaced")
                         ),
                     );
                 } else {

diff --git a/src/shell.rs b/src/shell.rs
diff --git a/src/steps/commit.rs b/src/steps/commit.rs
@@ -93,7 +93,7 @@ impl CommitStep {
         if ws_config.is_workspace {
             let consolidate_commits = super::consolidate_commits(&selected_pkgs, &excluded_pkgs)?;
             if !consolidate_commits {
-                let _ = crate::shell::warn(
+                let _ = crate::ops::shell::warn(
                     "ignoring `consolidate-commits=false`; `cargo release commit` can effectively only do one commit",
                 );
             }