Skip to content

Commit df48f0c

Browse files
committed
refactor(package): Remove nesting
1 parent c62dfb7 commit df48f0c

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
@@ -281,22 +281,20 @@ fn do_package<'a>(
281281
let deps = local_deps(pkgs.iter().map(|(p, f)| ((*p).clone(), f.clone())));
282282
let just_pkgs: Vec<_> = pkgs.iter().map(|p| p.0).collect();
283283

284-
let mut local_reg = {
285-
// The publish registry doesn't matter unless there are local dependencies that will be
286-
// resolved,
287-
// so only try to get one if we need it. If they explicitly passed a
288-
// registry on the CLI, we check it no matter what.
289-
if (deps.has_dependencies() && (opts.include_lockfile || opts.verify))
290-
|| opts.reg_or_index.is_some()
291-
{
292-
let sid = get_registry(ws.gctx(), &just_pkgs, opts.reg_or_index.clone())?;
293-
debug!("packaging for registry {}", sid);
294-
let reg_dir = ws.build_dir().join("package").join("tmp-registry");
295-
let local_reg = TmpRegistry::new(ws.gctx(), reg_dir, sid)?;
296-
Some(local_reg)
297-
} else {
298-
None
299-
}
284+
// The publish registry doesn't matter unless there are local dependencies that will be
285+
// resolved,
286+
// so only try to get one if we need it. If they explicitly passed a
287+
// registry on the CLI, we check it no matter what.
288+
let mut local_reg = if (deps.has_dependencies() && (opts.include_lockfile || opts.verify))
289+
|| opts.reg_or_index.is_some()
290+
{
291+
let sid = get_registry(ws.gctx(), &just_pkgs, opts.reg_or_index.clone())?;
292+
debug!("packaging for registry {}", sid);
293+
let reg_dir = ws.build_dir().join("package").join("tmp-registry");
294+
let local_reg = TmpRegistry::new(ws.gctx(), reg_dir, sid)?;
295+
Some(local_reg)
296+
} else {
297+
None
300298
};
301299

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

0 commit comments

Comments
 (0)