From 3ae736b019b7c8bf749da8bc15d8948faaba1855 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 8 Nov 2020 20:09:16 +0100 Subject: Remove unused imports, sort imports Signed-off-by: Matthias Beyer --- src/log/filesink.rs | 12 +++++------- src/log/item.rs | 3 --- src/log/parser.rs | 10 +++------- 3 files changed, 8 insertions(+), 17 deletions(-) (limited to 'src/log') diff --git a/src/log/filesink.rs b/src/log/filesink.rs index 0784ad1..39de00b 100644 --- a/src/log/filesink.rs +++ b/src/log/filesink.rs @@ -1,17 +1,15 @@ -use std::path::Path; -use std::path::PathBuf; use std::fs::File; use std::fs::OpenOptions; -use std::convert::TryInto; use std::io::Write; +use std::path::Path; +use std::path::PathBuf; -use anyhow::Result; use anyhow::Error; -use anyhow::anyhow; +use anyhow::Result; -use crate::log::LogSink; -use crate::log::LogItem; use crate::job::Job; +use crate::log::LogItem; +use crate::log::LogSink; pub struct FileSink { file: File, diff --git a/src/log/item.rs b/src/log/item.rs index 9130045..58fb466 100644 --- a/src/log/item.rs +++ b/src/log/item.rs @@ -1,7 +1,4 @@ -use std::convert::TryInto; - use anyhow::Result; -use anyhow::Error; #[derive(Debug, PartialEq, Eq, Hash)] pub enum LogItem { diff --git a/src/log/parser.rs b/src/log/parser.rs index 9a604be..ab8f116 100644 --- a/src/log/parser.rs +++ b/src/log/parser.rs @@ -1,20 +1,15 @@ use std::result::Result as RResult; use std::str::FromStr; -use std::char::{decode_utf16, REPLACEMENT_CHARACTER}; -use anyhow::Error; -use anyhow::Result; -use anyhow::anyhow; use futures::AsyncBufReadExt; use futures::Stream; use futures::StreamExt; use futures::TryStreamExt; -use pom::*; use pom::parser::Parser as PomParser; use shiplift::tty::TtyChunk; -use crate::log::util::*; use crate::log::LogItem; +use crate::log::util::*; type IoResult = RResult; @@ -29,7 +24,6 @@ pub fn buffer_stream_to_line_stream(stream: S) -> impl Stream() -> PomParser<'a, u8, LogItem> { use pom::parser::*; - use pom::char_class::hex_digit; let number = one_of(b"0123456789") .repeat(1..) @@ -73,6 +67,8 @@ pub fn parser<'a>() -> PomParser<'a, u8, LogItem> { #[cfg(test)] mod tests { use super::*; + use anyhow::Error; + use anyhow::Result; // Helper function for showing log item in error message in pretty fn prettify_item(e: &LogItem) -> String { -- cgit v1.2.3