itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-10-01 11:30:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(cli): Pull out error chain iteration (#15926)

Browse Source 
### What does this PR try to resolve?

This is some cleanup that will help with #15922

### How to test and review this PR?
This commit is contained in:
Eric Huss 2025-09-04 15:36:24 +00:00 committed by GitHub
commit a154b100bc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/cargo/lib.rs
View File

@ -140,6 +140,7 @@
//! [Cargo Contributor Guide]: https://doc.crates.io/contrib/ //! [Cargo Contributor Guide]: https://doc.crates.io/contrib/
use crate::core::Shell; use crate::core::Shell;
use crate::core::shell::Verbosity;
use crate::core::shell::Verbosity::Verbose; use crate::core::shell::Verbosity::Verbose;
use anyhow::Error; use anyhow::Error;
use tracing::debug; use tracing::debug;
@ -206,18 +207,21 @@ pub fn display_warning_with_error(warning: &str, err: &Error, shell: &mut Shell)
_display_error(err, shell, false); _display_error(err, shell, false);
} }
fn _display_error(err: &Error, shell: &mut Shell, as_err: bool) -> bool { fn error_chain(err: &Error, verbosity: Verbosity) -> impl Iterator<Item = &dyn std::fmt::Display> {
for (i, err) in err.chain().enumerate() { err.chain()
// If we're not in verbose mode then only print cause chain until one .take_while(move |err| {
// marked as `VerboseError` appears. // If we're not in verbose mode then only print cause chain until one
// // marked as `VerboseError` appears.
// Generally the top error shouldn't be verbose, but check it anyways. //
if shell.verbosity() != Verbose && err.is::<VerboseError>() { // Generally the top error shouldn't be verbose, but check it anyways.
return true; verbosity == Verbose || !err.is::<VerboseError>()
} })
if err.is::<AlreadyPrintedError>() { .take_while(|err| !err.is::<AlreadyPrintedError>())
break; .map(|err| err as &dyn std::fmt::Display)
} }
fn _display_error(err: &Error, shell: &mut Shell, as_err: bool) {
for (i, err) in error_chain(err, shell.verbosity()).enumerate() {
if i == 0 { if i == 0 {
if as_err { if as_err {
drop(shell.error(&err)); drop(shell.error(&err));
@ -229,5 +233,4 @@ fn _display_error(err: &Error, shell: &mut Shell, as_err: bool) -> bool {
drop(write!(shell.err(), "{}", indented_lines(&err.to_string()))); drop(write!(shell.err(), "{}", indented_lines(&err.to_string())));
} }
} }
false
} }