Fix some clippy warnings

This commit can be replicated with
`cargo clippy --fix -Z unstable-options && cargo +nightly-2021-02-10 fmt`.
This commit is contained in:
Joshua Nelson
2021-02-16 23:33:20 -05:00
committed by Caleb Cartwright
parent 432e09e89f
commit c3a5111106
4 changed files with 5 additions and 9 deletions
+4 -4
View File
@@ -1,5 +1,5 @@
use anyhow::{format_err, Result};
use env_logger;
use io::Error as IoError;
use thiserror::Error;
@@ -233,7 +233,7 @@ fn execute(opts: &Options) -> Result<i32> {
let file = PathBuf::from(path);
let file = file.canonicalize().unwrap_or(file);
let (config, _) = load_config(Some(file.parent().unwrap()), Some(options.clone()))?;
let (config, _) = load_config(Some(file.parent().unwrap()), Some(options))?;
let toml = config.all_options().to_toml()?;
io::stdout().write_all(toml.as_bytes())?;
@@ -565,7 +565,7 @@ pub fn from_matches(matches: &Matches) -> Result<GetOptsOptions> {
options.inline_config = matches
.opt_strs("config")
.iter()
.flat_map(|config| config.split(","))
.flat_map(|config| config.split(','))
.map(
|key_val| match key_val.char_indices().find(|(_, ch)| *ch == '=') {
Some((middle, _)) => {
@@ -681,7 +681,7 @@ fn apply_to(self, config: &mut Config) {
}
fn config_path(&self) -> Option<&Path> {
self.config_path.as_ref().map(|p| &**p)
self.config_path.as_deref()
}
}
-2
View File
@@ -2,8 +2,6 @@
#![deny(warnings)]
use cargo_metadata;
use std::cmp::Ordering;
use std::collections::{BTreeMap, BTreeSet};
use std::env;
+1 -2
View File
@@ -4,10 +4,9 @@
#![deny(warnings)]
use env_logger;
#[macro_use]
extern crate log;
use regex;
use serde::{Deserialize, Serialize};
use serde_json as json;
use thiserror::Error;
-1
View File
@@ -7,7 +7,6 @@
use std::process::Command;
use std::str::FromStr;
use env_logger;
use getopts::{Matches, Options};
use rustfmt_nightly as rustfmt;