Generate Eitherxx variants (#1438)

* Create a drop in replacement for `Either` with `Any` * generate Eitherxx variants * generate Eitherxx variants --------- Co-authored-by: ad hoc <[email protected]>
tursodatabase · Jun 4, 2024 · 07a679e · 07a679e
1 parent 3460edc
commit 07a679e
Show file tree

Hide file tree

Showing 5 changed files with 185 additions and 238 deletions.
diff --git a/libsql-server/src/connection/connection_manager.rs b/libsql-server/src/connection/connection_manager.rs
@@ -19,7 +19,6 @@ use super::libsql::Connection;
 use super::TXN_TIMEOUT;
 
 pub type ConnId = u64;
-
 pub type InnerWalManager = Either<Sqlite3WalManager, LibsqlWalManager<StdIO>>;
 pub type InnerWal = Either<Sqlite3Wal, LibsqlWal<StdIO>>;
 pub type ManagedConnectionWal = WrappedWal<ManagedConnectionWalWrapper, InnerWal>;

diff --git a/libsql-server/src/connection/libsql.rs b/libsql-server/src/connection/libsql.rs
@@ -182,7 +182,7 @@ impl LibSqlConnection<libsql_sys::wal::wrapper::PassthroughWalWrapper> {
             Default::default(),
             Arc::new(|_| unreachable!()),
             ConnectionManager::new(TXN_TIMEOUT),
-            Arc::new(|| Either::Left(Sqlite3WalManager::default())),
+            Arc::new(|| Either::A(Sqlite3WalManager::default())),
         )
         .await
         .unwrap()
@@ -769,7 +769,7 @@ mod test {
             None,
             Default::default(),
             Arc::new(|_| unreachable!()),
-            Arc::new(|| Either::Left(Sqlite3WalManager::default())),
+            Arc::new(|| Either::A(Sqlite3WalManager::default())),
         )
         .await
         .unwrap();
@@ -816,7 +816,7 @@ mod test {
             None,
             Default::default(),
             Arc::new(|_| unreachable!()),
-            Arc::new(|| Either::Left(Sqlite3WalManager::default())),
+            Arc::new(|| Either::A(Sqlite3WalManager::default())),
         )
         .await
         .unwrap();
@@ -867,7 +867,7 @@ mod test {
             None,
             Default::default(),
             Arc::new(|_| unreachable!()),
-            Arc::new(|| Either::Left(Sqlite3WalManager::default())),
+            Arc::new(|| Either::A(Sqlite3WalManager::default())),
         )
         .await
         .unwrap();
@@ -952,7 +952,7 @@ mod test {
             None,
             Default::default(),
             Arc::new(|_| unreachable!()),
-            Arc::new(|| Either::Left(Sqlite3WalManager::default())),
+            Arc::new(|| Either::A(Sqlite3WalManager::default())),
         )
         .await
         .unwrap();
@@ -1038,7 +1038,7 @@ mod test {
             None,
             Default::default(),
             Arc::new(|_| unreachable!()),
-            Arc::new(|| Either::Left(Sqlite3WalManager::default())),
+            Arc::new(|| Either::A(Sqlite3WalManager::default())),
         )
         .await
         .unwrap();

diff --git a/libsql-server/src/lib.rs b/libsql-server/src/lib.rs
@@ -682,11 +682,11 @@ where
             });
 
             tracing::info!("using libsql wal");
-            Ok((Arc::new(move || Either::Right(wal.clone())), shutdown_fut))
+            Ok((Arc::new(move || Either::B(wal.clone())), shutdown_fut))
         } else {
             tracing::info!("using sqlite3 wal");
             Ok((
-                Arc::new(|| Either::Left(Sqlite3WalManager::default())),
+                Arc::new(|| Either::A(Sqlite3WalManager::default())),
                 Box::pin(ready(Ok(()))),
             ))
         }

diff --git a/libsql-server/src/schema/scheduler.rs b/libsql-server/src/schema/scheduler.rs
@@ -896,7 +896,7 @@ mod test {
             bottomless_replication: None,
             scripted_backup: None,
             migration_scheduler,
-            make_wal_manager: Arc::new(|| Either::Left(Sqlite3WalManager::default())),
+            make_wal_manager: Arc::new(|| Either::A(Sqlite3WalManager::default())),
         }
     }