From b9d7aceaed3de6d31778ef296f8dc152b4c4ec06 Mon Sep 17 00:00:00 2001
From: Ruediger Klaehn <rklaehn@protonmail.com>
Date: Wed, 24 Jul 2024 12:32:35 +0300
Subject: [PATCH] Remove flume from iroh-docs, iroh-cli and iroh as a direct
 dependency

---
 Cargo.lock                      | 2 --
 iroh-blobs/src/util/progress.rs | 8 ++++----
 iroh-cli/Cargo.toml             | 1 -
 iroh/Cargo.toml                 | 1 -
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 077184ce491..9ec40c78c08 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2484,7 +2484,6 @@ dependencies = [
  "clap",
  "console",
  "derive_more",
- "flume",
  "futures-buffered",
  "futures-lite 2.3.0",
  "futures-util",
@@ -2641,7 +2640,6 @@ dependencies = [
  "dialoguer",
  "dirs-next",
  "duct",
- "flume",
  "futures-buffered",
  "futures-lite 2.3.0",
  "futures-util",
diff --git a/iroh-blobs/src/util/progress.rs b/iroh-blobs/src/util/progress.rs
index 9bfb98d39e6..67428e36851 100644
--- a/iroh-blobs/src/util/progress.rs
+++ b/iroh-blobs/src/util/progress.rs
@@ -488,11 +488,11 @@ impl<T> FlumeProgressSender<T> {
 
 fn get_as_ptr<T>(value: &T) -> Option<usize> {
     use std::mem;
-    if mem::size_of::<T>() == std::mem::size_of::<usize>() && mem::align_of::<T>() == mem::align_of::<usize>() {
+    if mem::size_of::<T>() == std::mem::size_of::<usize>()
+        && mem::align_of::<T>() == mem::align_of::<usize>()
+    {
         // Safe only if size and alignment requirements are met
-        unsafe {
-            Some(mem::transmute_copy(value))
-        }
+        unsafe { Some(mem::transmute_copy(value)) }
     } else {
         None
     }
diff --git a/iroh-cli/Cargo.toml b/iroh-cli/Cargo.toml
index c7ed8af3d6c..d4bd389a4ce 100644
--- a/iroh-cli/Cargo.toml
+++ b/iroh-cli/Cargo.toml
@@ -34,7 +34,6 @@ crossterm = "0.27.0"
 derive_more = { version = "1.0.0-beta.1", features = ["display"] }
 dialoguer = { version = "0.11.0", default-features = false }
 dirs-next = "2.0.0"
-flume = "0.11.0"
 futures-buffered = "0.2.4"
 futures-lite = "2.3"
 futures-util = { version = "0.3.30", features = ["futures-sink"] }
diff --git a/iroh/Cargo.toml b/iroh/Cargo.toml
index a39ac008bd4..642acb8c007 100644
--- a/iroh/Cargo.toml
+++ b/iroh/Cargo.toml
@@ -21,7 +21,6 @@ async-channel = "2.3.1"
 bao-tree = { version = "0.13", features = ["tokio_fsm"], default-features = false }
 bytes = "1"
 derive_more = { version = "1.0.0-beta.6", features = ["debug", "display", "from", "try_into", "from_str"] }
-flume = "0.11"
 futures-buffered = "0.2.4"
 futures-lite = "2.3"
 futures-util = "0.3"