From 11ff2b0b48724b6702774c0cef5cc5f84ff1ada7 Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Thu, 15 Jul 2021 15:17:59 +0100
Subject: [PATCH] fix merge

---
 actix-router/src/resource.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/actix-router/src/resource.rs b/actix-router/src/resource.rs
index d27a4d41..dad2fd89 100644
--- a/actix-router/src/resource.rs
+++ b/actix-router/src/resource.rs
@@ -235,7 +235,7 @@ impl ResourceDef {
                 if s != path.path() {
                     return false;
                 }
-                (path.len(), None)
+                (path.path().len(), None)
             }
             PatternType::Prefix(ref s) => {
                 let len = {
@@ -254,7 +254,7 @@ impl ResourceDef {
                         return false;
                     }
                 };
-                (min(path.len(), len), None)
+                (min(path.path().len(), len), None)
             }
             PatternType::Dynamic(ref re, ref names) => {
                 let captures = match re.captures(path.path()) {