From 93ab4e7842ac3c3a37e8d423ae57ef3e7d151b7b Mon Sep 17 00:00:00 2001 From: Jakub Panek Date: Thu, 28 Apr 2022 17:53:59 +0000 Subject: ignore JetBrains IDEs, tidy-up imports (#348) * ignore JB IDEs * tidy-up imports * add rustfmt config --- atuin-client/src/import/fish.rs | 3 +-- atuin-client/src/import/mod.rs | 6 ++++-- atuin-client/src/import/resh.rs | 3 ++- atuin-client/src/import/zsh.rs | 3 +-- 4 files changed, 8 insertions(+), 7 deletions(-) (limited to 'atuin-client/src/import') diff --git a/atuin-client/src/import/fish.rs b/atuin-client/src/import/fish.rs index 70639264..7c05d180 100644 --- a/atuin-client/src/import/fish.rs +++ b/atuin-client/src/import/fish.rs @@ -7,8 +7,7 @@ use std::{ path::{Path, PathBuf}, }; -use chrono::prelude::*; -use chrono::Utc; +use chrono::{prelude::*, Utc}; use directories::BaseDirs; use eyre::{eyre, Result}; diff --git a/atuin-client/src/import/mod.rs b/atuin-client/src/import/mod.rs index 471b7f98..8d4aa17f 100644 --- a/atuin-client/src/import/mod.rs +++ b/atuin-client/src/import/mod.rs @@ -1,5 +1,7 @@ -use std::io::{BufRead, BufReader, Read, Seek, SeekFrom}; -use std::path::{Path, PathBuf}; +use std::{ + io::{BufRead, BufReader, Read, Seek, SeekFrom}, + path::{Path, PathBuf}, +}; use eyre::Result; diff --git a/atuin-client/src/import/resh.rs b/atuin-client/src/import/resh.rs index cd5dccf7..3eea84d7 100644 --- a/atuin-client/src/import/resh.rs +++ b/atuin-client/src/import/resh.rs @@ -4,12 +4,13 @@ use std::{ path::{Path, PathBuf}, }; -use atuin_common::utils::uuid_v4; use chrono::{TimeZone, Utc}; use directories::UserDirs; use eyre::{eyre, Result}; use serde::Deserialize; +use atuin_common::utils::uuid_v4; + use super::{count_lines, Importer}; use crate::history::History; diff --git a/atuin-client/src/import/zsh.rs b/atuin-client/src/import/zsh.rs index b3db36b6..915b3115 100644 --- a/atuin-client/src/import/zsh.rs +++ b/atuin-client/src/import/zsh.rs @@ -7,8 +7,7 @@ use std::{ path::{Path, PathBuf}, }; -use chrono::prelude::*; -use chrono::Utc; +use chrono::{prelude::*, Utc}; use directories::UserDirs; use eyre::{eyre, Result}; use itertools::Itertools; -- cgit v1.3.1