diff options
Diffstat (limited to 'src/table')
-rw-r--r-- | src/table/table.rs | 3 | ||||
-rw-r--r-- | src/table/table_fullcopy.rs | 3 | ||||
-rw-r--r-- | src/table/table_sharded.rs | 3 | ||||
-rw-r--r-- | src/table/table_sync.rs | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/src/table/table.rs b/src/table/table.rs index acb46325..300e400f 100644 --- a/src/table/table.rs +++ b/src/table/table.rs @@ -12,7 +12,8 @@ use serde_bytes::ByteBuf; use garage_util::data::*; use garage_util::error::Error; -use garage_rpc::membership::{Ring, System}; +use garage_rpc::membership::System; +use garage_rpc::ring::Ring; use garage_rpc::rpc_client::*; use garage_rpc::rpc_server::*; diff --git a/src/table/table_fullcopy.rs b/src/table/table_fullcopy.rs index a6c78a63..4659cb2c 100644 --- a/src/table/table_fullcopy.rs +++ b/src/table/table_fullcopy.rs @@ -1,7 +1,8 @@ use arc_swap::ArcSwapOption; use std::sync::Arc; -use garage_rpc::membership::{Ring, System}; +use garage_rpc::membership::{System}; +use garage_rpc::ring::Ring; use garage_util::data::*; use crate::*; diff --git a/src/table/table_sharded.rs b/src/table/table_sharded.rs index 88856542..4f98902d 100644 --- a/src/table/table_sharded.rs +++ b/src/table/table_sharded.rs @@ -1,4 +1,5 @@ -use garage_rpc::membership::{Ring, System}; +use garage_rpc::membership::{System}; +use garage_rpc::ring::Ring; use garage_util::data::*; use crate::*; diff --git a/src/table/table_sync.rs b/src/table/table_sync.rs index 6c0df15b..3c667985 100644 --- a/src/table/table_sync.rs +++ b/src/table/table_sync.rs @@ -12,7 +12,7 @@ use serde_bytes::ByteBuf; use tokio::sync::Mutex; use tokio::sync::{mpsc, watch}; -use garage_rpc::membership::Ring; +use garage_rpc::ring::Ring; use garage_util::data::*; use garage_util::error::Error; |