[nextest-runner] use subtraits for Serialize/Arbitrary bounds (#3092)

We're going to add a second `LogFile` associated type -- avoid having to
add bounds everywhere.

Author: sunshowers

nextest-runner/src/output_spec.rs

@@ -15,6 +15,7 @@
 //! future without changing every generic type's parameter list.
 
 use crate::{record::ZipStoreOutputDescription, reporter::events::ChildOutputDescription};
+use serde::{Serialize, de::DeserializeOwned};
 
 /// Specifies how test output is represented.
 ///
@@ -46,3 +47,32 @@ pub struct RecordingSpec;
 impl OutputSpec for RecordingSpec {
     type ChildOutputDesc = ZipStoreOutputDescription;
 }
+
+/// An [`OutputSpec`] that supports serialization and deserialization.
+pub trait SerializableOutputSpec:
+    OutputSpec<ChildOutputDesc: Serialize + DeserializeOwned>
+{
+}
+
+impl<S> SerializableOutputSpec for S
+where
+    S: OutputSpec,
+    S::ChildOutputDesc: Serialize + DeserializeOwned,
+{
+}
+
+/// An [`OutputSpec`] that supports generation via
+/// [`proptest::arbitrary::Arbitrary`].
+#[cfg(test)]
+pub(crate) trait ArbitraryOutputSpec:
+    OutputSpec<ChildOutputDesc: proptest::arbitrary::Arbitrary + PartialEq + 'static> + 'static
+{
+}
+
+#[cfg(test)]
+impl<S> ArbitraryOutputSpec for S
+where
+    S: OutputSpec + 'static,
+    S::ChildOutputDesc: proptest::arbitrary::Arbitrary + PartialEq + 'static,
+{
+}

nextest-runner/src/record/summary.rs

@@ -14,10 +14,12 @@
 //! - [`RecordingSpec`](crate::output_spec::RecordingSpec): reference to a file stored
 //!   in the zip archive.
 
+#[cfg(test)]
+use crate::output_spec::ArbitraryOutputSpec;
 use crate::{
     config::scripts::ScriptId,
     list::OwnedTestInstanceId,
-    output_spec::{LiveSpec, OutputSpec},
+    output_spec::{LiveSpec, OutputSpec, SerializableOutputSpec},
     reporter::{
         TestOutputDisplay,
         events::{
@@ -71,14 +73,14 @@ impl RecordOpts {
 #[serde(
     rename_all = "kebab-case",
     bound(
-        serialize = "S::ChildOutputDesc: Serialize",
-        deserialize = "S::ChildOutputDesc: serde::de::DeserializeOwned"
+        serialize = "S: SerializableOutputSpec",
+        deserialize = "S: SerializableOutputSpec"
     )
 )]
 #[cfg_attr(
     test,
     derive(test_strategy::Arbitrary),
-    arbitrary(bound(S: 'static, S::ChildOutputDesc: proptest::arbitrary::Arbitrary + PartialEq + 'static))
+    arbitrary(bound(S: ArbitraryOutputSpec))
 )]
 pub struct TestEventSummary<S: OutputSpec> {
     /// The timestamp of the event.
@@ -126,14 +128,14 @@ impl TestEventSummary<LiveSpec> {
     tag = "type",
     rename_all = "kebab-case",
     bound(
-        serialize = "S::ChildOutputDesc: Serialize",
-        deserialize = "S::ChildOutputDesc: serde::de::DeserializeOwned"
+        serialize = "S: SerializableOutputSpec",
+        deserialize = "S: SerializableOutputSpec"
     )
 )]
 #[cfg_attr(
     test,
     derive(test_strategy::Arbitrary),
-    arbitrary(bound(S: 'static, S::ChildOutputDesc: proptest::arbitrary::Arbitrary + PartialEq + 'static))
+    arbitrary(bound(S: ArbitraryOutputSpec))
 )]
 pub enum TestEventKindSummary<S: OutputSpec> {
     /// An event that doesn't carry output.
@@ -352,14 +354,14 @@ pub struct TestsNotSeenSummary {
     tag = "kind",
     rename_all = "kebab-case",
     bound(
-        serialize = "S::ChildOutputDesc: Serialize",
-        deserialize = "S::ChildOutputDesc: serde::de::DeserializeOwned"
+        serialize = "S: SerializableOutputSpec",
+        deserialize = "S: SerializableOutputSpec"
     )
 )]
 #[cfg_attr(
     test,
     derive(test_strategy::Arbitrary),
