diff options
| author | Alex Auvolat <alex@adnab.me> | 2022-02-21 23:10:13 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2022-03-14 10:53:00 +0100 |
| commit | f0d0cd9a20979f59db246e6a545ddc1b7bbb20b3 (patch) | |
| tree | 434ab758dd73b0ef78a511cef39df53dc580b3f1 /src/api | |
| parent | 55d44715998d01563fe830d1dbc35745bc9427bf (diff) | |
| download | garage-f0d0cd9a20979f59db246e6a545ddc1b7bbb20b3.tar.gz garage-f0d0cd9a20979f59db246e6a545ddc1b7bbb20b3.zip | |
Remove strum crate dependency; add protobuf nix dependency
Diffstat (limited to 'src/api')
| -rw-r--r-- | src/api/Cargo.toml | 3 | ||||
| -rw-r--r-- | src/api/api_server.rs | 2 | ||||
| -rw-r--r-- | src/api/s3_router.rs | 4 |
3 files changed, 2 insertions, 7 deletions
diff --git a/src/api/Cargo.toml b/src/api/Cargo.toml index 968e8aab..f39c6d04 100644 --- a/src/api/Cargo.toml +++ b/src/api/Cargo.toml @@ -31,9 +31,6 @@ md-5 = "0.9" nom = "7.1" sha2 = "0.9" -strum = "0.23" -strum_macros = "0.23" - futures = "0.3" futures-util = "0.3" pin-project = "1.0" diff --git a/src/api/api_server.rs b/src/api/api_server.rs index 00d582d1..1bab3aaa 100644 --- a/src/api/api_server.rs +++ b/src/api/api_server.rs @@ -135,7 +135,7 @@ async fn handler_inner(garage: Arc<Garage>, req: Request<Body>) -> Result<Respon Context::current() .span() - .update_name::<String>(format!("S3 API {}", endpoint)); + .update_name::<String>(format!("S3 API {}", endpoint.name())); // Some endpoints are processed early, before we even check for an API key if let Endpoint::PostObject = endpoint { diff --git a/src/api/s3_router.rs b/src/api/s3_router.rs index c325805d..95a7eceb 100644 --- a/src/api/s3_router.rs +++ b/src/api/s3_router.rs @@ -5,8 +5,6 @@ use std::borrow::Cow; use hyper::header::HeaderValue; use hyper::{HeaderMap, Method, Request}; -use strum_macros::Display; - /// This macro is used to generate very repetitive match {} blocks in this module /// It is _not_ made to be used anywhere else macro_rules! s3_match { @@ -135,7 +133,7 @@ s3_match! {@func /// query parameters). Parameters it may receive by header are left out, however headers are /// considered when required to determine between one endpoint or another (for CopyObject and /// UploadObject, for instance). -#[derive(Debug, Clone, PartialEq, Eq, Display)] +#[derive(Debug, Clone, PartialEq, Eq)] pub enum Endpoint { AbortMultipartUpload { key: String, |