aboutsummaryrefslogtreecommitdiff
path: root/src/main.rs
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2020-04-18 19:30:05 +0200
committerAlex Auvolat <alex@adnab.me>2020-04-18 19:30:05 +0200
commitbd1618e78e4c4305a73bdd40004de2abe46c3ceb (patch)
tree8d84b73808a3a968941a59672aae398a61f8d5ff /src/main.rs
parentf41583e1b731574b4bb13a20d4b3fd9fe3a899f5 (diff)
downloadgarage-bd1618e78e4c4305a73bdd40004de2abe46c3ceb.tar.gz
garage-bd1618e78e4c4305a73bdd40004de2abe46c3ceb.zip
Remove proto.rs & move some definitions out of data.rs
Diffstat (limited to 'src/main.rs')
-rw-r--r--src/main.rs7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/main.rs b/src/main.rs
index 84b8c2bc..3e91b21d 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,6 +1,5 @@
mod data;
mod error;
-mod proto;
mod background;
mod membership;
@@ -25,12 +24,10 @@ use std::path::PathBuf;
use std::sync::Arc;
use structopt::StructOpt;
-use data::*;
use error::Error;
-use membership::Message;
-use proto::*;
+use membership::*;
use rpc_client::*;
-use server::TlsConfig;
+use server::{TlsConfig, DEFAULT_TIMEOUT};
#[derive(StructOpt, Debug)]
#[structopt(name = "garage")]