Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove useless drop of copy type #12136

Merged
merged 1 commit into from May 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions crates/cargo-test-support/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ pub fn panic_error(what: &str, err: impl Into<anyhow::Error>) -> ! {
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);
}
Expand Down
4 changes: 2 additions & 2 deletions src/cargo/core/compiler/job_queue/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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})"
))
);
}
}
}
Expand Down
27 changes: 12 additions & 15 deletions src/cargo/core/features.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Expand Down Expand Up @@ -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);
}
Expand Down