development/cargo
development/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo synced 2024-09-13 21:11:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #9736 - hi-rustin:rustin-patch-clippy, r=ehuss

Browse source 
Make clippy happy

Make clippy happy.
This commit is contained in:
bors 2021-07-28 15:41:09 +00:00
parent ee267ee9ba 91f0648899
commit bf505afa92
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/cargo/ops/cargo_package.rs
View file

@ -93,7 +93,7 @@ pub fn package_one(
None
};
let ar_files = build_ar_list(&ws, pkg, src_files, vcs_info)?;
let ar_files = build_ar_list(ws, pkg, src_files, vcs_info)?;
if opts.list {
for ar_file in ar_files {
@ -123,11 +123,11 @@ pub fn package_one(
.shell()
.status("Packaging", pkg.package_id().to_string())?;
dst.file().set_len(0)?;
tar(&ws, pkg, ar_files, dst.file(), &filename)
tar(ws, pkg, ar_files, dst.file(), &filename)
.with_context(|| "failed to prepare local package for uploading")?;
if opts.verify {
dst.seek(SeekFrom::Start(0))?;
run_verify(&ws, pkg, &dst, opts).with_context(|| "failed to verify package tarball")?
run_verify(ws, pkg, &dst, opts).with_context(|| "failed to verify package tarball")?
}
dst.seek(SeekFrom::Start(0))?;
@ -149,7 +149,7 @@ pub fn package(ws: &Workspace<'_>, opts: &PackageOpts<'_>) -> CargoResult<Option
if ws.root().join("Cargo.lock").exists() {
// Make sure the Cargo.lock is up-to-date and valid.
let _ = ops::resolve_ws(&ws)?;
let _ = ops::resolve_ws(ws)?;
// If Cargo.lock does not exist, it will be generated by `build_lock`
// below, and will be validated during the verification step.
}

4
src/cargo/ops/registry.rs
View file

@ -106,7 +106,7 @@ pub fn publish(ws: &Workspace<'_>, opts: &PublishOpts<'_>) -> CargoResult<()> {
// Prepare a tarball, with a non-suppressible warning if metadata
// is missing since this is being put online.
let tarball = ops::package_one(
&ws,
ws,
pkg,
&ops::PackageOpts {
config: opts.config,
@ -117,7 +117,7 @@ pub fn publish(ws: &Workspace<'_>, opts: &PublishOpts<'_>) -> CargoResult<()> {
to_package: ops::Packages::Default,
targets: opts.targets.clone(),
jobs: opts.jobs,
cli_features: cli_features.clone(),
cli_features: cli_features,
},
)?
.unwrap();