aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2023-01-11 15:17:27 +0100
committerAlex Auvolat <alex@adnab.me>2023-01-11 15:17:27 +0100
commit5b5ca63cf6d108e7bc7d83da68667163a278d30a (patch)
treedb75505000a25a676d0be4476891f7e877c88631
parentcbfae673e83251e988d764d3a29f06f571ba8452 (diff)
downloadgarage-5b5ca63cf6d108e7bc7d83da68667163a278d30a.tar.gz
garage-5b5ca63cf6d108e7bc7d83da68667163a278d30a.zip
Poll cleanup
-rw-r--r--src/k2v-client/Cargo.toml2
-rw-r--r--src/model/k2v/rpc.rs4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/k2v-client/Cargo.toml b/src/k2v-client/Cargo.toml
index d95a1b3f..7ab38e02 100644
--- a/src/k2v-client/Cargo.toml
+++ b/src/k2v-client/Cargo.toml
@@ -15,7 +15,7 @@ log = "0.4"
rusoto_core = { version = "0.48.0", default-features = false, features = ["rustls"] }
rusoto_credential = "0.48.0"
rusoto_signature = "0.48.0"
-hyper-rustls = { version = "0.23", default-features = false, features = [ "http1", "http2", "tls12", "logging" ] }
+hyper-rustls = { version = "0.23", default-features = false, features = [ "http1", "http2", "tls12" ] }
serde = "1.0.137"
serde_json = "1.0.81"
thiserror = "1.0.31"
diff --git a/src/model/k2v/rpc.rs b/src/model/k2v/rpc.rs
index 3b4d7465..f5d8ffc2 100644
--- a/src/model/k2v/rpc.rs
+++ b/src/model/k2v/rpc.rs
@@ -213,7 +213,7 @@ impl K2VRpcHandler {
sort_key: String,
causal_context: CausalContext,
timeout_msec: u64,
- ) -> Result<Option<K2VItem>, HelperError> {
+ ) -> Result<Option<K2VItem>, Error> {
let poll_key = PollKey {
partition: K2VItemPartition {
bucket_id,
@@ -256,7 +256,7 @@ impl K2VRpcHandler {
}
}
K2VRpc::PollItemResponse(None) => (),
- v => return Err(Error::unexpected_rpc_message(v).into()),
+ v => return Err(Error::unexpected_rpc_message(v)),
}
}