Merge branch 'main' into 0.4.0

web-infra-dev · Sep 25, 2023 · 7c387a0 · 7c387a0
2 parents 28013af + f816657
commit 7c387a0
Show file tree

Hide file tree

Showing 581 changed files with 9,468 additions and 3,763 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/cargo-rst/Cargo.toml b/crates/cargo-rst/Cargo.toml
@@ -18,4 +18,4 @@ serde      = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 
 console = "0.15.7"
-similar = { workspace = true, features = ["inline"] }
+similar = { workspace = true, features = ["inline", "text", "bytes"] }
diff --git a/crates/cargo-rst/src/lib.rs b/crates/cargo-rst/src/lib.rs
@@ -6,6 +6,7 @@ pub mod rst;
 mod terminal_inline;
 mod update;
 pub use rst::test;
+pub use terminal_inline::*;
 pub use update::update;
 
 // #[derive(FromArgs)]

diff --git a/crates/cargo-rst/src/terminal_inline.rs b/crates/cargo-rst/src/terminal_inline.rs
@@ -57,3 +57,8 @@ pub fn diff_and_print(expected: &str, actual: &str) -> String {
   let diff = TextDiff::from_lines(expected, actual);
   pretty_diff_printer(&diff)
 }
+
+pub fn git_diff(expected: &str, actual: &str) -> String {
+  let diff = TextDiff::from_lines(expected, actual);
+  diff.unified_diff().header("expected", "actual").to_string()
+}