From 6a9cb23923418284e39ba06aeeefdb033a2df4a9 Mon Sep 17 00:00:00 2001 From: WANG Rui Date: Sat, 13 May 2023 16:31:36 +0800 Subject: [PATCH] Remove useless drop of copy type --- crates/cargo-test-support/src/lib.rs | 4 ++-- src/cargo/core/compiler/job_queue/mod.rs | 4 ++-- src/cargo/core/features.rs | 27 +++++++++++------------- 3 files changed, 16 insertions(+), 19 deletions(-) diff --git a/crates/cargo-test-support/src/lib.rs b/crates/cargo-test-support/src/lib.rs index fc30c9096e6..d27aab44fd1 100644 --- a/crates/cargo-test-support/src/lib.rs +++ b/crates/cargo-test-support/src/lib.rs @@ -59,8 +59,8 @@ pub fn panic_error(what: &str, err: impl Into) -> ! { fn pe(what: &str, err: anyhow::Error) -> ! { let mut result = format!("{}\nerror: {}", what, err); for cause in err.chain().skip(1) { - drop(writeln!(result, "\nCaused by:")); - drop(write!(result, "{}", cause)); + let _ = writeln!(result, "\nCaused by:"); + let _ = write!(result, "{}", cause); } panic!("\n{}", result); } diff --git a/src/cargo/core/compiler/job_queue/mod.rs b/src/cargo/core/compiler/job_queue/mod.rs index abae9bf516b..0bcaa81a7ac 100644 --- a/src/cargo/core/compiler/job_queue/mod.rs +++ b/src/cargo/core/compiler/job_queue/mod.rs @@ -1045,10 +1045,10 @@ impl<'cfg> DrainState<'cfg> { if fixable > 1 { suggestions.push_str("s") } - drop(write!( + let _ = write!( message, " (run `{command} --{args}` to apply {suggestions})" - )) + ); } } } diff --git a/src/cargo/core/features.rs b/src/cargo/core/features.rs index 1f6773da931..bb46ae91f55 100644 --- a/src/cargo/core/features.rs +++ b/src/cargo/core/features.rs @@ -585,19 +585,19 @@ impl Features { feature_name, feature.version ); if self.is_local { - drop(writeln!( + let _ = writeln!( msg, "Remove the feature from Cargo.toml to remove this error." - )); + ); } else { - drop(writeln!( + let _ = writeln!( msg, "This package cannot be used with this version of Cargo, \ as the unstable feature `{}` is no longer supported.", feature_name - )); + ); } - drop(writeln!(msg, "{}", see_docs())); + let _ = writeln!(msg, "{}", see_docs()); bail!(msg); } } @@ -629,32 +629,29 @@ impl Features { if self.nightly_features_allowed { if self.is_local { - drop(writeln!( + let _ = writeln!( msg, "Consider adding `cargo-features = [\"{}\"]` \ to the top of Cargo.toml (above the [package] table) \ to tell Cargo you are opting in to use this unstable feature.", feature_name - )); + ); } else { - drop(writeln!( - msg, - "Consider trying a more recent nightly release." - )); + let _ = writeln!(msg, "Consider trying a more recent nightly release."); } } else { - drop(writeln!( + let _ = writeln!( msg, "Consider trying a newer version of Cargo \ (this may require the nightly release)." - )); + ); } - drop(writeln!( + let _ = writeln!( msg, "See https://doc.rust-lang.org/nightly/cargo/{} for more information \ about the status of this feature.", feature.docs - )); + ); bail!("{}", msg); }