Warn on clippy::or_fun_call

Author: djc

Cargo.toml

@@ -165,6 +165,7 @@ unused_qualifications = "warn"
 dbg_macro = "warn"
 manual_let_else = "warn"
 needless_pass_by_ref_mut = "warn"
+or_fun_call = "warn"
 redundant_clone = "warn"
 todo = "warn"
 use_self = "warn"

src/cli/rustup_mode.rs

@@ -1900,7 +1900,7 @@ async fn doc(
         }
         (None, name) => {
             topic = name;
-            let doc_path = doc_page.path().unwrap_or(Path::new("index.html"));
+            let doc_path = doc_page.path().unwrap_or_else(|| Path::new("index.html"));
             (Cow::Borrowed(doc_path), None)
         }
     };

src/cli/self_update.rs

@@ -207,11 +207,10 @@ impl InstallOpts<'_> {
 
         self.default_toolchain = Some(MaybeOfficialToolchainName::try_from(common::question_str(
             "Default toolchain? (stable/beta/nightly/none)",
-            &self
-                .default_toolchain
-                .as_ref()
-                .map(ToString::to_string)
-                .unwrap_or("stable".into()),
+            &match &self.default_toolchain {
+                Some(name) => name.to_string(),
+                None => "stable".to_owned(),
+            },
             process,
         )?)?);
 
@@ -801,10 +800,10 @@ fn current_install_opts(opts: &InstallOpts<'_>, process: &Process) -> String {
             .as_ref()
             .map(TargetTuple::new)
             .unwrap_or_else(|| TargetTuple::from_host_or_build(process)),
-        opts.default_toolchain
-            .as_ref()
-            .map(ToString::to_string)
-            .unwrap_or("stable (default)".into()),
+        match &opts.default_toolchain {
+            Some(name) => name.to_string(),
+            None => "stable (default)".to_owned(),
+        },
         opts.profile,
         if !opts.no_modify_path { "yes" } else { "no" }
     )

src/utils/mod.rs

@@ -402,14 +402,14 @@ fn copy_and_delete(name: &'static str, src: &Path, dest: &Path) -> Result<()> {
     // This uses std::fs::copy() instead of the faster std::fs::rename() to
     // avoid cross-device link errors.
     if src.is_dir() {
-        copy_dir(src, dest).and(remove_dir_all::remove_dir_all(src).with_context(|| {
-            RustupError::RemovingDirectory {
+        copy_dir(src, dest).and_then(|()| {
+            remove_dir_all::remove_dir_all(src).with_context(|| RustupError::RemovingDirectory {
                 name,
                 path: PathBuf::from(src),
-            }
-        }))
+            })
+        })
     } else {
-        copy_file(src, dest).and(remove_file(name, src))
+        copy_file(src, dest).and_then(|()| remove_file(name, src))
     }
 }