first pass of merging in warp (doesn't build)

app/src/editor/view/model/buffer/undo.rs

@@ -1,13 +1,12 @@
-use std::{
-    collections::{BTreeSet, HashMap},
-    time::Duration,
-};
+use std::collections::{BTreeSet, HashMap};
+use std::time::Duration;
 
 use bounded_vec_deque::BoundedVecDeque;
 use instant::Instant;
 
 use super::time::{Global, Lamport, LamportValue};
-use crate::editor::view::{model::LocalSelections, PlainTextEditorViewAction};
+use crate::editor::view::model::LocalSelections;
+use crate::editor::view::PlainTextEditorViewAction;
 
 /// The maximum time we will batch consecutive edits for the same [`Action`].
 /// The "batch" here is not to be confused with the [`Buffer`]'s notion
@@ -269,5 +268,5 @@ impl PlainTextEditorViewAction {
 }
 
 #[cfg(test)]
-#[path = "undo_test.rs"]
+#[path = "undo_tests.rs"]
 mod tests;