Merge branch 'master' into fix-dyn-prefix-match

2021-08-06 18:06:42 +01:00 · 2021-08-06 18:06:42 +01:00 · 4f88775ff1
parent c48780021b 48b2e11509
commit 4f88775ff1
1 changed files with 3 additions and 1 deletions
--- a/actix-router/src/resource.rs
+++ b/actix-router/src/resource.rs
@ -955,7 +955,9 @@ impl ResourceDef {
                }
                _ => false,
            })
-            .expect("malformed dynamic segment");
+            .unwrap_or_else(|| {
+                panic!(r#"path "{}" contains malformed dynamic segment"#, pattern)
+            });

        let (mut param, mut unprocessed) = pattern.split_at(close_idx + 1);