From 1e2de3be5dd5acef9fdb4f96dcb784379a61b7a8 Mon Sep 17 00:00:00 2001
From: "Iria.Somobu" <iria.somobu@gmail.com>
Date: Thu, 27 Feb 2025 17:42:09 +0300
Subject: [PATCH] Drop Deref and DerefMut on web::Path

@robjtede: Deref impl [with public Path contents] allowed access to tuple elements like path.1 but then path.0.1 also worked so it was weird.
---
 actix-web-codegen/tests/scopes.rs |  2 +-
 actix-web/src/route.rs            |  4 ++--
 actix-web/src/types/path.rs       | 22 +++++++++-------------
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/actix-web-codegen/tests/scopes.rs b/actix-web-codegen/tests/scopes.rs
index b8c83268..19d3eb38 100644
--- a/actix-web-codegen/tests/scopes.rs
+++ b/actix-web-codegen/tests/scopes.rs
@@ -24,7 +24,7 @@ mod scope_module {
 
     #[get("/twice-test/{value}")]
     pub async fn twice(value: web::Path<String>) -> impl actix_web::Responder {
-        let int_value: i32 = value.parse().unwrap_or(0);
+        let int_value: i32 = value.0.parse().unwrap_or(0);
         let doubled = int_value * 2;
         HttpResponse::Ok().body(format!("Twice value: {}", doubled))
     }
diff --git a/actix-web/src/route.rs b/actix-web/src/route.rs
index e05e6be5..e3f63257 100644
--- a/actix-web/src/route.rs
+++ b/actix-web/src/route.rs
@@ -173,7 +173,7 @@ impl Route {
     ///
     /// /// extract path info using serde
     /// async fn index(info: web::Path<Info>) -> String {
-    ///     format!("Welcome {}!", info.username)
+    ///     format!("Welcome {}!", info.0.username)
     /// }
     ///
     /// let app = App::new().service(
@@ -199,7 +199,7 @@ impl Route {
     ///     query: web::Query<HashMap<String, String>>,
     ///     body: web::Json<Info>
     /// ) -> String {
-    ///     format!("Welcome {}!", path.username)
+    ///     format!("Welcome {}!", path.0.username)
     /// }
     ///
     /// let app = App::new().service(
diff --git a/actix-web/src/types/path.rs b/actix-web/src/types/path.rs
index 3a1fe8cf..cd2b54c5 100644
--- a/actix-web/src/types/path.rs
+++ b/actix-web/src/types/path.rs
@@ -4,7 +4,7 @@ use std::sync::Arc;
 
 use actix_router::PathDeserializer;
 use actix_utils::future::{ready, Ready};
-use derive_more::{AsRef, Deref, DerefMut, Display, From};
+use derive_more::{AsRef, Display, From};
 use serde::de;
 
 use crate::{
@@ -50,10 +50,10 @@ use crate::{
 /// // extract `Info` from a path using serde
 /// #[get("/{name}")]
 /// async fn index(info: web::Path<Info>) -> String {
-///     format!("Welcome {}!", info.name)
+///     format!("Welcome {}!", info.0.name)
 /// }
 /// ```
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Deref, DerefMut, AsRef, Display, From)]
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, AsRef, Display, From)]
 pub struct Path<T>(pub T);
 
 impl<T> Path<T> {
@@ -179,7 +179,7 @@ mod tests {
         resource.capture_match_info(req.match_info_mut());
 
         let (req, mut pl) = req.into_parts();
-        assert_eq!(*Path::<i8>::from_request(&req, &mut pl).await.unwrap(), 32);
+        assert_eq!(Path::<i8>::from_request(&req, &mut pl).await.unwrap().0, 32);
         assert!(Path::<MyStruct>::from_request(&req, &mut pl).await.is_err());
     }
 
@@ -218,17 +218,13 @@ mod tests {
         resource.capture_match_info(req.match_info_mut());
 
         let (req, mut pl) = req.into_parts();
-        let mut s = Path::<MyStruct>::from_request(&req, &mut pl).await.unwrap();
+        let Path(s) = Path::<MyStruct>::from_request(&req, &mut pl).await.unwrap();
         assert_eq!(s.key, "name");
         assert_eq!(s.value, "user1");
-        s.value = "user2".to_string();
-        assert_eq!(s.value, "user2");
         assert_eq!(
             format!("{}, {:?}", s, s),
-            "MyStruct(name, user2), Path(MyStruct { key: \"name\", value: \"user2\" })"
+            "MyStruct(name, user1), MyStruct { key: \"name\", value: \"user1\" }"
         );
-        let s = s.into_inner();
-        assert_eq!(s.value, "user2");
 
         let Path(s) = Path::<(String, String)>::from_request(&req, &mut pl)
             .await
@@ -243,7 +239,7 @@ mod tests {
         let (req, mut pl) = req.into_parts();
         let s = Path::<Test2>::from_request(&req, &mut pl).await.unwrap();
         assert_eq!(s.as_ref().key, "name");
-        assert_eq!(s.value, 32);
+        assert_eq!(s.0.value, 32);
 
         let Path(s) = Path::<(String, u8)>::from_request(&req, &mut pl)
             .await
@@ -251,7 +247,7 @@ mod tests {
         assert_eq!(s.0, "name");
         assert_eq!(s.1, 32);
 
-        let res = Path::<Vec<String>>::from_request(&req, &mut pl)
+        let Path(res) = Path::<Vec<String>>::from_request(&req, &mut pl)
             .await
             .unwrap();
         assert_eq!(res[0], "name".to_owned());
@@ -265,7 +261,7 @@ mod tests {
         resource.capture_match_info(req.match_info_mut());
 
         let (req, mut pl) = req.into_parts();
-        let path_items = Path::<MyStruct>::from_request(&req, &mut pl).await.unwrap();
+        let Path(path_items) = Path::<MyStruct>::from_request(&req, &mut pl).await.unwrap();
         assert_eq!(path_items.key, "na+me");
         assert_eq!(path_items.value, "us/er%42");
         assert_eq!(req.match_info().as_str(), "/na%2Bme/us%2Fer%2542");