From 7c606048f2468b7b76c7efdfd4746b3d337e2dfb Mon Sep 17 00:00:00 2001
From: trinity-1686a <trinity@deuxfleurs.fr>
Date: Wed, 16 Mar 2022 00:41:37 +0100
Subject: [PATCH] accept boxed isolation in StreamPref::set_isolation_group

---
 crates/arti-bench/src/main.rs    | 2 +-
 crates/arti-client/src/client.rs | 4 ++--
 crates/arti/src/socks.rs         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/crates/arti-bench/src/main.rs b/crates/arti-bench/src/main.rs
index 3e98c1398..63e80438c 100644
--- a/crates/arti-bench/src/main.rs
+++ b/crates/arti-bench/src/main.rs
@@ -684,7 +684,7 @@ impl<R: Runtime> Benchmark<R> {
 
         self.run(BenchmarkType::Arti, |run| {
             let mut prefs = arti_client::StreamPrefs::new();
-            prefs.set_isolation_group(iso.next_in(run));
+            prefs.set_isolation_group(Box::new(iso.next_in(run)));
 
             tor_client.connect(addr.clone())
         })
diff --git a/crates/arti-client/src/client.rs b/crates/arti-client/src/client.rs
index da28710cc..77d05c79a 100644
--- a/crates/arti-client/src/client.rs
+++ b/crates/arti-client/src/client.rs
@@ -232,8 +232,8 @@ impl StreamPrefs {
     /// [`TorClient::isolated_client`].  Connections made with an `isolated_client` (and its
     /// clones) will not share circuits with the original client, even if the same
     /// `isolation_group` is specified via the `ConnectionPrefs` in force.
-    pub fn set_isolation_group<T: Isolation>(&mut self, isolation_group: T) -> &mut Self {
-        self.isolation = StreamIsolationPreference::Explicit(Box::new(isolation_group));
+    pub fn set_isolation_group(&mut self, isolation_group: Box<dyn Isolation>) -> &mut Self {
+        self.isolation = StreamIsolationPreference::Explicit(isolation_group);
         self
     }
 
diff --git a/crates/arti/src/socks.rs b/crates/arti/src/socks.rs
index 5e32fba76..25941ccb7 100644
--- a/crates/arti/src/socks.rs
+++ b/crates/arti/src/socks.rs
@@ -176,7 +176,7 @@ See <a href="https://gitlab.torproject.org/tpo/core/arti/#todo-need-to-change-wh
 
     // Determine whether we want to ask for IPv4/IPv6 addresses.
     let mut prefs = stream_preference(&request, &addr);
-    prefs.set_isolation_group(IsolationKey(source_address, ip, auth));
+    prefs.set_isolation_group(Box::new(IsolationKey(source_address, ip, auth)));
 
     match request.command() {
         SocksCmd::CONNECT => {