merge into master

Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "matchit"
-version = "0.7.1"
+version = "0.7.3"
 license = "MIT AND BSD-3-Clause"
 authors = ["Ibraheem Ahmed <ibraheem@ibraheem.ca>"]
 edition = "2021"
-description = "A blazing fast URL router."
+description = "A high performance, zero-copy URL router."
 categories = ["network-programming", "algorithms"]
 keywords = ["router", "path", "tree", "match", "url"]
 repository = "https://github.com/ibraheemdev/matchit"

README.md

@@ -1,10 +1,10 @@
 # `matchit`
 
-[![Documentation](https://img.shields.io/badge/docs-0.7.1-4d76ae?style=for-the-badge)](https://docs.rs/matchit)
+[![Documentation](https://img.shields.io/badge/docs-0.7.3-4d76ae?style=for-the-badge)](https://docs.rs/matchit)
 [![Version](https://img.shields.io/crates/v/matchit?style=for-the-badge)](https://crates.io/crates/matchit)
 [![License](https://img.shields.io/crates/l/matchit?style=for-the-badge)](https://crates.io/crates/matchit)
 
-A blazing fast URL router.
+A high performance, zero-copy URL router.
 
 ```rust
 use matchit::Router;
@@ -41,7 +41,7 @@ assert!(m.at("/users").is_err());
 
 ### Catch-all Parameters
 
-Catch-all parameters start with `*` and match everything after the `/`. They must always be at the **end** of the route:
+Catch-all parameters start with `*` and match anything until the end of the path. They must always be at the **end** of the route:
 
 ```rust,ignore
 let mut m = Router::new();

src/error.rs

@@ -1,4 +1,4 @@
-use crate::tree::Node;
+use crate::tree::{denormalize_params, Node};
 
 use std::fmt;
 
@@ -43,18 +43,34 @@ impl std::error::Error for InsertError {}
 
 impl InsertError {
     pub(crate) fn conflict<T>(route: &[u8], prefix: &[u8], current: &Node<T>) -> Self {
+        // The new route would have had to replace the current node in the tree.
+        if prefix == current.prefix {
+            let mut route = route.to_owned();
+            denormalize_params(&mut route, &current.param_remapping);
+            return InsertError::Conflict {
+                with: String::from_utf8(route).unwrap(),
+            };
+        }
+
         let mut route = route[..route.len() - prefix.len()].to_owned();
 
         if !route.ends_with(&current.prefix) {
             route.extend_from_slice(&current.prefix);
         }
 
+        let mut last = current;
+        while let Some(node) = last.children.first() {
+            last = node;
+        }
+
         let mut current = current.children.first();
         while let Some(node) = current {
             route.extend_from_slice(&node.prefix);
             current = node.children.first();
         }
 
+        denormalize_params(&mut route, &last.param_remapping);
+
         InsertError::Conflict {
             with: String::from_utf8(route).unwrap(),
         }

src/lib.rs

@@ -1,6 +1,6 @@
 //! # `matchit`
 //!
-//! [![Documentation](https://img.shields.io/badge/docs-0.7.1-4d76ae?style=for-the-badge)](https://docs.rs/matchit)
+//! [![Documentation](https://img.shields.io/badge/docs-0.7.3-4d76ae?style=for-the-badge)](https://docs.rs/matchit)
 //! [![Version](https://img.shields.io/crates/v/matchit?style=for-the-badge)](https://crates.io/crates/matchit)
 //! [![License](https://img.shields.io/crates/l/matchit?style=for-the-badge)](https://crates.io/crates/matchit)
 //!
@@ -45,7 +45,8 @@
 //!
 //! ### Catch-all Parameters
 //!
-//! Catch-all parameters start with `*` and match everything after the `/`. They must always be at the **end** of the route:
+//! Catch-all parameters start with `*` and match anything until the end of the path.
+//! They must always be at the **end** of the route:
 //!
 //! ```rust
 //! # use matchit::Router;

src/params.rs

@@ -139,6 +139,24 @@ impl<'k, 'v> Params<'k, 'v> {
             ParamsKind::Large(vec) => vec.push(param),
         }
     }
+
+    // Transform each key.
+    pub(crate) fn for_each_key_mut(&mut self, f: impl Fn((usize, &mut &'k [u8]))) {
+        match &mut self.kind {
+            ParamsKind::None => {}
+            ParamsKind::Small(arr, len) => arr
+                .iter_mut()
+                .take(*len)
+                .map(|param| &mut param.key)
+                .enumerate()
+                .for_each(f),
+            ParamsKind::Large(vec) => vec
+                .iter_mut()
+                .map(|param| &mut param.key)
+                .enumerate()
+                .for_each(f),
+        }
+    }
 }
 
 /// An iterator over the keys and values of a route's [parameters](crate::Params).