From 3958ebaef210d2cb69ca39c5319a524f5d644c3a Mon Sep 17 00:00:00 2001 From: Lionel Sambuc Date: Wed, 15 Jan 2020 15:50:49 +0100 Subject: [PATCH] Update SerDe usage --- Cargo.toml | 3 +-- src/database/db_core.rs | 3 +++ src/database/mod.rs | 1 + src/database/space/axis.rs | 3 +++ src/database/space/coordinate.rs | 3 +++ src/database/space/coordinate_system.rs | 3 +++ src/database/space/mod.rs | 3 +++ src/database/space/position.rs | 3 +++ src/database/space/shape.rs | 3 +++ src/database/space_db.rs | 3 +++ src/database/space_index.rs | 2 ++ src/lib.rs | 3 --- src/storage/model.rs | 9 +++++++++ 13 files changed, 37 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 32d6aaa..f43f9eb 100644 --- a/Cargo.toml +++ b/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" diff --git a/src/database/db_core.rs b/src/database/db_core.rs index f8654c7..cfeec7d 100644 --- a/src/database/db_core.rs +++ b/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; diff --git a/src/database/mod.rs b/src/database/mod.rs index f412bd8..5403253 100644 --- a/src/database/mod.rs +++ b/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; diff --git a/src/database/space/axis.rs b/src/database/space/axis.rs index 856ca99..904d2c9 100644 --- a/src/database/space/axis.rs +++ b/src/database/space/axis.rs @@ -1,3 +1,6 @@ +use serde::Deserialize; +use serde::Serialize; + use super::coordinate::Coordinate; use super::position::Position; diff --git a/src/database/space/coordinate.rs b/src/database/space/coordinate.rs index d868ad7..a5967b6 100644 --- a/src/database/space/coordinate.rs +++ b/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), diff --git a/src/database/space/coordinate_system.rs b/src/database/space/coordinate_system.rs index 0b4e88b..56a3d8b 100644 --- a/src/database/space/coordinate_system.rs +++ b/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; diff --git a/src/database/space/mod.rs b/src/database/space/mod.rs index b3e44ac..9dbf3a6 100644 --- a/src/database/space/mod.rs +++ b/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; diff --git a/src/database/space/position.rs b/src/database/space/position.rs index e811915..8cd1c71 100644 --- a/src/database/space/position.rs +++ b/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)] diff --git a/src/database/space/shape.rs b/src/database/space/shape.rs index 027a63d..aa003ca 100644 --- a/src/database/space/shape.rs +++ b/src/database/space/shape.rs @@ -1,3 +1,6 @@ +use serde::Deserialize; +use serde::Serialize; + use super::Coordinate; use super::Position; use super::Space; diff --git a/src/database/space_db.rs b/src/database/space_db.rs index 704b119..d038c9e 100644 --- a/src/database/space_db.rs +++ b/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; diff --git a/src/database/space_index.rs b/src/database/space_index.rs index 383c899..acaa9da 100644 --- a/src/database/space_index.rs +++ b/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; diff --git a/src/lib.rs b/src/lib.rs index 8046d0e..1ee97c8 100644 --- a/src/lib.rs +++ b/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; diff --git a/src/storage/model.rs b/src/storage/model.rs index 8920b3c..147998f 100644 --- a/src/storage/model.rs +++ b/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;