From 43abd119cf78d8f9af12816e195e2c2f59bfb318 Mon Sep 17 00:00:00 2001
From: trinity-1686a <trinity@deuxfleurs.fr>
Date: Sat, 12 Mar 2022 16:41:58 +0100
Subject: [PATCH] replace result with either

---
 crates/arti-client/src/client.rs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/crates/arti-client/src/client.rs b/crates/arti-client/src/client.rs
index b54b6ca27..2db3ddd56 100644
--- a/crates/arti-client/src/client.rs
+++ b/crates/arti-client/src/client.rs
@@ -16,6 +16,7 @@ use tor_proto::stream::{DataStream, IpVersionPreference, StreamParameters};
 use tor_rtcompat::{PreferredRuntime, Runtime, SleepProviderExt};
 
 use educe::Educe;
+use futures::future::Either;
 use futures::lock::Mutex as AsyncMutex;
 use futures::stream::StreamExt;
 use futures::task::SpawnExt;
@@ -252,12 +253,12 @@ impl<T> StreamPrefs<T> {
 
     /// Return a token to describe which connections might use
     /// the same circuit as this one.
-    fn isolation_group(&self) -> Option<Result<Arc<T>, IsolationToken>> {
+    fn isolation_group(&self) -> Option<Either<Arc<T>, IsolationToken>> {
         use StreamIsolationPreference as SIP;
         match self.isolation {
             SIP::None => None,
-            SIP::Explicit(ref ig) => Some(Ok(ig.clone())),
-            SIP::EveryStream => Some(Err(IsolationToken::new())),
+            SIP::Explicit(ref ig) => Some(Either::Left(ig.clone())),
+            SIP::EveryStream => Some(Either::Right(IsolationToken::new())),
         }
     }
 
@@ -836,8 +837,8 @@ impl<R: Runtime> TorClient<R> {
             // Consider stream isolation too, if it's set.
             if let Some(tok) = prefs.isolation_group() {
                 match tok {
-                    Ok(tok) => b.stream_token(tok),
-                    Err(tok) => b.stream_token(Arc::new(tok)),
+                    Either::Left(tok) => b.stream_token(tok),
+                    Either::Right(tok) => b.stream_token(Arc::new(tok)),
                 };
             }
             // Failure should be impossible with this builder.