From 65e551c5cfdd76084add376324eb66c10c5fdc6e Mon Sep 17 00:00:00 2001
From: Lucien Greathouse <me@lpghatguy.com>
Date: Mon, 17 Dec 2018 14:20:19 -0800
Subject: [PATCH] Move InstanceChanges into rbx_snapshot

---
 server/src/rbx_session.rs  | 15 +--------------
 server/src/rbx_snapshot.rs | 15 +++++++++++++--
 server/src/session.rs      |  3 ++-
 server/src/web.rs          |  2 +-
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/server/src/rbx_session.rs b/server/src/rbx_session.rs
index 08ffb590..3c306064 100644
--- a/server/src/rbx_session.rs
+++ b/server/src/rbx_session.rs
@@ -13,22 +13,9 @@ use crate::{
     message_queue::MessageQueue,
     imfs::{Imfs, ImfsItem, ImfsFile},
     path_map::PathMap,
-    rbx_snapshot::{RbxSnapshotInstance, reify_root, reconcile_subtree},
+    rbx_snapshot::{RbxSnapshotInstance, InstanceChanges, reify_root, reconcile_subtree},
 };
 
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-pub struct InstanceChanges {
-    pub added: HashSet<RbxId>,
-    pub removed: HashSet<RbxId>,
-    pub updated: HashSet<RbxId>,
-}
-
-impl InstanceChanges {
-    pub fn is_empty(&self) -> bool {
-        self.added.is_empty() && self.removed.is_empty() && self.updated.is_empty()
-    }
-}
-
 pub struct RbxSession {
     tree: RbxTree,
     paths_to_node_ids: PathMap<RbxId>,
diff --git a/server/src/rbx_snapshot.rs b/server/src/rbx_snapshot.rs
index 4a45afd0..45320990 100644
--- a/server/src/rbx_snapshot.rs
+++ b/server/src/rbx_snapshot.rs
@@ -1,13 +1,24 @@
 use std::{
     str,
     borrow::Cow,
-    collections::HashMap,
+    collections::{HashMap, HashSet},
     path::PathBuf,
 };
 
 use rbx_tree::{RbxTree, RbxId, RbxInstance, RbxValue};
 
-use crate::rbx_session::InstanceChanges;
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+pub struct InstanceChanges {
+    pub added: HashSet<RbxId>,
+    pub removed: HashSet<RbxId>,
+    pub updated: HashSet<RbxId>,
+}
+
+impl InstanceChanges {
+    pub fn is_empty(&self) -> bool {
+        self.added.is_empty() && self.removed.is_empty() && self.updated.is_empty()
+    }
+}
 
 pub struct RbxSnapshotInstance<'a> {
     pub name: Cow<'a, str>,
diff --git a/server/src/session.rs b/server/src/session.rs
index 86fbf5a0..bf7686e5 100644
--- a/server/src/session.rs
+++ b/server/src/session.rs
@@ -8,7 +8,8 @@ use crate::{
     project::Project,
     imfs::Imfs,
     session_id::SessionId,
-    rbx_session::{RbxSession, InstanceChanges},
+    rbx_session::RbxSession,
+    rbx_snapshot::InstanceChanges,
     fs_watcher::FsWatcher,
 };
 
diff --git a/server/src/web.rs b/server/src/web.rs
index ee7c473a..6a7e02d6 100644
--- a/server/src/web.rs
+++ b/server/src/web.rs
@@ -16,7 +16,7 @@ use crate::{
     session::Session,
     session_id::SessionId,
     project::Project,
-    rbx_session::{InstanceChanges},
+    rbx_snapshot::InstanceChanges,
 };
 
 #[derive(Debug, Serialize, Deserialize)]