Make clippy::needless-lifetimes happy

Signed-off-by: hi-rustin <[email protected]>

Author: 0xPoe

src/cli/rustup_mode.rs

@@ -747,7 +747,7 @@ pub(crate) fn cli() -> App<'static, 'static> {
     )
 }
 
-fn verbose_arg<'a, 'b>(help: &'b str) -> Arg<'a, 'b> {
+fn verbose_arg(help: &str) -> Arg<'_, '_> {
     Arg::with_name("verbose")
         .help(help)
         .takes_value(false)

src/dist/component/package.rs

@@ -284,10 +284,10 @@ enum DirStatus {
     Pending(Vec<Item>),
 }
 
-fn unpack_without_first_dir<'a, R: Read>(
+fn unpack_without_first_dir<R: Read>(
     archive: &mut tar::Archive<R>,
     path: &Path,
-    notify_handler: Option<&'a dyn Fn(Notification<'_>)>,
+    notify_handler: Option<&dyn Fn(Notification<'_>)>,
 ) -> Result<()> {
     let entries = archive.entries()?;
     let effective_max_ram = match effective_limits::memory_limit() {
@@ -347,10 +347,10 @@ fn unpack_without_first_dir<'a, R: Read>(
 
         /// true if either no sender_entry was provided, or the incremental file
         /// has been fully dispatched.
-        fn flush_ios<'a, R: std::io::Read, P: AsRef<Path>>(
+        fn flush_ios<R: std::io::Read, P: AsRef<Path>>(
             io_executor: &mut dyn Executor,
             directories: &mut HashMap<PathBuf, DirStatus>,
-            mut sender_entry: Option<&mut SenderEntry<'a, '_, R>>,
+            mut sender_entry: Option<&mut SenderEntry<'_, '_, R>>,
             full_path: P,
         ) -> Result<bool> {
             let mut result = sender_entry.is_none();

src/dist/dist.rs

@@ -650,8 +650,8 @@ pub(crate) fn valid_profile_names() -> String {
 // an upgrade then all the existing components will be upgraded.
 //
 // Returns the manifest's hash if anything changed.
-pub(crate) fn update_from_dist<'a>(
-    download: DownloadCfg<'a>,
+pub(crate) fn update_from_dist(
+    download: DownloadCfg<'_>,
     update_hash: Option<&Path>,
     toolchain: &ToolchainDesc,
     profile: Option<Profile>,
@@ -694,8 +694,8 @@ pub(crate) fn update_from_dist<'a>(
     res
 }
 
-fn update_from_dist_<'a>(
-    download: DownloadCfg<'a>,
+fn update_from_dist_(
+    download: DownloadCfg<'_>,
     update_hash: Option<&Path>,
     toolchain: &ToolchainDesc,
     profile: Option<Profile>,
@@ -829,8 +829,8 @@ fn update_from_dist_<'a>(
     }
 }
 
-fn try_update_from_dist_<'a>(
-    download: DownloadCfg<'a>,
+fn try_update_from_dist_(
+    download: DownloadCfg<'_>,
     update_hash: Option<&Path>,
     toolchain: &ToolchainDesc,
     profile: Option<Profile>,
@@ -1017,8 +1017,8 @@ fn try_update_from_dist_<'a>(
     }
 }
 
-pub(crate) fn dl_v2_manifest<'a>(
-    download: DownloadCfg<'a>,
+pub(crate) fn dl_v2_manifest(
+    download: DownloadCfg<'_>,
     update_hash: Option<&Path>,
     toolchain: &ToolchainDesc,
 ) -> Result<Option<(ManifestV2, String)>> {

tests/cli-self-upd.rs

@@ -153,9 +153,7 @@ fn uninstall_deletes_bins() {
         let cargo = config.cargodir.join(format!("bin/cargo{EXE_SUFFIX}"));
         let rust_lldb = config.cargodir.join(format!("bin/rust-lldb{EXE_SUFFIX}"));
         let rust_gdb = config.cargodir.join(format!("bin/rust-gdb{EXE_SUFFIX}"));
-        let rust_gdbgui = config
-            .cargodir
-            .join(format!("bin/rust-gdbgui{EXE_SUFFIX}"));
+        let rust_gdbgui = config.cargodir.join(format!("bin/rust-gdbgui{EXE_SUFFIX}"));
         assert!(!rustup.exists());
         assert!(!rustc.exists());
         assert!(!rustdoc.exists());
@@ -175,9 +173,7 @@ fn uninstall_works_if_some_bins_dont_exist() {
         let cargo = config.cargodir.join(format!("bin/cargo{EXE_SUFFIX}"));
         let rust_lldb = config.cargodir.join(format!("bin/rust-lldb{EXE_SUFFIX}"));
         let rust_gdb = config.cargodir.join(format!("bin/rust-gdb{EXE_SUFFIX}"));
-        let rust_gdbgui = config
-            .cargodir
-            .join(format!("bin/rust-gdbgui{EXE_SUFFIX}"));
+        let rust_gdbgui = config.cargodir.join(format!("bin/rust-gdbgui{EXE_SUFFIX}"));
 
         fs::remove_file(&rustc).unwrap();
         fs::remove_file(&cargo).unwrap();
@@ -255,9 +251,7 @@ fn uninstall_self_delete_works() {
         let cargo = config.cargodir.join(format!("bin/cargo{EXE_SUFFIX}"));
         let rust_lldb = config.cargodir.join(format!("bin/rust-lldb{EXE_SUFFIX}"));
         let rust_gdb = config.cargodir.join(format!("bin/rust-gdb{EXE_SUFFIX}"));
-        let rust_gdbgui = config
-            .cargodir
-            .join(format!("bin/rust-gdbgui{EXE_SUFFIX}"));
+        let rust_gdbgui = config.cargodir.join(format!("bin/rust-gdbgui{EXE_SUFFIX}"));
         assert!(!rustc.exists());
         assert!(!rustdoc.exists());
         assert!(!cargo.exists());
@@ -329,9 +323,7 @@ fn update_but_not_installed() {
 fn update_but_delete_existing_updater_first() {
     update_setup(&|config, _| {
         // The updater is stored in a known location
-        let setup = config
-            .cargodir
-            .join(format!("bin/rustup-init{EXE_SUFFIX}"));
+        let setup = config.cargodir.join(format!("bin/rustup-init{EXE_SUFFIX}"));
 
         expect_ok(config, &["rustup-init", "-y", "--no-modify-path"]);
 
@@ -524,9 +516,7 @@ fn updater_leaves_itself_for_later_deletion() {
         expect_ok(config, &["rustup", "update", "nightly"]);
         expect_ok(config, &["rustup", "self", "update"]);
 
-        let setup = config
-            .cargodir
-            .join(format!("bin/rustup-init{EXE_SUFFIX}"));
+        let setup = config.cargodir.join(format!("bin/rustup-init{EXE_SUFFIX}"));
         assert!(setup.exists());
     });
 }
@@ -540,9 +530,7 @@ fn updater_is_deleted_after_running_rustup() {
 
         expect_ok(config, &["rustup", "update", "nightly"]);
 
-        let setup = config
-            .cargodir
-            .join(format!("bin/rustup-init{EXE_SUFFIX}"));
+        let setup = config.cargodir.join(format!("bin/rustup-init{EXE_SUFFIX}"));
         assert!(!setup.exists());
     });
 }
@@ -556,9 +544,7 @@ fn updater_is_deleted_after_running_rustc() {
 
         expect_ok(config, &["rustc", "--version"]);
 
-        let setup = config
-            .cargodir
-            .join(format!("bin/rustup-init{EXE_SUFFIX}"));
+        let setup = config.cargodir.join(format!("bin/rustup-init{EXE_SUFFIX}"));
         assert!(!setup.exists());
     });
 }