|
@@ -344,7 +344,7 @@ impl TerminalColours {
|
|
|
|
|
|
|
|
/// Determine which terminal colour conditions to use.
|
|
/// Determine which terminal colour conditions to use.
|
|
|
fn deduce(matches: &getopts::Matches) -> Result<TerminalColours, Misfire> {
|
|
fn deduce(matches: &getopts::Matches) -> Result<TerminalColours, Misfire> {
|
|
|
- if let Some(word) = matches.opt_str("color").or(matches.opt_str("colour")) {
|
|
|
|
|
|
|
+ if let Some(word) = matches.opt_str("color").or_else(|| matches.opt_str("colour")) {
|
|
|
match &*word {
|
|
match &*word {
|
|
|
"always" => Ok(TerminalColours::Always),
|
|
"always" => Ok(TerminalColours::Always),
|
|
|
"auto" | "automatic" => Ok(TerminalColours::Automatic),
|
|
"auto" | "automatic" => Ok(TerminalColours::Automatic),
|