CHANGELOG.md

@@ -6,19 +6,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-## [0.7.1] - 2024-11-24
-
-### Fixed
-- make sure to close on final
-
-## [0.7.0] - 2024-11-24
-
-### Added
-- actually bubble up errors
-
-### Fixed
-- *(deps)* update rust crate thiserror to v2 (#9)
-
 ## [0.6.0] - 2024-11-23
 
 ### Added

Cargo.lock

@@ -28,9 +28,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.95"
+version = "1.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04"
+checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775"
 
 [[package]]
 name = "async-trait"
@@ -266,7 +266,7 @@ dependencies = [
 
 [[package]]
 name = "notmad"
-version = "0.7.1"
+version = "0.5.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -525,18 +525,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "2.0.9"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.9"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -555,9 +555,9 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.42.0"
+version = "1.41.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551"
+checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33"
 dependencies = [
  "backtrace",
  "bytes",
@@ -584,9 +584,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.13"
+version = "0.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078"
+checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a"
 dependencies = [
  "bytes",
  "futures-core",
@@ -597,9 +597,9 @@ dependencies = [
 
 [[package]]
 name = "tracing"
-version = "0.1.41"
+version = "0.1.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
 dependencies = [
  "log",
  "pin-project-lite",
@@ -609,9 +609,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.28"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -620,9 +620,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.33"
+version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
 dependencies = [
  "once_cell",
  "valuable",
@@ -641,9 +641,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.19"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
+checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
 dependencies = [
  "matchers",
  "nu-ansi-term",

Cargo.toml

@@ -3,7 +3,7 @@ members = ["crates/*"]
 resolver = "2"
 
 [workspace.package]
-version = "0.7.1"
+version = "0.6.0"
 
 [workspace.dependencies]
 mad = { path = "crates/mad" }

crates/mad/Cargo.toml

@@ -13,7 +13,7 @@ async-trait = "0.1.81"
 futures = "0.3.30"
 futures-util = "0.3.30"
 rand = "0.8.5"
-thiserror = "2.0.0"
+thiserror = "1.0.63"
 tokio.workspace = true
 tokio-util = "0.7.11"
 tracing.workspace = true

crates/mad/src/lib.rs

@@ -160,20 +160,18 @@ impl Mad {
         }
 
         tokio::spawn({
-            let cancellation_token = cancellation_token;
+            let cancellation_token = cancellation_token.child_token();
             let job_done = job_done.child_token();
 
             let wait_cancel = self.should_cancel;
 
             async move {
                 let should_cancel =
-                    |cancel: CancellationToken,
+                    |cancel: CancellationToken, wait: Option<std::time::Duration>| async move {
-                     global_cancel: CancellationToken,
-                     wait: Option<std::time::Duration>| async move {
                         if let Some(cancel_wait) = wait {
-                            cancel.cancel();
                             tokio::time::sleep(cancel_wait).await;
-                            global_cancel.cancel();
+
+                            cancel.cancel();
                         }
                     };
 
@@ -182,13 +180,13 @@ impl Mad {
                         job_cancellation.cancel();
                     }
                     _ = job_done.cancelled() => {
-                        should_cancel(job_cancellation, cancellation_token, wait_cancel).await;
+                        should_cancel(job_cancellation, wait_cancel).await;
                     }
                     _ = tokio::signal::ctrl_c() => {
-                        should_cancel(job_cancellation,  cancellation_token,wait_cancel).await;
+                        should_cancel(job_cancellation, wait_cancel).await;
                     }
                     _ = signal_unix_terminate() => {
-                        should_cancel(job_cancellation, cancellation_token, wait_cancel).await;
+                        should_cancel(job_cancellation, wait_cancel).await;
                     }
                 }
             }
@@ -199,7 +197,6 @@ impl Mad {
             futures.push(channel.recv());
         }
 
-        let mut errors = Vec::new();
         while let Some(Some(msg)) = futures.next().await {
             match msg.res {
                 Err(e) => {
@@ -208,7 +205,6 @@ impl Mad {
                         component = msg.name,
                         "component ran to completion with error"
                     );
-                    errors.push(e);
                 }
                 Ok(_) => {
                     tracing::debug!(component = msg.name, "component ran to completion");
@@ -219,9 +215,6 @@ impl Mad {
         }
 
         tracing::debug!("ran components");
-        if !errors.is_empty() {
-            return Err(MadError::AggregateError(AggregateError { errors }));
-        }
 
         Ok(())
     }