From 2873fc00aadf58dd21d48cb6204c1639109d5ec7 Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Mon, 19 Jul 2021 21:07:47 +0100 Subject: [PATCH] fix changelog --- actix-router/CHANGES.md | 5 +++-- actix-router/src/resource.rs | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/actix-router/CHANGES.md b/actix-router/CHANGES.md index 076696c4..8ce805bf 100644 --- a/actix-router/CHANGES.md +++ b/actix-router/CHANGES.md @@ -11,8 +11,9 @@ * Rename `ResourceDef::{resource_path => resource_path_from_iter}`. [#371] * `ResourceDef::resource_path_from_iter` now takes an `IntoIterator`. [#373] * Rename `ResourceDef::{resource_path_named => resource_path_from_map}`. [#371] -* Rename `ResourceDef::{match_path => is_path_match}`. [#373] -* Rename `ResourceDef::{match_path_checked => is_path_match_fn}`. [#373] +* Rename `ResourceDef::{is_prefix_match => find_match}`. [#373] +* Rename `ResourceDef::{match_path => capture_match_info}`. [#373] +* Rename `ResourceDef::{match_path_checked => capture_match_info_fn}`. [#373] * Remove `ResourceDef::name_mut` and introduce `ResourceDef::set_name`. [#373] * Rename `Router::{*_checked => *_fn}`. [#373] * Return type of `ResourceDef::name` is now `Option<&str>`. [#373] diff --git a/actix-router/src/resource.rs b/actix-router/src/resource.rs index 4abfcf38..58016bb3 100644 --- a/actix-router/src/resource.rs +++ b/actix-router/src/resource.rs @@ -842,10 +842,10 @@ impl ResourceDef { /// assert!(resource.resource_path_from_iter(&mut s, &["123", "my-post"])); /// assert_eq!(s, "/user/123/post/my-post"); /// ``` - pub fn resource_path_from_iter(&self, path: &mut String, values: U) -> bool + pub fn resource_path_from_iter(&self, path: &mut String, values: I) -> bool where - U: IntoIterator, - U::Item: AsRef, + I: IntoIterator, + I::Item: AsRef, { profile_method!(resource_path_from_iter); let mut iter = values.into_iter();