Update SerDe usage

Cargo.toml

@@ -39,8 +39,7 @@ arrayref = "^0.3" # For Positions Objects
 lazy_static = "^1.3"
 memmap = "^0.7"
 
-serde = "^1.0"
-serde_derive = "^1.0"
+serde = { version = "^1.0", features = ["derive"] }
 serde_json = "^1.0"
 bincode = "^1.1"
 

src/database/db_core.rs

@@ -1,3 +1,6 @@
+use serde::Deserialize;
+use serde::Serialize;
+
 use super::space::Position;
 use super::space::Shape;
 use super::space::Space;

src/database/mod.rs

@@ -8,6 +8,7 @@ use std::fs::File;
 
 use ironsea_index::Indexed;
 use memmap::Mmap;
+use serde::Serialize;
 
 pub use db_core::Core;
 pub use db_core::CoreQueryParameters;

src/database/space/axis.rs

@@ -1,3 +1,6 @@
+use serde::Deserialize;
+use serde::Serialize;
+
 use super::coordinate::Coordinate;
 use super::position::Position;
 

src/database/space/coordinate.rs

@@ -8,6 +8,9 @@ use std::ops::Add;
 use std::ops::Mul;
 use std::ops::Sub;
 
+use serde::Deserialize;
+use serde::Serialize;
+
 #[derive(Clone, Copy, Debug, Deserialize, Serialize)]
 pub enum Coordinate {
     CoordinateU8(u8),

src/database/space/coordinate_system.rs

@@ -1,3 +1,6 @@
+use serde::Deserialize;
+use serde::Serialize;
+
 use super::axis::Axis;
 use super::coordinate::Coordinate;
 use super::position::Position;

src/database/space/mod.rs

@@ -7,6 +7,9 @@ mod shape;
 #[cfg(test)]
 mod tests;
 
+use serde::Deserialize;
+use serde::Serialize;
+
 pub use axis::Axis;
 pub use axis::Graduation;
 pub use axis::NumberSet;

src/database/space/position.rs

@@ -13,6 +13,9 @@ use std::ops::MulAssign;
 use std::ops::Sub;
 use std::ops::SubAssign;
 
+use serde::Deserialize;
+use serde::Serialize;
+
 use super::coordinate::Coordinate;
 
 #[derive(Clone, Debug, Deserialize, Eq, Hash, Ord, PartialEq, Serialize)]

src/database/space/shape.rs

@@ -1,3 +1,6 @@
+use serde::Deserialize;
+use serde::Serialize;
+
 use super::Coordinate;
 use super::Position;
 use super::Space;

src/database/space_db.rs

@@ -4,6 +4,9 @@ use std::collections::HashMap;
 use std::hash::Hash;
 use std::hash::Hasher;
 
+use serde::Deserialize;
+use serde::Serialize;
+
 use super::space::Position;
 use super::space::Shape;
 use super::space::Space;

src/database/space_index.rs

@@ -1,6 +1,8 @@
 use std::cmp::Ord;
 
 use ironsea_index::IndexedDestructured;
+use serde::Deserialize;
+use serde::Serialize;
 
 use super::space::Coordinate;
 use super::space::Position;

src/lib.rs

@@ -7,9 +7,6 @@ extern crate log;
 #[macro_use]
 extern crate arrayref;
 
-#[macro_use]
-extern crate serde_derive;
-
 mod database;
 pub mod storage;
 

src/storage/model.rs

@@ -1,5 +1,8 @@
 use std::collections::HashMap;
 
+use serde::Deserialize;
+use serde::Serialize;
+
 use crate::database;
 use database::space;
 use database::Core;
@@ -30,6 +33,9 @@ pub struct Graduation {
 pub mod v1 {
     use std::collections::HashMap;
 
+    use serde::Deserialize;
+    use serde::Serialize;
+
     use crate::database;
     use database::space;
 
@@ -91,6 +97,9 @@ pub mod v1 {
 pub mod v2 {
     use std::collections::HashMap;
 
+    use serde::Deserialize;
+    use serde::Serialize;
+
     use crate::database;
     use database::space;