Fix-ups following the cj_check PR

Makefile

@@ -10,14 +10,9 @@ check_formatting: fmt
 
 cargo_test:
 	@echo "++ Run cargo $(OUR_CARGO_FLAGS) test on both crates"
-	( cd patchparser && cargo $(OUR_CARGO_FLAGS) test )
-	( cd patchparser && cargo $(OUR_CARGO_FLAGS) test --examples )
-	( cd split-patch && cargo $(OUR_CARGO_FLAGS) test )
-
-cargo_check:
-	( cd patchparser && cargo $(OUR_CARGO_FLAGS) test --color=always )
-	( cd patchparser && cargo $(OUR_CARGO_FLAGS) build --examples --color=always )
-	( cd split-patch && cargo $(OUR_CARGO_FLAGS) test --color=always )
+	( cd patchparser && cargo $(OUR_CARGO_FLAGS) test --color=always)
+	( cd patchparser && cargo $(OUR_CARGO_FLAGS) test --examples --color=always )
+	( cd split-patch && cargo $(OUR_CARGO_FLAGS) test --color=always)
 
 # This target is to abstract running clippy on everything (and can be run manually)
 clippy:

patchparser/examples/generate_patch.rs

@@ -60,7 +60,7 @@ fn main() -> Result<()> {
             similarity_line: None,
             rename_from_line: None,
             rename_to_line: None,
-            differences: Some(DiffDifferences {
+            differences: Some(&DiffDifferences {
                 index_line: Some("index line".into()),
                 minus_line: "minus line".into(),
                 plus_line: "plus line".into(),
@@ -77,7 +77,7 @@ fn main() -> Result<()> {
                 }),
                 remaining_lines: &["Hey there!".into(), "".into()],
             },
-            diffs: bump.alloc([diff]),
+            diffs: &[&diff],
             footer: &[],
         };
 

patchparser/src/coerce_ref.rs

@@ -0,0 +1,28 @@
+pub trait CoerceRef {
+    type U;
+    fn coerce_ref(self) -> Self::U;
+}
+
+impl<'t, T, E> CoerceRef for Result<&'t mut T, E> {
+    type U = Result<&'t T, E>;
+
+    fn coerce_ref(self) -> Self::U {
+        self.map(|v| -> &T { v })
+    }
+}
+
+impl<'t, T, const N: usize> CoerceRef for [&'t mut T; N] {
+    type U = [&'t T; N];
+
+    fn coerce_ref(self) -> Self::U {
+        self.map(|v| -> &T { v })
+    }
+}
+
+impl<'t, T> CoerceRef for &'t mut T {
+    type U = &'t T;
+
+    fn coerce_ref(self) -> Self::U {
+        self
+    }
+}

patchparser/src/lib.rs

@@ -1,12 +1,11 @@
 pub mod anyhow_once;
 pub mod bumpalo_bstring;
-pub mod bumpalo_cow;
 pub mod bumpalo_utils;
+pub mod coerce_ref;
 pub mod format_binary;
 pub mod from_lines;
 pub mod line;
 pub mod patch;
-pub mod reborrow_in;
 pub mod regex_utils;
 pub mod utils;
 pub mod write_to;