Merge pull request #822 from Mark-Simulacrum/next

Avoid recursion issues in parsing rustc messages

Author: Mark-Simulacrum

src/runner/test.rs

@@ -7,7 +7,7 @@ use crate::runner::tasks::TaskCtx;
 use crate::runner::OverrideResult;
 use anyhow::Error;
 use cargo_metadata::diagnostic::DiagnosticLevel;
-use cargo_metadata::{CrateType, Message, Metadata, Package, Target, TargetKind};
+use cargo_metadata::{CrateType, Metadata, Package, Target, TargetKind};
 use docsrs_metadata::Metadata as DocsrsMetadata;
 use remove_dir_all::remove_dir_all;
 use rustwide::cmd::{CommandError, MountKind, ProcessLinesActions, SandboxBuilder};
@@ -233,6 +233,45 @@ fn run_cargo(
     }
 }
 
+/// A cargo message
+///
+/// This duplicates cargo_metadata::Message, but without variants we don't need to avoid recursion
+/// issues. See https://github.com/rust-lang/rust/issues/152354 for context.
+#[derive(Debug, Deserialize)]
+#[serde(tag = "reason", rename_all = "kebab-case")]
+enum Message {
+    /// The compiler wants to display a message
+    CompilerMessage(CompilerMessage),
+    #[serde(other)]
+    Other,
+}
+
+/// A cargo message
+///
+/// This duplicates cargo_metadata::CompilerMessage, but without variants we don't need to avoid recursion
+/// issues. See https://github.com/rust-lang/rust/issues/152354 for context.
+#[derive(Debug, Deserialize)]
+struct CompilerMessage {
+    /// The package this message belongs to
+    package_id: cargo_metadata::PackageId,
+    /// The message the compiler sent.
+    message: Diagnostic,
+}
+
+/// A diagnostic message generated by rustc
+///
+/// This duplicates cargo_metadata::Diagnostic, but without variants we don't need to avoid recursion
+/// issues. See https://github.com/rust-lang/rust/issues/152354 for context.
+#[derive(Debug, Deserialize)]
+struct Diagnostic {
+    /// The associated error code for this diagnostic
+    code: Option<cargo_metadata::diagnostic::DiagnosticCode>,
+    /// "error: internal compiler error", "error", "warning", "note", "help"
+    level: cargo_metadata::diagnostic::DiagnosticLevel,
+    /// The message as rustc would render it
+    rendered: Option<String>,
+}
+
 pub(super) fn run_test(
     action: &str,
     ctx: &TaskCtx,