From 14b8592c38cf5c5807f897d03c129b852533e6b6 Mon Sep 17 00:00:00 2001 From: Takayuki Maeda Date: Sat, 9 Oct 2021 14:25:45 +0900 Subject: [PATCH] use serialize only in tests --- src/app.rs | 1 + src/components/databases.rs | 2 +- src/config.rs | 10 +++++++--- src/event/key.rs | 8 ++++++-- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/app.rs b/src/app.rs index 7fcc0e1..abfc7b1 100644 --- a/src/app.rs +++ b/src/app.rs @@ -129,6 +129,7 @@ impl App { self.databases.commands(&mut res); self.record_table.commands(&mut res); + self.properties.commands(&mut res); res } diff --git a/src/components/databases.rs b/src/components/databases.rs index 699e43d..e4af306 100644 --- a/src/components/databases.rs +++ b/src/components/databases.rs @@ -9,7 +9,7 @@ use crate::event::Key; use crate::ui::common_nav; use crate::ui::scrolllist::draw_list_block; use anyhow::Result; -use database_tree::{Database, DatabaseTree, DatabaseTreeItem, Table}; +use database_tree::{Database, DatabaseTree, DatabaseTreeItem}; use std::collections::BTreeSet; use std::convert::From; use tui::{ diff --git a/src/config.rs b/src/config.rs index e84db16..a7f116a 100644 --- a/src/config.rs +++ b/src/config.rs @@ -1,12 +1,15 @@ use crate::log::LogLevel; use crate::Key; -use serde::{Deserialize, Serialize}; +use serde::Deserialize; use std::fmt; use std::fs::File; use std::io::{BufReader, Read}; use std::path::{Path, PathBuf}; use structopt::StructOpt; +#[cfg(test)] +use serde::Serialize; + #[derive(StructOpt, Debug)] pub struct CliConfig { /// Set the config file @@ -23,7 +26,7 @@ pub struct Config { pub log_level: LogLevel, } -#[derive(Debug, Serialize, Deserialize, Clone)] +#[derive(Debug, Deserialize, Clone)] enum DatabaseType { #[serde(rename = "mysql")] MySql, @@ -72,7 +75,8 @@ pub struct Connection { pub database: Option, } -#[derive(Debug, Serialize, Deserialize, Clone)] +#[derive(Debug, Deserialize, Clone)] +#[cfg_attr(test, derive(Serialize))] pub struct KeyConfig { pub scroll_up: Key, pub scroll_down: Key, diff --git a/src/event/key.rs b/src/event/key.rs index 26c8f57..0f92fb3 100644 --- a/src/event/key.rs +++ b/src/event/key.rs @@ -1,9 +1,13 @@ use crossterm::event; -use serde::{Deserialize, Serialize}; +use serde::Deserialize; use std::fmt; +#[cfg(test)] +use serde::Serialize; + /// Represents a key. -#[derive(PartialEq, Eq, Clone, Copy, Hash, Debug, Serialize, Deserialize)] +#[derive(PartialEq, Eq, Clone, Copy, Hash, Debug, Deserialize)] +#[cfg_attr(test, derive(Serialize))] pub enum Key { /// Both Enter (or Return) and numpad Enter Enter,