diff --git a/Cargo.lock b/Cargo.lock index b3927352..27677484 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,3 +1,5 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. [[package]] name = "MacTypes-sys" version = "2.1.0" diff --git a/src/self_update.rs b/src/self_update.rs index eb7725ef..5a780108 100644 --- a/src/self_update.rs +++ b/src/self_update.rs @@ -28,7 +28,7 @@ pub fn self_update() -> Result<(), Error> { .no_confirm(true) .build() }) - .and_then(|u| u.update_extended()) + .and_then(Update::update_extended) .context(ErrorKind::SelfUpdate)?; if let GitHubUpdateStatus::Updated(release) = &result { diff --git a/src/steps/generic.rs b/src/steps/generic.rs index 10cf036e..168ee5da 100644 --- a/src/steps/generic.rs +++ b/src/steps/generic.rs @@ -100,7 +100,7 @@ pub fn run_composer_update(base_dirs: &BaseDirs, run_type: RunType) -> Result<() .check_output() .map_err(|_| Error::from(ErrorKind::SkipStep)) .map(PathBuf::from) - .and_then(|p| p.require())?; + .and_then(PathExt::require)?; if !composer_home.is_descendant_of(base_dirs.home_dir()) { Err(ErrorKind::SkipStep)?; diff --git a/src/steps/os/linux.rs b/src/steps/os/linux.rs index 2fa551c8..da01f350 100644 --- a/src/steps/os/linux.rs +++ b/src/steps/os/linux.rs @@ -96,7 +96,7 @@ impl Distribution { pub fn show_pacnew() { let mut iter = WalkDir::new("/etc") .into_iter() - .filter_map(|e| e.ok()) + .filter_map(Result::ok) .filter(|f| { f.path() .extension()