actix/actix-net
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-net synced 2025-06-28 06:20:36 +02:00
Code Issues Releases Wiki Activity

Suppress/fix clippy warnings

Browse Source
This commit is contained in:
Yuki Okushi
2020-01-28 20:27:33 +09:00
parent ee0db9a617
commit d5a6c83207
19 changed files with 50 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
router/src/lib.rs
View File

@ -69,7 +69,7 @@ impl<'a> IntoPattern for &'a str {
}
fn patterns(&self) -> Vec<String> {
vec![self.to_string()]
vec![(*self).to_string()]
}
}
@ -79,7 +79,7 @@ impl<T: AsRef<str>> IntoPattern for Vec<T> {
}
fn patterns(&self) -> Vec<String> {
self.into_iter().map(|v| v.as_ref().to_string()).collect()
self.iter().map(|v| v.as_ref().to_string()).collect()
}
}

23
router/src/resource.rs
View File

@ -294,7 +294,7 @@ impl ResourceDef {
return false;
}
for idx in 0..idx {
path.add(names[idx].clone(), segments[idx]);
path.add(names[idx], segments[idx]);
}
path.skip((pos + len) as u16);
true
@ -326,7 +326,7 @@ impl ResourceDef {
return false;
}
for idx in 0..idx {
path.add(names[idx].clone(), segments[idx]);
path.add(names[idx], segments[idx]);
}
path.skip((pos + len) as u16);
true
@ -413,7 +413,7 @@ impl ResourceDef {
let path = res.resource_path();
for idx in 0..idx {
path.add(names[idx].clone(), segments[idx]);
path.add(names[idx], segments[idx]);
}
path.skip((pos + len) as u16);
true
@ -452,7 +452,7 @@ impl ResourceDef {
let path = res.resource_path();
for idx in 0..idx {
path.add(names[idx].clone(), segments[idx]);
path.add(names[idx], segments[idx]);
}
path.skip((pos + len) as u16);
true
@ -734,6 +734,7 @@ mod tests {
assert_eq!(path.get("id").unwrap(), "012345");
}
#[allow(clippy::cognitive_complexity)]
#[test]
fn test_dynamic_set() {
let re = ResourceDef::new(vec![
@ -899,31 +900,31 @@ mod tests {
fn test_resource_path() {
let mut s = String::new();
let resource = ResourceDef::new("/user/{item1}/test");
assert!(resource.resource_path(&mut s, &mut (&["user1"]).into_iter()));
assert!(resource.resource_path(&mut s, &mut (&["user1"]).iter()));
assert_eq!(s, "/user/user1/test");
let mut s = String::new();
let resource = ResourceDef::new("/user/{item1}/{item2}/test");
assert!(resource.resource_path(&mut s, &mut (&["item", "item2"]).into_iter()));
assert!(resource.resource_path(&mut s, &mut (&["item", "item2"]).iter()));
assert_eq!(s, "/user/item/item2/test");
let mut s = String::new();
let resource = ResourceDef::new("/user/{item1}/{item2}");
assert!(resource.resource_path(&mut s, &mut (&["item", "item2"]).into_iter()));
assert!(resource.resource_path(&mut s, &mut (&["item", "item2"]).iter()));
assert_eq!(s, "/user/item/item2");
let mut s = String::new();
let resource = ResourceDef::new("/user/{item1}/{item2}/");
assert!(resource.resource_path(&mut s, &mut (&["item", "item2"]).into_iter()));
assert!(resource.resource_path(&mut s, &mut (&["item", "item2"]).iter()));
assert_eq!(s, "/user/item/item2/");
let mut s = String::new();
assert!(!resource.resource_path(&mut s, &mut (&["item"]).into_iter()));
assert!(!resource.resource_path(&mut s, &mut (&["item"]).iter()));
let mut s = String::new();
assert!(resource.resource_path(&mut s, &mut (&["item", "item2"]).into_iter()));
assert!(resource.resource_path(&mut s, &mut (&["item", "item2"]).iter()));
assert_eq!(s, "/user/item/item2/");
assert!(!resource.resource_path(&mut s, &mut (&["item"]).into_iter()));
assert!(!resource.resource_path(&mut s, &mut (&["item"]).iter()));
let mut s = String::new();
assert!(resource.resource_path(&mut s, &mut vec!["item", "item2"].into_iter()));

1
router/src/router.rs
View File

@ -104,6 +104,7 @@ mod tests {
use crate::path::Path;
use crate::router::{ResourceId, Router};
#[allow(clippy::cognitive_complexity)]
#[test]
fn test_recognizer_1() {
let mut router = Router::<usize>::build();