Cleanup: remove some of the unused code

src/changeset.rs

@@ -3,7 +3,7 @@ use std::collections::HashMap;
 use serde::{Deserialize, Serialize};
 
 use crate::common::VersionId;
-use crate::track::{EventId, Note, Track, TrackEvent, TrackEventType};
+use crate::track::{EventId, Track, TrackEvent};
 use crate::track_edit::{CommandDiff, EditCommandId};
 
 /// Simplest track edit operation. See [Changeset] for uses.
@@ -94,10 +94,6 @@ impl Changeset {
             self.add(a);
         }
     }
-
-    pub fn merge(&mut self, other: Self) {
-        self.changes.extend(other.changes);
-    }
 }
 
 /// Serializable changeset, diff. Storing these to keep whole edit history persistent, help with
@@ -127,32 +123,3 @@ impl Snapshot {
         }
     }
 }
-
-pub type EventFn = dyn Fn(&TrackEvent) -> Option<EventAction> + 'static;
-
-/// Convenience wrapper
-pub fn to_event_action<NoteFn: Fn(&Note) -> Option<Note> + 'static>(
-    action: NoteFn,
-) -> Box<EventFn> {
-    Box::new(move |ev| {
-        if let TrackEvent {
-            event: TrackEventType::Note(n),
-            ..
-        } = &ev
-        {
-            match action(n) {
-                Some(note) => Some(EventAction::Update(
-                    ev.clone(),
-                    TrackEvent {
-                        id: ev.id,
-                        at: ev.at,
-                        event: TrackEventType::Note(note),
-                    },
-                )),
-                None => None,
-            }
-        } else {
-            None
-        }
-    })
-}

src/track.rs

@@ -111,7 +111,6 @@ impl Track {
     }
 
     pub fn patch(&mut self, changeset: &Changeset) {
-        // TODO (DRY) See also [revert]
         let mut track_map = self.index_events();
         for ea in changeset.changes.values() {
             match ea.after() {
@@ -129,24 +128,6 @@ impl Track {
         self.splat_events(&track_map);
     }
 
-    pub fn revert(&mut self, changeset: &Changeset) {
-        let mut track_map = self.index_events();
-        for ea in changeset.changes.values() {
-            match ea.before() {
-                Some(ev) => {
-                    assert_eq!(
-                        track_map.insert(ev.id, ev.clone()).is_some(),
-                        matches!(ea, EventAction::Update(_, _))
-                    );
-                }
-                None => {
-                    assert!(track_map.remove(&ea.event_id()).is_some());
-                }
-            }
-        }
-        self.splat_events(&track_map);
-    }
-
     pub fn commit(&mut self) {
         assert!(is_ordered(&self.events));
     }

src/track_edit.rs

@@ -109,14 +109,6 @@ fn do_shift_tail(track: &Track, at: &Time, delta: &Time, changeset: &mut Changes
     changeset.add_all(&actions);
 }
 
-fn do_delete_events_range(track: &Track, range: &Range<Time>, changeset: &mut Changeset) {
-    for ev in &track.events {
-        if range_contains(range, ev.at) {
-            changeset.add(EventAction::Delete(ev.clone()));
-        }
-    }
-}
-
 pub fn tape_insert(range: &Range<Time>) -> AppliedCommand {
     let mut diffs = vec![];
     let delta = range.1 - range.0;

src/track_history.rs

@@ -1,13 +1,12 @@
 use std::fs;
 use std::path::PathBuf;
 use std::sync::{Arc, RwLock};
-use std::time::{Duration, Instant};
 
 use glob::glob;
 use regex::Regex;
 use serde::{Deserialize, Serialize};
 
-use crate::changeset::{Changeset, EventAction, HistoryLogEntry, Snapshot};
+use crate::changeset::{EventAction, HistoryLogEntry, Snapshot};
 use crate::common::VersionId;
 use crate::track::{import_smf, Track};
 use crate::track_edit::{apply_diffs, revert_diffs, CommandDiff, EditCommandId};