diff --git a/src/import.rs b/src/import.rs index 6af1e5e..de23adc 100644 --- a/src/import.rs +++ b/src/import.rs @@ -1,3 +1,10 @@ +pub(crate) use crate::import::atuin::Atuin; +pub(crate) use crate::import::autojump::Autojump; +pub(crate) use crate::import::fasd::Fasd; +pub(crate) use crate::import::z::Z; +pub(crate) use crate::import::z_lua::ZLua; +pub(crate) use crate::import::zsh_z::ZshZ; + mod atuin; mod autojump; mod fasd; @@ -5,13 +12,6 @@ mod z; mod z_lua; mod zsh_z; -pub(crate) use atuin::Atuin; -pub(crate) use autojump::Autojump; -pub(crate) use fasd::Fasd; -pub(crate) use z::Z; -pub(crate) use z_lua::ZLua; -pub(crate) use zsh_z::ZshZ; - use std::io::{self, Write}; use std::path::PathBuf; diff --git a/src/import/autojump.rs b/src/import/autojump.rs index 15e277a..f269e1f 100644 --- a/src/import/autojump.rs +++ b/src/import/autojump.rs @@ -1,9 +1,8 @@ use std::borrow::Cow; -use std::env; use std::fs::File; use std::io::{BufRead, BufReader}; use std::path::PathBuf; -use std::str; +use std::{env, str}; use anyhow::{Context, Result, anyhow}; diff --git a/src/import/fasd.rs b/src/import/fasd.rs index ec2d060..ab0788d 100644 --- a/src/import/fasd.rs +++ b/src/import/fasd.rs @@ -16,7 +16,8 @@ impl Importer for Fasd { let path = data_path()?; let file = File::open(&path).with_context(|| format!("could not read {path:?}"))?; let reader = BufReader::new(file); - // fasd uses the same `path|rank|last_accessed` line format as z, so reuse z's iterator. + // fasd uses the same `path|rank|last_accessed` line format as z, so reuse z's + // iterator. Ok(z::Iter::new(reader, path)) } } diff --git a/src/import/z.rs b/src/import/z.rs index 1d67708..511980c 100644 --- a/src/import/z.rs +++ b/src/import/z.rs @@ -1,9 +1,8 @@ use std::borrow::Cow; -use std::env; use std::fs::File; use std::io::{BufRead, BufReader}; use std::path::PathBuf; -use std::str; +use std::{env, str}; use anyhow::{Context, Result, anyhow};