mirrors/actix-web
1
0
Fork 0
mirror of https://github.com/actix/actix-web.git synced 2024-11-03 15:39:50 +00:00
Code Issues Projects Releases Wiki Activity

use Cow for Params type

Browse source
This commit is contained in:
Nikolay Kim 2017-12-27 18:41:09 -08:00
parent 556de72932
commit 19e1c1b75b
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/param.rs
View file

@ -2,6 +2,7 @@ use std;
use std::ops::Index; use std::ops::Index;
use std::path::PathBuf; use std::path::PathBuf;
use std::str::FromStr; use std::str::FromStr;
use std::borrow::Cow;
use smallvec::SmallVec; use smallvec::SmallVec;
use error::{ResponseError, UriSegmentError, ErrorBadRequest}; use error::{ResponseError, UriSegmentError, ErrorBadRequest};
@ -20,7 +21,7 @@ pub trait FromParam: Sized {
/// ///
/// If resource path contains variable patterns, `Params` stores this variables. /// If resource path contains variable patterns, `Params` stores this variables.
#[derive(Debug)] #[derive(Debug)]
pub struct Params<'a>(SmallVec<[(&'a str, &'a str); 3]>); pub struct Params<'a>(SmallVec<[(Cow<'a, str>, Cow<'a, str>); 3]>);
impl<'a> Default for Params<'a> { impl<'a> Default for Params<'a> {
fn default() -> Params<'a> { fn default() -> Params<'a> {
@ -34,8 +35,10 @@ impl<'a> Params<'a> {
self.0.clear(); self.0.clear();
} }
pub(crate) fn add(&mut self, name: &'a str, value: &'a str) { pub(crate) fn add<N, V>(&mut self, name: N, value: V)
self.0.push((name, value)); where N: Into<Cow<'a, str>>, V: Into<Cow<'a, str>>,
{
self.0.push((name.into(), value.into()));
} }
/// Check if there are any matched patterns /// Check if there are any matched patterns
@ -44,10 +47,10 @@ impl<'a> Params<'a> {
} }
/// Get matched parameter by name without type conversion /// Get matched parameter by name without type conversion
pub fn get(&self, key: &str) -> Option<&'a str> { pub fn get(&'a self, key: &str) -> Option<&'a str> {
for item in &self.0 { for item in self.0.iter() {
if key == item.0 { if key == item.0 {
return Some(item.1) return Some(item.1.as_ref())
} }
} }
None None
@ -66,7 +69,7 @@ impl<'a> Params<'a> {
/// } /// }
/// # fn main() {} /// # fn main() {}
/// ``` /// ```
pub fn query<T: FromParam>(&self, key: &str) -> Result<T, <T as FromParam>::Err> pub fn query<T: FromParam>(&'a self, key: &str) -> Result<T, <T as FromParam>::Err>
{ {
if let Some(s) = self.get(key) { if let Some(s) = self.get(key) {
T::from_param(s) T::from_param(s)
@ -76,7 +79,7 @@ impl<'a> Params<'a> {
} }
} }
impl<'a, 'b> Index<&'b str> for Params<'a> { impl<'a, 'b, 'c: 'a> Index<&'b str> for &'c Params<'a> {
type Output = str; type Output = str;
fn index(&self, name: &'b str) -> &str { fn index(&self, name: &'b str) -> &str {

3
src/router.rs
View file

@ -190,7 +190,8 @@ impl Pattern {
for capture in captures.iter() { for capture in captures.iter() {
if let Some(ref m) = capture { if let Some(ref m) = capture {
if idx != 0 { if idx != 0 {
req.match_info_mut().add(&self.names[idx-1], m.as_str()); req.match_info_mut().add(
self.names[idx-1].as_str(), m.as_str());
} }
idx += 1; idx += 1;
} }