From 02c70deecba955c1b01f661ed7a709038e90addc Mon Sep 17 00:00:00 2001
From: Conrad Ludgate <conrad.ludgate@truelayer.com>
Date: Fri, 22 Apr 2022 19:24:38 +0100
Subject: refactor (#327)

---
 atuin-client/Cargo.toml         | 3 +--
 atuin-client/src/encryption.rs  | 1 +
 atuin-client/src/history.rs     | 1 +
 atuin-client/src/import/resh.rs | 1 +
 atuin-client/src/lib.rs         | 3 ---
 atuin-client/src/settings.rs    | 1 +
 6 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'atuin-client')

diff --git a/atuin-client/Cargo.toml b/atuin-client/Cargo.toml
index 923fe1b6..49ff933e 100644
--- a/atuin-client/Cargo.toml
+++ b/atuin-client/Cargo.toml
@@ -21,8 +21,7 @@ uuid = { version = "0.8", features = ["v4"] }
 whoami = "1.1.2"
 chrono-english = "0.1.4"
 config = "0.13"
-serde_derive = "1.0.125"
-serde = "1.0.126"
+serde = { version = "1.0.126", features = ["derive"] }
 serde_json = "1.0.75"
 rmp-serde = "1.0.0"
 sodiumoxide = "0.2.6"
diff --git a/atuin-client/src/encryption.rs b/atuin-client/src/encryption.rs
index 9b6f8a78..4746c23e 100644
--- a/atuin-client/src/encryption.rs
+++ b/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;
 
diff --git a/atuin-client/src/history.rs b/atuin-client/src/history.rs
index 111e463a..6610b988 100644
--- a/atuin-client/src/history.rs
+++ b/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)]
diff --git a/atuin-client/src/import/resh.rs b/atuin-client/src/import/resh.rs
index c55220ca..cd5dccf7 100644
--- a/atuin-client/src/import/resh.rs
+++ b/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;
diff --git a/atuin-client/src/lib.rs b/atuin-client/src/lib.rs
index fa01c17e..98e2f3ae 100644
--- a/atuin-client/src/lib.rs
+++ b/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;
diff --git a/atuin-client/src/settings.rs b/atuin-client/src/settings.rs
index 537b1ca3..ee3376a9 100644
--- a/atuin-client/src/settings.rs
+++ b/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};
 
-- 
cgit v1.3.1