wip

salvo-rs · Sep 24, 2024 · 05f1252 · 05f1252
1 parent 6955d72
commit 05f1252
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/crates/core/src/routing/filters/path.rs b/crates/core/src/routing/filters/path.rs
@@ -338,7 +338,7 @@ impl TryFrom<Vec<WispKind>> for CombWisp {
                     is_prev_named = true;
                     if wisp.0.starts_with('*') {
                         is_greedy = true;
-                        let (star_mark, name) = crate::routing::split_greedy_name(&wisp.0);
+                        let (star_mark, name) = crate::routing::split_wild_name(&wisp.0);
                         wild_regex = Some(
                             Regex::new(&format!("(?<{}>.*)", &regex::escape(name)))
                                 .expect("regex should worked"),
@@ -360,7 +360,7 @@ impl TryFrom<Vec<WispKind>> for CombWisp {
                     is_prev_named = false;
                     if wisp.name.starts_with('*') {
                         is_greedy = true;
-                        let (star_mark, name) = crate::routing::split_greedy_name(&wisp.name);
+                        let (star_mark, name) = crate::routing::split_wild_name(&wisp.name);
                         wild_regex = Some(
                             Regex::new(&format!("(?<{}>.*)", &regex::escape(name)))
                                 .expect("regex should work"),

diff --git a/crates/core/src/routing/mod.rs b/crates/core/src/routing/mod.rs
@@ -430,15 +430,15 @@ impl PathParams {
         }
         if name.starts_with('*') {
             self.inner
-                .insert(split_greedy_name(name).1.to_owned(), value);
+                .insert(split_wild_name(name).1.to_owned(), value);
             self.greedy = true;
         } else {
             self.inner.insert(name.to_owned(), value);
         }
     }
 }
 
-pub(crate) fn split_greedy_name(name: &str) -> (&str, &str) {
+pub(crate) fn split_wild_name(name: &str) -> (&str, &str) {
     if name.starts_with("*+") || name.starts_with("*?") || name.starts_with("**") {
         (&name[0..2], &name[2..])
     } else if let Some(stripped) = name.strip_prefix('*') {