From 7d03f8836de8f4dddb41ce1bf01f23bb683e3904 Mon Sep 17 00:00:00 2001
From: Santo Cariotti <santo@dcariotti.me>
Date: Fri, 19 Mar 2021 15:47:59 +0100
Subject: chore: upgrade actix_web to version 3

---
 src/repository/routes.rs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/repository/routes.rs')

diff --git a/src/repository/routes.rs b/src/repository/routes.rs
index 32443b1..d189584 100644
--- a/src/repository/routes.rs
+++ b/src/repository/routes.rs
@@ -27,15 +27,15 @@ async fn index(state: web::Data<AppState>) -> impl Responder {
 /// It is a String, casted in an Uuid format.
 async fn get_repo(
     state: web::Data<AppState>,
-    id: web::Path<(String,)>,
+    id: web::Path<String>,
 ) -> impl Responder {
     // I have to match the &id.0 because if it's not a valid Uuid, the server
     // must response "Repository not found".
     // If I pass a not valid Uuid to Repository::find() it raises an error.
-    let uuid: Uuid = uuid_from_string(&id.0);
+    let uuid: Uuid = uuid_from_string(&id);
 
     let result = Repository::find(state.pool.clone(), &uuid).await;
-    info!(state.log, "GET /repo/{}/", id.0);
+    info!(state.log, "GET /repo/{}/", id);
 
     // `map_err` is also used when repo is not found
     result
@@ -48,9 +48,9 @@ async fn get_repo(
 async fn delete_repo(
     req: HttpRequest,
     state: web::Data<AppState>,
-    id: web::Path<(String,)>,
+    id: web::Path<String>,
 ) -> impl Responder {
-    let uuid: Uuid = uuid_from_string(&id.0);
+    let uuid: Uuid = uuid_from_string(&id);
     match req.headers().get(header::AUTHORIZATION) {
         Some(x)
             if x.to_str().unwrap()
@@ -102,12 +102,12 @@ pub fn config(cfg: &mut web::ServiceConfig) {
     cfg.service(
         web::scope("/repo")
             .service(
-                web::resource("{_:/?}")
+                web::resource("/")
                     .route(web::get().to(index))
                     .route(web::post().to(create_repo)),
             )
             .service(
-                web::resource("/{id}{_:/?}")
+                web::resource("/{id}/")
                     .route(web::get().to(get_repo))
                     .route(web::delete().to(delete_repo)),
             ),
-- 
cgit v1.2.3-18-g5258