From 9d3638fa46b97a438067348c556ebff399e67d51 Mon Sep 17 00:00:00 2001 From: Lucien Greathouse Date: Tue, 15 Jan 2019 12:44:49 -0800 Subject: [PATCH] Remove remaining 'extern crate' declarations --- server/src/imfs.rs | 2 ++ server/src/lib.rs | 6 ------ server/src/path_map.rs | 1 + server/src/project.rs | 3 ++- server/src/rbx_session.rs | 1 + server/src/rbx_snapshot.rs | 1 + server/src/web.rs | 1 + 7 files changed, 8 insertions(+), 7 deletions(-) diff --git a/server/src/imfs.rs b/server/src/imfs.rs index 21f6be1e..08fe7157 100644 --- a/server/src/imfs.rs +++ b/server/src/imfs.rs @@ -5,6 +5,8 @@ use std::{ io, }; +use serde_derive::{Serialize, Deserialize}; + use crate::project::{Project, ProjectNode}; fn add_sync_points(imfs: &mut Imfs, project_node: &ProjectNode) -> io::Result<()> { diff --git a/server/src/lib.rs b/server/src/lib.rs index 7fa923cf..fb87682f 100644 --- a/server/src/lib.rs +++ b/server/src/lib.rs @@ -1,9 +1,3 @@ -#[macro_use] -extern crate serde_derive; - -#[cfg(test)] -extern crate tempfile; - pub mod commands; pub mod fs_watcher; pub mod imfs; diff --git a/server/src/path_map.rs b/server/src/path_map.rs index f205d9f4..cc9265c4 100644 --- a/server/src/path_map.rs +++ b/server/src/path_map.rs @@ -3,6 +3,7 @@ use std::{ collections::{HashMap, HashSet}, }; +use serde_derive::Serialize; use log::warn; #[derive(Debug, Serialize)] diff --git a/server/src/project.rs b/server/src/project.rs index 95b71402..e6c1509c 100644 --- a/server/src/project.rs +++ b/server/src/project.rs @@ -6,9 +6,10 @@ use std::{ path::{Path, PathBuf}, }; -use maplit::hashmap; use failure::Fail; +use maplit::hashmap; use rbx_tree::RbxValue; +use serde_derive::{Serialize, Deserialize}; pub static PROJECT_FILENAME: &'static str = "roblox-project.json"; diff --git a/server/src/rbx_session.rs b/server/src/rbx_session.rs index 89c71173..23738af1 100644 --- a/server/src/rbx_session.rs +++ b/server/src/rbx_session.rs @@ -7,6 +7,7 @@ use std::{ sync::{Arc, Mutex}, }; +use serde_derive::{Serialize, Deserialize}; use log::{info, trace}; use failure::Fail; use rbx_tree::{RbxTree, RbxInstanceProperties, RbxValue, RbxId}; diff --git a/server/src/rbx_snapshot.rs b/server/src/rbx_snapshot.rs index 6d8387b1..64c702c3 100644 --- a/server/src/rbx_snapshot.rs +++ b/server/src/rbx_snapshot.rs @@ -7,6 +7,7 @@ use std::{ }; use rbx_tree::{RbxTree, RbxId, RbxInstanceProperties, RbxValue}; +use serde_derive::{Serialize, Deserialize}; use crate::{ path_map::PathMap, diff --git a/server/src/web.rs b/server/src/web.rs index 4686950a..ee681269 100644 --- a/server/src/web.rs +++ b/server/src/web.rs @@ -4,6 +4,7 @@ use std::{ sync::{mpsc, Arc}, }; +use serde_derive::{Serialize, Deserialize}; use log::trace; use rouille::{ self,