From 59b11a78e4062c7eb0b3385b47cafe4414223962 Mon Sep 17 00:00:00 2001 From: Alexander Sergeev Date: Sun, 9 Mar 2025 23:20:11 +0300 Subject: [PATCH] feat: use default value for term.progress --- src/cargo/util/context/mod.rs | 1 + tests/testsuite/progress.rs | 13 ++----------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/cargo/util/context/mod.rs b/src/cargo/util/context/mod.rs index ce0d7d9398b..cb33fd019ca 100644 --- a/src/cargo/util/context/mod.rs +++ b/src/cargo/util/context/mod.rs @@ -2830,6 +2830,7 @@ pub struct TermConfig { #[derive(Debug, Default, Deserialize)] #[serde(rename_all = "kebab-case")] pub struct ProgressConfig { + #[serde(default)] pub when: ProgressWhen, pub width: Option, } diff --git a/tests/testsuite/progress.rs b/tests/testsuite/progress.rs index 41dab37839a..68b140f4a5d 100644 --- a/tests/testsuite/progress.rs +++ b/tests/testsuite/progress.rs @@ -53,7 +53,7 @@ fn bad_progress_config_missing_width() { } #[cargo_test] -fn bad_progress_config_missing_when() { +fn default_progress_is_auto() { let p = project() .file( ".cargo/config.toml", @@ -65,16 +65,7 @@ fn bad_progress_config_missing_when() { .file("src/lib.rs", "") .build(); - p.cargo("check") - .with_status(101) - .with_stderr_data(str![[r#" -[ERROR] error in [ROOT]/foo/.cargo/config.toml: could not load config key `term.progress` - -Caused by: - missing field `when` - -"#]]) - .run(); + p.cargo("check").run(); } #[cargo_test]