From fbed2862fda127b747718e4ae6f5f36a56f29a51 Mon Sep 17 00:00:00 2001 From: Dieter Eickstaedt Date: Sat, 23 Sep 2023 10:56:55 +0200 Subject: refactor: Duplications reduced in order to align implementations of reading history files (#1247) --- atuin-client/src/import/bash.rs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'atuin-client/src/import/bash.rs') diff --git a/atuin-client/src/import/bash.rs b/atuin-client/src/import/bash.rs index fe080a55..ade1f751 100644 --- a/atuin-client/src/import/bash.rs +++ b/atuin-client/src/import/bash.rs @@ -1,4 +1,4 @@ -use std::{fs::File, io::Read, path::PathBuf, str}; +use std::{path::PathBuf, str}; use async_trait::async_trait; use directories::UserDirs; @@ -8,6 +8,7 @@ use time::{Duration, OffsetDateTime}; use super::{get_histpath, unix_byte_lines, Importer, Loader}; use crate::history::History; +use crate::import::read_to_end; #[derive(Debug)] pub struct Bash { @@ -26,10 +27,7 @@ impl Importer for Bash { const NAME: &'static str = "bash"; async fn new() -> Result { - let mut bytes = Vec::new(); - let path = get_histpath(default_histpath)?; - let mut f = File::open(path)?; - f.read_to_end(&mut bytes)?; + let bytes = read_to_end(get_histpath(default_histpath)?)?; Ok(Self { bytes }) } -- cgit v1.3.1