diff options
| author | Alex Auvolat <alex@adnab.me> | 2024-02-05 19:27:12 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2024-02-05 19:27:12 +0100 |
| commit | a22bd319202f05bce4ad13072238c7ba81d518fb (patch) | |
| tree | 817d90efaeaa51ea8aebaf5b25ad56c8b968dc0c /src/api/k2v/index.rs | |
| parent | 0bb5b77530ad432e4c77f13b395fe74613812337 (diff) | |
| download | garage-a22bd319202f05bce4ad13072238c7ba81d518fb.tar.gz garage-a22bd319202f05bce4ad13072238c7ba81d518fb.zip | |
[dep-upgrade-202402] migration to http/hyper 1.0 for k2v api
Diffstat (limited to 'src/api/k2v/index.rs')
| -rw-r--r-- | src/api/k2v/index.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/api/k2v/index.rs b/src/api/k2v/index.rs index 6c1d4a91..1baec1db 100644 --- a/src/api/k2v/index.rs +++ b/src/api/k2v/index.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use hyper::{Body, Response}; +use hyper::Response; use serde::Serialize; use garage_util::data::*; @@ -12,6 +12,7 @@ use garage_model::garage::Garage; use garage_model::k2v::item_table::{BYTES, CONFLICTS, ENTRIES, VALUES}; use crate::helpers::*; +use crate::k2v::api_server::ResBody; use crate::k2v::error::*; use crate::k2v::range::read_range; @@ -23,7 +24,7 @@ pub async fn handle_read_index( end: Option<String>, limit: Option<u64>, reverse: Option<bool>, -) -> Result<Response<Body>, Error> { +) -> Result<Response<ResBody>, Error> { let reverse = reverse.unwrap_or(false); let ring: Arc<Ring> = garage.system.ring.borrow().clone(); @@ -68,7 +69,7 @@ pub async fn handle_read_index( next_start, }; - Ok(json_ok_response(&resp)?) + json_ok_response::<Error, _>(&resp) } #[derive(Serialize)] |