aboutsummaryrefslogtreecommitdiffstats
path: root/atuin-client/src/import
diff options
context:
space:
mode:
authorJakub Panek <me@panekj.dev>2022-04-28 17:53:59 +0000
committerGitHub <noreply@github.com>2022-04-28 18:53:59 +0100
commit93ab4e7842ac3c3a37e8d423ae57ef3e7d151b7b (patch)
treec910b1bb047a540c361f6cb6f8e403f1b83b925a /atuin-client/src/import
parentBump axum from 0.5.3 to 0.5.4 (#355) (diff)
downloadatuin-93ab4e7842ac3c3a37e8d423ae57ef3e7d151b7b.zip
ignore JetBrains IDEs, tidy-up imports (#348)
* ignore JB IDEs * tidy-up imports * add rustfmt config
Diffstat (limited to 'atuin-client/src/import')
-rw-r--r--atuin-client/src/import/fish.rs3
-rw-r--r--atuin-client/src/import/mod.rs6
-rw-r--r--atuin-client/src/import/resh.rs3
-rw-r--r--atuin-client/src/import/zsh.rs3
4 files changed, 8 insertions, 7 deletions
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;