about summary refs log tree commit diff
diff options
context:
space:
mode:
authorHKalbasi <45197576+HKalbasi@users.noreply.github.com>2025-01-15 19:51:36 +0000
committerGitHub <noreply@github.com>2025-01-15 19:51:36 +0000
commit88ae0896f9e8bea458428c5edfd1068c27bcd2a2 (patch)
tree29052d4e23a376da845baf212ed54b0355f88341
parent805598dac3f55703af4af6376ea9570bc1ee6d40 (diff)
parentc26f175b16c1a3ce9fca0476484a3a6b5638731b (diff)
downloadrust-88ae0896f9e8bea458428c5edfd1068c27bcd2a2.tar.gz
rust-88ae0896f9e8bea458428c5edfd1068c27bcd2a2.zip
Merge pull request #18897 from duncanawoods/master
fix: Make test_runner::TestState::stdout optional to fix parsing cargo test json output
-rw-r--r--src/tools/rust-analyzer/crates/rust-analyzer/src/test_runner.rs6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/tools/rust-analyzer/crates/rust-analyzer/src/test_runner.rs b/src/tools/rust-analyzer/crates/rust-analyzer/src/test_runner.rs
index 503b3ee43a1..3edfb812cf5 100644
--- a/src/tools/rust-analyzer/crates/rust-analyzer/src/test_runner.rs
+++ b/src/tools/rust-analyzer/crates/rust-analyzer/src/test_runner.rs
@@ -18,7 +18,11 @@ pub(crate) enum TestState {
     Started,
     Ok,
     Ignored,
-    Failed { stdout: String },
+    Failed {
+        // the stdout field is not always present depending on cargo test flags
+        #[serde(skip_serializing_if = "String::is_empty", default)]
+        stdout: String,
+    },
 }
 
 #[derive(Debug, Deserialize)]