Skip to content

Commit 499a61c

Browse files
borsbors
committed
Auto merge of #13647 - weihanglo:shell, r=Muscraft
fix: do not borrow shell across registry query
2 parents fa619a9 + 667803c commit 499a61c

File tree

1 file changed

+35
-21
lines changed

1 file changed

+35
-21
lines changed

‎src/cargo/ops/cargo_generate_lockfile.rs

+35-21
Original file line numberDiff line numberDiff line change
@@ -184,15 +184,14 @@ fn print_lockfile_generation(
184184
resolve: &Resolve,
185185
registry: &mut PackageRegistry<'_>,
186186
) -> CargoResult<()> {
187-
let mut shell = gctx.shell();
188-
189187
let diff = PackageDiff::new(&resolve);
190188
let num_pkgs: usize = diff.iter().map(|d| d.added.len()).sum();
191189
if num_pkgs <= 1 {
192190
// just ourself, nothing worth reporting
193191
return Ok(());
194192
}
195-
shell.status("Locking", format!("{num_pkgs} packages"))?;
193+
gctx.shell()
194+
.status("Locking", format!("{num_pkgs} packages"))?;
196195

197196
for diff in diff {
198197
fn format_latest(version: semver::Version) -> String {
@@ -226,7 +225,11 @@ fn print_lockfile_generation(
226225
};
227226

228227
if let Some(latest) = latest {
229-
shell.status_with_color("Adding", format!("{package}{latest}"), &style::NOTE)?;
228+
gctx.shell().status_with_color(
229+
"Adding",
230+
format!("{package}{latest}"),
231+
&style::NOTE,
232+
)?;
230233
}
231234
}
232235
}
@@ -240,15 +243,14 @@ fn print_lockfile_sync(
240243
resolve: &Resolve,
241244
registry: &mut PackageRegistry<'_>,
242245
) -> CargoResult<()> {
243-
let mut shell = gctx.shell();
244-
245246
let diff = PackageDiff::diff(&previous_resolve, &resolve);
246247
let num_pkgs: usize = diff.iter().map(|d| d.added.len()).sum();
247248
if num_pkgs == 0 {
248249
return Ok(());
249250
}
250251
let plural = if num_pkgs == 1 { "" } else { "s" };
251-
shell.status("Locking", format!("{num_pkgs} package{plural}"))?;
252+
gctx.shell()
253+
.status("Locking", format!("{num_pkgs} package{plural}"))?;
252254

253255
for diff in diff {
254256
fn format_latest(version: semver::Version) -> String {
@@ -296,9 +298,11 @@ fn print_lockfile_sync(
296298
// This metadata is often stuff like git commit hashes, which are
297299
// not meaningfully ordered.
298300
if removed.version().cmp_precedence(added.version()) == Ordering::Greater {
299-
shell.status_with_color("Downgrading", msg, &style::WARN)?;
301+
gctx.shell()
302+
.status_with_color("Downgrading", msg, &style::WARN)?;
300303
} else {
301-
shell.status_with_color("Updating", msg, &style::GOOD)?;
304+
gctx.shell()
305+
.status_with_color("Updating", msg, &style::GOOD)?;
302306
}
303307
} else {
304308
for package in diff.added.iter() {
@@ -315,7 +319,11 @@ fn print_lockfile_sync(
315319
}
316320
.unwrap_or_default();
317321

318-
shell.status_with_color("Adding", format!("{package}{latest}"), &style::NOTE)?;
322+
gctx.shell().status_with_color(
323+
"Adding",
324+
format!("{package}{latest}"),
325+
&style::NOTE,
326+
)?;
319327
}
320328
}
321329
}
@@ -329,8 +337,6 @@ pub fn print_lockfile_updates(
329337
resolve: &Resolve,
330338
registry: &mut PackageRegistry<'_>,
331339
) -> CargoResult<()> {
332-
let mut shell = gctx.shell();
333-
334340
let mut unchanged_behind = 0;
335341
for diff in PackageDiff::diff(&previous_resolve, &resolve) {
336342
fn format_latest(version: semver::Version) -> String {
@@ -378,13 +384,16 @@ pub fn print_lockfile_updates(
378384
// This metadata is often stuff like git commit hashes, which are
379385
// not meaningfully ordered.
380386
if removed.version().cmp_precedence(added.version()) == Ordering::Greater {
381-
shell.status_with_color("Downgrading", msg, &style::WARN)?;
387+
gctx.shell()
388+
.status_with_color("Downgrading", msg, &style::WARN)?;
382389
} else {
383-
shell.status_with_color("Updating", msg, &style::GOOD)?;
390+
gctx.shell()
391+
.status_with_color("Updating", msg, &style::GOOD)?;
384392
}
385393
} else {
386394
for package in diff.removed.iter() {
387-
shell.status_with_color("Removing", format!("{package}"), &style::ERROR)?;
395+
gctx.shell()
396+
.status_with_color("Removing", format!("{package}"), &style::ERROR)?;
388397
}
389398
for package in diff.added.iter() {
390399
let latest = if !possibilities.is_empty() {
@@ -400,7 +409,11 @@ pub fn print_lockfile_updates(
400409
}
401410
.unwrap_or_default();
402411

403-
shell.status_with_color("Adding", format!("{package}{latest}"), &style::NOTE)?;
412+
gctx.shell().status_with_color(
413+
"Adding",
414+
format!("{package}{latest}"),
415+
&style::NOTE,
416+
)?;
404417
}
405418
}
406419
for package in &diff.unchanged {
@@ -418,8 +431,8 @@ pub fn print_lockfile_updates(
418431

419432
if let Some(latest) = latest {
420433
unchanged_behind += 1;
421-
if shell.verbosity() == Verbosity::Verbose {
422-
shell.status_with_color(
434+
if gctx.shell().verbosity() == Verbosity::Verbose {
435+
gctx.shell().status_with_color(
423436
"Unchanged",
424437
format!("{package}{latest}"),
425438
&anstyle::Style::new().bold(),
@@ -428,13 +441,14 @@ pub fn print_lockfile_updates(
428441
}
429442
}
430443
}
431-
if shell.verbosity() == Verbosity::Verbose {
432-
shell.note(
444+
445+
if gctx.shell().verbosity() == Verbosity::Verbose {
446+
gctx.shell().note(
433447
"to see how you depend on a package, run `cargo tree --invert --package <dep>@<ver>`",
434448
)?;
435449
} else {
436450
if 0 < unchanged_behind {
437-
shell.note(format!(
451+
gctx.shell().note(format!(
438452
"pass `--verbose` to see {unchanged_behind} unchanged dependencies behind latest"
439453
))?;
440454
}

0 commit comments

Comments
 (0)