Skip to content

Commit 2bdc1ac

Browse files
committed
refactor(package): Remove nesting
1 parent de27e65 commit 2bdc1ac

File tree

1 file changed

+14
-16
lines changed
  • src/cargo/ops/cargo_package

1 file changed

+14
-16
lines changed

src/cargo/ops/cargo_package/mod.rs

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -268,22 +268,20 @@ fn do_package<'a>(
268268
let deps = local_deps(pkgs.iter().map(|(p, f)| ((*p).clone(), f.clone())));
269269
let just_pkgs: Vec<_> = pkgs.iter().map(|p| p.0).collect();
270270

271-
let mut local_reg = {
272-
// The publish registry doesn't matter unless there are local dependencies that will be
273-
// resolved,
274-
// so only try to get one if we need it. If they explicitly passed a
275-
// registry on the CLI, we check it no matter what.
276-
if (deps.has_dependencies() && (opts.include_lockfile || opts.verify))
277-
|| opts.reg_or_index.is_some()
278-
{
279-
let sid = get_registry(ws.gctx(), &just_pkgs, opts.reg_or_index.clone())?;
280-
debug!("packaging for registry {}", sid);
281-
let reg_dir = ws.build_dir().join("package").join("tmp-registry");
282-
let local_reg = TmpRegistry::new(ws.gctx(), reg_dir, sid)?;
283-
Some(local_reg)
284-
} else {
285-
None
286-
}
271+
// The publish registry doesn't matter unless there are local dependencies that will be
272+
// resolved,
273+
// so only try to get one if we need it. If they explicitly passed a
274+
// registry on the CLI, we check it no matter what.
275+
let mut local_reg = if (deps.has_dependencies() && (opts.include_lockfile || opts.verify))
276+
|| opts.reg_or_index.is_some()
277+
{
278+
let sid = get_registry(ws.gctx(), &just_pkgs, opts.reg_or_index.clone())?;
279+
debug!("packaging for registry {}", sid);
280+
let reg_dir = ws.build_dir().join("package").join("tmp-registry");
281+
let local_reg = TmpRegistry::new(ws.gctx(), reg_dir, sid)?;
282+
Some(local_reg)
283+
} else {
284+
None
287285
};
288286

289287
// Packages need to be created in dependency order, because dependencies must

0 commit comments

Comments
 (0)