refactor (#327)

atuin-client/src/encryption.rs

@@ -9,6 +9,7 @@
 // to decrypt
 
 use fs_err as fs;
+use serde::{Deserialize, Serialize};
 use std::io::prelude::*;
 use std::path::PathBuf;
 

atuin-client/src/history.rs

@@ -3,6 +3,7 @@ use std::env;
 use chrono::Utc;
 
 use atuin_common::utils::uuid_v4;
+use serde::{Deserialize, Serialize};
 
 // Any new fields MUST be Optional<>!
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, sqlx::FromRow)]

atuin-client/src/import/resh.rs

@@ -8,6 +8,7 @@ use atuin_common::utils::uuid_v4;
 use chrono::{TimeZone, Utc};
 use directories::UserDirs;
 use eyre::{eyre, Result};
+use serde::Deserialize;
 
 use super::{count_lines, Importer};
 use crate::history::History;

atuin-client/src/lib.rs

@@ -3,9 +3,6 @@
 #[macro_use]
 extern crate log;
 
-#[macro_use]
-extern crate serde_derive;
-
 pub mod api_client;
 pub mod database;
 pub mod encryption;

atuin-client/src/settings.rs

@@ -1,4 +1,5 @@
 use fs_err::{create_dir_all, File};
+use serde::Deserialize;
 use std::io::prelude::*;
 use std::path::{Path, PathBuf};