diff --git a/src/bin/tectonic.rs b/src/bin/tectonic.rs index 28610e6728..89e3c8c250 100644 --- a/src/bin/tectonic.rs +++ b/src/bin/tectonic.rs @@ -233,7 +233,8 @@ fn main() { // something I'd be relatively OK with since it'd only affect the progam // UI, not the processing results). - let mut status = TermcolorStatusBackend::new(ChatterLevel::from_str(&args.chatter_level).unwrap()); + let mut status = + TermcolorStatusBackend::new(ChatterLevel::from_str(&args.chatter_level).unwrap()); // For now ... diff --git a/src/driver.rs b/src/driver.rs index c52817d12c..302c5e95ac 100644 --- a/src/driver.rs +++ b/src/driver.rs @@ -22,11 +22,11 @@ use std::str::FromStr; use crate::digest::DigestData; use crate::engines::IoEventBackend; use crate::errors::{ErrorKind, Result, ResultExt}; -use std::result::Result as StdResult; use crate::io::{Bundle, InputOrigin, IoProvider, IoSetup, IoSetupBuilder, OpenResult}; use crate::status::StatusBackend; use crate::{ctry, errmsg, tt_error, tt_note, tt_warning}; use crate::{BibtexEngine, Spx2HtmlEngine, TexEngine, TexResult, XdvipdfmxEngine}; +use std::result::Result as StdResult; /// Different patterns with which files may have been accessed by the /// underlying engines. Once a file is marked as ReadThenWritten or @@ -222,7 +222,7 @@ impl FromStr for OutputFormat { "xdv" => OutputFormat::Xdv, "pdf" => OutputFormat::Pdf, "fmt" => OutputFormat::Format, - _ => unreachable!() + _ => unreachable!(), }; Ok(actual) @@ -254,16 +254,14 @@ impl Default for PassSetting { } impl FromStr for PassSetting { - type Err = &'static str; fn from_str(a_str: &str) -> StdResult { - let actual = match a_str { "default" => PassSetting::Default, "bibtex_first" => PassSetting::BibtexFirst, "tex" => PassSetting::Tex, - _ => unreachable!() + _ => unreachable!(), }; Ok(actual) diff --git a/src/status/mod.rs b/src/status/mod.rs index ef2d7427f3..09f592513a 100644 --- a/src/status/mod.rs +++ b/src/status/mod.rs @@ -8,8 +8,8 @@ pub mod termcolor; use std::cmp; use std::fmt::Arguments; -use std::str::FromStr; use std::result::Result as StdResult; +use std::str::FromStr; use crate::errors::Error; @@ -21,15 +21,13 @@ pub enum ChatterLevel { } impl FromStr for ChatterLevel { - type Err = &'static str; fn from_str(a_str: &str) -> StdResult { - let actual = match a_str { "default" => ChatterLevel::Normal, "minimal" => ChatterLevel::Minimal, - _ => unreachable!() + _ => unreachable!(), }; Ok(actual)