From c748642f3b801aa5ff4044ab60b0d0c29037a802 Mon Sep 17 00:00:00 2001 From: Daniel Date: Sat, 4 Apr 2020 14:13:59 +0200 Subject: make pipeline working --- src/output/mod.rs | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'src/output/mod.rs') diff --git a/src/output/mod.rs b/src/output/mod.rs index dfb3ea8..73af5ab 100644 --- a/src/output/mod.rs +++ b/src/output/mod.rs @@ -1,4 +1,3 @@ -use super::errors::RuntimeError; use super::{FightOutcome, LogResult, Opt}; use std::io; @@ -7,20 +6,17 @@ pub mod formats; pub mod aggregators; pub mod pipeline; -use self::formats::Format; -use self::aggregators::Aggregator; pub use self::pipeline::Pipeline; /// Build an pipeline for the given command line options. pub fn build_pipeline(opt: &Opt) -> Pipeline { let stream = io::stdout(); + let aggregator = aggregators::WriteThrough; - let formatter: Box = if opt.file_name_only { - Box::new(formats::FileOnly) + if opt.file_name_only { + Pipeline::new(stream, formats::FileOnly, aggregator) } else { - Box::new(formats::HumanReadable) - }; - - Pipeline::new(stream, formatter, aggregators::WriteThrough) + Pipeline::new(stream, formats::HumanReadable, aggregator) + } } -- cgit v1.2.3