-    arbitrary(bound(S: 'static, S::ChildOutputDesc: proptest::arbitrary::Arbitrary + PartialEq + 'static))
+    arbitrary(bound(S: ArbitraryOutputSpec))
 )]
 pub enum OutputEventKind<S: OutputSpec> {
     /// A setup script finished.

nextest-runner/src/reporter/events.rs

@@ -7,14 +7,16 @@
 //! reporter. The root structure for all events is [`TestEvent`].
 
 use super::{FinalStatusLevel, StatusLevel, TestOutputDisplay};
+#[cfg(test)]
+use crate::output_spec::ArbitraryOutputSpec;
 use crate::{
     config::{
         elements::{LeakTimeoutResult, SlowTimeoutResult},
         scripts::ScriptId,
     },
     errors::{ChildError, ChildFdError, ChildStartError, ErrorList},
     list::{OwnedTestInstanceId, TestInstanceId, TestList},
-    output_spec::{LiveSpec, OutputSpec},
+    output_spec::{LiveSpec, OutputSpec, SerializableOutputSpec},
     runner::{StressCondition, StressCount},
     test_output::{ChildExecutionOutput, ChildOutput, ChildSingleOutput},
 };
@@ -874,30 +876,27 @@ pub enum RunStatsFailureKind {
 #[derive(Serialize)]
 #[serde(
     rename_all = "kebab-case",
-    bound(serialize = "S::ChildOutputDesc: Serialize")
+    bound(serialize = "S: SerializableOutputSpec")
 )]
 #[cfg_attr(
     test,
     derive(test_strategy::Arbitrary),
-    arbitrary(bound(S: 'static, S::ChildOutputDesc: proptest::arbitrary::Arbitrary + std::fmt::Debug + 'static))
+    arbitrary(bound(S: ArbitraryOutputSpec))
 )]
 pub struct ExecutionStatuses<S: OutputSpec> {
     /// This is guaranteed to be non-empty.
     #[cfg_attr(test, strategy(proptest::collection::vec(proptest::arbitrary::any::<ExecuteStatus<S>>(), 1..=3)))]
     statuses: Vec<ExecuteStatus<S>>,
 }
 
-impl<'de, S: OutputSpec> Deserialize<'de> for ExecutionStatuses<S>
-where
-    S::ChildOutputDesc: serde::de::DeserializeOwned,
-{
+impl<'de, S: SerializableOutputSpec> Deserialize<'de> for ExecutionStatuses<S> {
     fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
         // Deserialize as the wrapper struct that matches the Serialize output.
-        // S is already bound as OutputSpec on this impl.
+        // S is already bound as SerializableOutputSpec on this impl.
         #[derive(Deserialize)]
         #[serde(
             rename_all = "kebab-case",
-            bound(deserialize = "S::ChildOutputDesc: serde::de::DeserializeOwned")
+            bound(deserialize = "S: SerializableOutputSpec")
         )]
         struct Helper<S: OutputSpec> {
             statuses: Vec<ExecuteStatus<S>>,
@@ -1134,14 +1133,14 @@ pub struct OutputErrorSlice {
 #[serde(
     rename_all = "kebab-case",
     bound(
-        serialize = "S::ChildOutputDesc: Serialize",
-        deserialize = "S::ChildOutputDesc: serde::de::DeserializeOwned"
+        serialize = "S: SerializableOutputSpec",
+        deserialize = "S: SerializableOutputSpec"
     )
 )]
 #[cfg_attr(
     test,
     derive(test_strategy::Arbitrary),
-    arbitrary(bound(S: 'static, S::ChildOutputDesc: proptest::arbitrary::Arbitrary + std::fmt::Debug + 'static))
+    arbitrary(bound(S: ArbitraryOutputSpec))
 )]
 pub struct ExecuteStatus<S: OutputSpec> {
     /// Retry-related data.
@@ -1189,14 +1188,14 @@ pub struct ExecuteStatus<S: OutputSpec> {
 #[serde(
     rename_all = "kebab-case",
     bound(
-        serialize = "S::ChildOutputDesc: Serialize",
-        deserialize = "S::ChildOutputDesc: serde::de::DeserializeOwned"
+        serialize = "S: SerializableOutputSpec",
+        deserialize = "S: SerializableOutputSpec"
     )
 )]
 #[cfg_attr(
     test,
     derive(test_strategy::Arbitrary),
-    arbitrary(bound(S: 'static, S::ChildOutputDesc: proptest::arbitrary::Arbitrary + std::fmt::Debug + 'static))
+    arbitrary(bound(S: ArbitraryOutputSpec))
 )]
 pub struct SetupScriptExecuteStatus<S: OutputSpec> {
     /// Output for this setup script.
@@ -1257,14 +1256,14 @@ pub struct SetupScriptEnvMap {
     tag = "type",
     rename_all = "kebab-case",
     bound(
-        serialize = "S::ChildOutputDesc: Serialize",
-        deserialize = "S::ChildOutputDesc: serde::de::DeserializeOwned"
+        serialize = "S: SerializableOutputSpec",
+        deserialize = "S: SerializableOutputSpec"
     )
 )]
 #[cfg_attr(
     test,
     derive(test_strategy::Arbitrary),
-    arbitrary(bound(S: 'static, S::ChildOutputDesc: proptest::arbitrary::Arbitrary + std::fmt::Debug + 'static))
+    arbitrary(bound(S: ArbitraryOutputSpec))
 )]
 pub enum ChildExecutionOutputDescription<S: OutputSpec> {
     /// The process was run and the output was captured.