diff --git a/src/application.rs b/src/application.rs index af5a3f5..77f3e46 100644 --- a/src/application.rs +++ b/src/application.rs @@ -15,9 +15,7 @@ impl App { .base_image .get() .map_err(|e| Error::not_found("Base image not found", e)) - .and_then(|buf| { - Canvas::read_from_buffer(&buf).map_err(Error::bad_image) - })?; + .and_then(|buf| Canvas::read_from_buffer(&buf).map_err(Error::bad_image))?; for annotation in &options.annotations { canvas.add_annotation(annotation, &font, options.scale_mult); @@ -35,9 +33,8 @@ fn build_font(path: &Path) -> Result { let data = File::open(path) .map(BufReader::new) .map_err(|e| Error::not_found("Font not found", e))?; - - artano::load_typeface(data) - .map_err(|e| Error::io("Unable to read font", e)) + + artano::load_typeface(data).map_err(|e| Error::io("Unable to read font", e)) } fn save_pixels>(path: P, canvas: &Canvas, format: OutputFormat) -> Result<()> { diff --git a/src/config/options.rs b/src/config/options.rs index d2a8c2a..5cc95b8 100644 --- a/src/config/options.rs +++ b/src/config/options.rs @@ -73,9 +73,10 @@ impl OptionsBuilder { } let output_format = self.output_format; - let output_path = self.output_path.map(|s| s.into()).unwrap_or_else(|| { - create_output_file_path(&input_path, output_format) - }); + let output_path = self + .output_path + .map(|s| s.into()) + .unwrap_or_else(|| create_output_file_path(&input_path, output_format)); let annotations = if self.annotations.is_empty() { return Err(BuildOptionsError { @@ -138,8 +139,7 @@ fn read_command() -> Result { let encoding_group = ArgGroup::with_name("enc_group").args(&["jpg", "png"]); - let app = - clap_app!(annatar => + let app = clap_app!(annatar => (version: crate_version!()) (author: crate_authors!()) (about: crate_description!()) @@ -167,13 +167,13 @@ fn read_command() -> Result { options.output_path = matches.value_of("output").map(|s| s.to_string()); if let Some(scale_multiplier) = matches.value_of("scale") { - let multiplier = scale_multiplier.parse::().map_err(|e| { - BuildOptionsError { + let multiplier = scale_multiplier + .parse::() + .map_err(|e| BuildOptionsError { kind: BuildOptionsErrorKind::ScalingMultiplier, description: Cow::from("Scaling multiplier must be a decimal value"), cause: Some(Box::new(e)), - } - })?; + })?; options.scale_mult = multiplier; }