Skip to content

Commit bf505af

Browse files
committed
Auto merge of #9736 - hi-rustin:rustin-patch-clippy, r=ehuss
Make clippy happy Make clippy happy.
2 parents ee267ee + 91f0648 commit bf505af

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/cargo/ops/cargo_package.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ pub fn package_one(
9393
None
9494
};
9595

96-
let ar_files = build_ar_list(&ws, pkg, src_files, vcs_info)?;
96+
let ar_files = build_ar_list(ws, pkg, src_files, vcs_info)?;
9797

9898
if opts.list {
9999
for ar_file in ar_files {
@@ -123,11 +123,11 @@ pub fn package_one(
123123
.shell()
124124
.status("Packaging", pkg.package_id().to_string())?;
125125
dst.file().set_len(0)?;
126-
tar(&ws, pkg, ar_files, dst.file(), &filename)
126+
tar(ws, pkg, ar_files, dst.file(), &filename)
127127
.with_context(|| "failed to prepare local package for uploading")?;
128128
if opts.verify {
129129
dst.seek(SeekFrom::Start(0))?;
130-
run_verify(&ws, pkg, &dst, opts).with_context(|| "failed to verify package tarball")?
130+
run_verify(ws, pkg, &dst, opts).with_context(|| "failed to verify package tarball")?
131131
}
132132

133133
dst.seek(SeekFrom::Start(0))?;
@@ -149,7 +149,7 @@ pub fn package(ws: &Workspace<'_>, opts: &PackageOpts<'_>) -> CargoResult<Option
149149

150150
if ws.root().join("Cargo.lock").exists() {
151151
// Make sure the Cargo.lock is up-to-date and valid.
152-
let _ = ops::resolve_ws(&ws)?;
152+
let _ = ops::resolve_ws(ws)?;
153153
// If Cargo.lock does not exist, it will be generated by `build_lock`
154154
// below, and will be validated during the verification step.
155155
}

src/cargo/ops/registry.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ pub fn publish(ws: &Workspace<'_>, opts: &PublishOpts<'_>) -> CargoResult<()> {
106106
// Prepare a tarball, with a non-suppressible warning if metadata
107107
// is missing since this is being put online.
108108
let tarball = ops::package_one(
109-
&ws,
109+
ws,
110110
pkg,
111111
&ops::PackageOpts {
112112
config: opts.config,
@@ -117,7 +117,7 @@ pub fn publish(ws: &Workspace<'_>, opts: &PublishOpts<'_>) -> CargoResult<()> {
117117
to_package: ops::Packages::Default,
118118
targets: opts.targets.clone(),
119119
jobs: opts.jobs,
120-
cli_features: cli_features.clone(),
120+
cli_features: cli_features,
121121
},
122122
)?
123123
.unwrap();

0 commit comments

Comments
 (0)