diff --git a/src/lib.rs b/src/lib.rs index 9d9de6d..b2a75a1 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -3,9 +3,9 @@ //! //! It does not do anything more than that, which makes it so fast. -use std::io::{BufReader, BufWriter, Write}; -use utf8_chars::BufReadCharsExt; use std::error::Error; +use std::io::{BufReader, BufWriter, Read, Write}; +use utf8_chars::BufReadCharsExt; /// /// Set the indentation used for the formatting. @@ -42,11 +42,15 @@ pub fn format_json(json: &str, indentation: Indentation) -> String { /// The default value is two spaces /// The default indentation is faster than a custom one /// -pub fn format_json_buffered(reader: &mut BufReader, writer: &mut BufWriter, indentation: Indentation) -> Result<(), Box> +pub fn format_json_buffered( + reader: &mut BufReader, + writer: &mut BufWriter, + indentation: Indentation, +) -> Result<(), Box> where - R: std::io::Read, - W: std::io::Write { - + R: Read, + W: Write, +{ let mut escaped = false; let mut in_string = false; let mut indent_level = 0usize; @@ -124,9 +128,14 @@ where Ok(()) } -fn indent_buffered(writer: &mut BufWriter, level: usize, indent_str: Indentation) -> Result<(), Box> +fn indent_buffered( + writer: &mut BufWriter, + level: usize, + indent_str: Indentation, +) -> Result<(), Box> where - W: std::io::Write { + W: std::io::Write, +{ for _ in 0..level { match indent_str { Indentation::Default => { diff --git a/src/main.rs b/src/main.rs index 16ce1b5..788f17c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,5 +1,5 @@ use clap::clap_app; -use jsonformat::{Indentation, format_json_buffered}; +use jsonformat::{format_json_buffered, Indentation}; use std::error::Error; use std::fs::File; use std::io::{BufReader, BufWriter, Read, Write}; @@ -17,13 +17,8 @@ fn main() -> Result<(), Box> { .get_matches(); let reader: Box = match matches.value_of("input") { - Some(path) => { - let f = File::open(path)?; - Box::new(BufReader::new(f)) - }, - None => { - Box::new(std::io::stdin()) - } + Some(path) => Box::new(File::open(path)?), + None => Box::new(std::io::stdin()), }; let replaced_indent = matches.value_of("indentation").map(|value| { @@ -55,10 +50,8 @@ fn main() -> Result<(), Box> { output = windows_output_default_file.as_deref().or(output); - let writer : Box = match output { - Some(file) => { - Box::new(File::create(file)?) - } + let writer: Box = match output { + Some(file) => Box::new(File::create(file)?), None => Box::new(std::io::stdout()), };