Make Clippy happy

This commit is contained in:
Roey Darwish Dror
2019-04-14 11:35:18 +03:00
parent 5ae2d0d473
commit 2872081754
4 changed files with 5 additions and 3 deletions

2
Cargo.lock generated
View File

@@ -1,3 +1,5 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
[[package]] [[package]]
name = "MacTypes-sys" name = "MacTypes-sys"
version = "2.1.0" version = "2.1.0"

View File

@@ -28,7 +28,7 @@ pub fn self_update() -> Result<(), Error> {
.no_confirm(true) .no_confirm(true)
.build() .build()
}) })
.and_then(|u| u.update_extended()) .and_then(Update::update_extended)
.context(ErrorKind::SelfUpdate)?; .context(ErrorKind::SelfUpdate)?;
if let GitHubUpdateStatus::Updated(release) = &result { if let GitHubUpdateStatus::Updated(release) = &result {

View File

@@ -100,7 +100,7 @@ pub fn run_composer_update(base_dirs: &BaseDirs, run_type: RunType) -> Result<()
.check_output() .check_output()
.map_err(|_| Error::from(ErrorKind::SkipStep)) .map_err(|_| Error::from(ErrorKind::SkipStep))
.map(PathBuf::from) .map(PathBuf::from)
.and_then(|p| p.require())?; .and_then(PathExt::require)?;
if !composer_home.is_descendant_of(base_dirs.home_dir()) { if !composer_home.is_descendant_of(base_dirs.home_dir()) {
Err(ErrorKind::SkipStep)?; Err(ErrorKind::SkipStep)?;

View File

@@ -96,7 +96,7 @@ impl Distribution {
pub fn show_pacnew() { pub fn show_pacnew() {
let mut iter = WalkDir::new("/etc") let mut iter = WalkDir::new("/etc")
.into_iter() .into_iter()
.filter_map(|e| e.ok()) .filter_map(Result::ok)
.filter(|f| { .filter(|f| {
f.path() f.path()
.extension() .extension()