From e7fe4ac3ecbb368ad9ae35700cca7bdc4a07d7be Mon Sep 17 00:00:00 2001 From: Lucien Greathouse Date: Sat, 26 May 2018 16:44:25 -0700 Subject: [PATCH] Remove vestigial backwards syncing functionality. This functionality won't be present until the refactor in 0.5.0 --- server/src/plugin.rs | 22 ---------------------- server/src/plugins/default_plugin.rs | 6 +----- server/src/plugins/json_model_plugin.rs | 6 +----- server/src/plugins/script_plugin.rs | 6 +----- 4 files changed, 3 insertions(+), 37 deletions(-) diff --git a/server/src/plugin.rs b/server/src/plugin.rs index 2f25bf55..82999535 100644 --- a/server/src/plugin.rs +++ b/server/src/plugin.rs @@ -9,13 +9,6 @@ pub enum TransformFileResult { // TODO: Error case } -pub enum RbxChangeResult { - Write(Option), - Pass, - - // TODO: Error case -} - pub enum FileChangeResult { MarkChanged(Option>), Pass, @@ -26,10 +19,6 @@ pub trait Plugin { /// into a Roblox instance. fn transform_file(&self, plugins: &PluginChain, vfs_item: &VfsItem) -> TransformFileResult; - /// Invoked when a Roblox Instance change is reported by the Roblox Studio - /// plugin and needs to be turned into a file to save. - fn handle_rbx_change(&self, route: &Route, rbx_item: &RbxInstance) -> RbxChangeResult; - /// Invoked when a file changes on the filesystem. The result defines what /// routes are marked as needing to be refreshed. fn handle_file_change(&self, route: &Route) -> FileChangeResult; @@ -58,17 +47,6 @@ impl PluginChain { None } - pub fn handle_rbx_change(&self, route: &Route, rbx_item: &RbxInstance) -> Option { - for plugin in &self.plugins { - match plugin.handle_rbx_change(route, rbx_item) { - RbxChangeResult::Write(vfs_item) => return vfs_item, - RbxChangeResult::Pass => {}, - } - } - - None - } - pub fn handle_file_change(&self, route: &Route) -> Option> { for plugin in &self.plugins { match plugin.handle_file_change(route) { diff --git a/server/src/plugins/default_plugin.rs b/server/src/plugins/default_plugin.rs index 56d2a2eb..6d2866d3 100644 --- a/server/src/plugins/default_plugin.rs +++ b/server/src/plugins/default_plugin.rs @@ -1,7 +1,7 @@ use std::collections::HashMap; use core::Route; -use plugin::{Plugin, PluginChain, TransformFileResult, RbxChangeResult, FileChangeResult}; +use plugin::{Plugin, PluginChain, TransformFileResult, FileChangeResult}; use rbx::{RbxInstance, RbxValue}; use vfs::VfsItem; @@ -60,8 +60,4 @@ impl Plugin for DefaultPlugin { fn handle_file_change(&self, route: &Route) -> FileChangeResult { FileChangeResult::MarkChanged(Some(vec![route.clone()])) } - - fn handle_rbx_change(&self, _route: &Route, _rbx_item: &RbxInstance) -> RbxChangeResult { - RbxChangeResult::Pass - } } diff --git a/server/src/plugins/json_model_plugin.rs b/server/src/plugins/json_model_plugin.rs index 0a5a8da9..2deee6ea 100644 --- a/server/src/plugins/json_model_plugin.rs +++ b/server/src/plugins/json_model_plugin.rs @@ -2,7 +2,7 @@ use regex::Regex; use serde_json; use core::Route; -use plugin::{Plugin, PluginChain, TransformFileResult, RbxChangeResult, FileChangeResult}; +use plugin::{Plugin, PluginChain, TransformFileResult, FileChangeResult}; use rbx::RbxInstance; use vfs::VfsItem; @@ -48,8 +48,4 @@ impl Plugin for JsonModelPlugin { fn handle_file_change(&self, _route: &Route) -> FileChangeResult { FileChangeResult::Pass } - - fn handle_rbx_change(&self, _route: &Route, _rbx_item: &RbxInstance) -> RbxChangeResult { - RbxChangeResult::Pass - } } diff --git a/server/src/plugins/script_plugin.rs b/server/src/plugins/script_plugin.rs index dabe8d5c..feb5198d 100644 --- a/server/src/plugins/script_plugin.rs +++ b/server/src/plugins/script_plugin.rs @@ -3,7 +3,7 @@ use std::collections::HashMap; use regex::Regex; use core::Route; -use plugin::{Plugin, PluginChain, TransformFileResult, RbxChangeResult, FileChangeResult}; +use plugin::{Plugin, PluginChain, TransformFileResult, FileChangeResult}; use rbx::{RbxInstance, RbxValue}; use vfs::VfsItem; @@ -117,8 +117,4 @@ impl Plugin for ScriptPlugin { FileChangeResult::Pass } } - - fn handle_rbx_change(&self, _route: &Route, _rbx_item: &RbxInstance) -> RbxChangeResult { - RbxChangeResult::Pass - } }