berkus
/
actix-net
mirror of https://github.com/fafhrd91/actix-net
1
0
Fork 0
Code Issues Releases Wiki Activity

apply suggestions from code review

This commit is contained in:
ibraheemdev 2021-06-04 19:47:42 -04:00
parent 50a3013819
commit bb3e4b5c8b
1 changed files with 17 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
actix-router/src/resource.rs
View File

@ -1,6 +1,7 @@
use std::cmp::min; use std::cmp::min;
use std::collections::HashMap; use std::collections::HashMap;
use std::hash::{Hash, Hasher}; use std::hash::{Hash, Hasher};
use std::mem;
use regex::{escape, Regex, RegexSet}; use regex::{escape, Regex, RegexSet};
@ -272,17 +273,14 @@ impl ResourceDef {
true true
} }
PatternType::Dynamic(ref re, ref names, len) => { PatternType::Dynamic(ref re, ref names, len) => {
let mut idx = 0;
let mut pos = 0; let mut pos = 0;
let mut segments: [Option<PathItem>; MAX_DYNAMIC_SEGMENTS] = Default::default(); let mut segments: [PathItem; MAX_DYNAMIC_SEGMENTS] = Default::default();
if let Some(captures) = re.captures(path.path()) { if let Some(captures) = re.captures(path.path()) {
for (no, name) in names.iter().enumerate() { for (no, name) in names.iter().enumerate() {
if let Some(m) = captures.name(&name) { if let Some(m) = captures.name(&name) {
idx += 1;
pos = m.end(); pos = m.end();
segments[no] = segments[no] = PathItem::Segment(m.start() as u16, m.end() as u16);
Some(PathItem::Segment(m.start() as u16, m.end() as u16));
} else { } else {
log::error!( log::error!(
"Dynamic path match but not all segments found: {}", "Dynamic path match but not all segments found: {}",
@ -294,12 +292,8 @@ impl ResourceDef {
} else { } else {
return false; return false;
} }
for (idx, segment) in segments for i in 0..names.len() {
.iter_mut() path.add(names[i], mem::take(&mut segments[i]));
.enumerate()
.take_while(|(i, _)| *i != idx)
{
path.add(names[idx], segment.take().unwrap());
} }
path.skip((pos + len) as u16); path.skip((pos + len) as u16);
true true
@ -307,18 +301,15 @@ impl ResourceDef {
PatternType::DynamicSet(ref re, ref params) => { PatternType::DynamicSet(ref re, ref params) => {
if let Some(idx) = re.matches(path.path()).into_iter().next() { if let Some(idx) = re.matches(path.path()).into_iter().next() {
let (ref pattern, ref names, len) = params[idx]; let (ref pattern, ref names, len) = params[idx];
let mut idx = 0;
let mut pos = 0; let mut pos = 0;
let mut segments: [Option<PathItem>; MAX_DYNAMIC_SEGMENTS] = let mut segments: [PathItem; MAX_DYNAMIC_SEGMENTS] = Default::default();
Default::default();
if let Some(captures) = pattern.captures(path.path()) { if let Some(captures) = pattern.captures(path.path()) {
for (no, name) in names.iter().enumerate() { for (no, name) in names.iter().enumerate() {
if let Some(m) = captures.name(&name) { if let Some(m) = captures.name(&name) {
idx += 1;
pos = m.end(); pos = m.end();
segments[no] = segments[no] =
Some(PathItem::Segment(m.start() as u16, m.end() as u16)); PathItem::Segment(m.start() as u16, m.end() as u16);
} else { } else {
log::error!( log::error!(
"Dynamic path match but not all segments found: {}", "Dynamic path match but not all segments found: {}",
@ -330,12 +321,8 @@ impl ResourceDef {
} else { } else {
return false; return false;
} }
for (idx, segment) in segments for i in 0..names.len() {
.iter_mut() path.add(names[i], mem::take(&mut segments[i]));
.enumerate()
.take_while(|(i, _)| *i != idx)
{
path.add(names[idx], segment.take().unwrap());
} }
path.skip((pos + len) as u16); path.skip((pos + len) as u16);
true true
@ -393,17 +380,14 @@ impl ResourceDef {
true true
} }
PatternType::Dynamic(ref re, ref names, len) => { PatternType::Dynamic(ref re, ref names, len) => {
let mut idx = 0;
let mut pos = 0; let mut pos = 0;
let mut segments: [Option<PathItem>; MAX_DYNAMIC_SEGMENTS] = Default::default(); let mut segments: [PathItem; MAX_DYNAMIC_SEGMENTS] = Default::default();
if let Some(captures) = re.captures(res.resource_path().path()) { if let Some(captures) = re.captures(res.resource_path().path()) {
for (no, name) in names.iter().enumerate() { for (no, name) in names.iter().enumerate() {
if let Some(m) = captures.name(&name) { if let Some(m) = captures.name(&name) {
idx += 1;
pos = m.end(); pos = m.end();
segments[no] = segments[no] = PathItem::Segment(m.start() as u16, m.end() as u16);
Some(PathItem::Segment(m.start() as u16, m.end() as u16));
} else { } else {
log::error!( log::error!(
"Dynamic path match but not all segments found: {}", "Dynamic path match but not all segments found: {}",
@ -421,12 +405,8 @@ impl ResourceDef {
} }
let path = res.resource_path(); let path = res.resource_path();
for (idx, segment) in segments for i in 0..names.len() {
.iter_mut() path.add(names[i], mem::take(&mut segments[i]));
.enumerate()
.take_while(|(i, _)| *i != idx)
{
path.add(names[idx], segment.take().unwrap());
} }
path.skip((pos + len) as u16); path.skip((pos + len) as u16);
true true
@ -435,18 +415,15 @@ impl ResourceDef {
let path = res.resource_path().path(); let path = res.resource_path().path();
if let Some(idx) = re.matches(path).into_iter().next() { if let Some(idx) = re.matches(path).into_iter().next() {
let (ref pattern, ref names, len) = params[idx]; let (ref pattern, ref names, len) = params[idx];
let mut idx = 0;
let mut pos = 0; let mut pos = 0;
let mut segments: [Option<PathItem>; MAX_DYNAMIC_SEGMENTS] = let mut segments: [PathItem; MAX_DYNAMIC_SEGMENTS] = Default::default();
Default::default();
if let Some(captures) = pattern.captures(path) { if let Some(captures) = pattern.captures(path) {
for (no, name) in names.iter().enumerate() { for (no, name) in names.iter().enumerate() {
if let Some(m) = captures.name(&name) { if let Some(m) = captures.name(&name) {
idx += 1;
pos = m.end(); pos = m.end();
segments[no] = segments[no] =
Some(PathItem::Segment(m.start() as u16, m.end() as u16)); PathItem::Segment(m.start() as u16, m.end() as u16);
} else { } else {
log::error!( log::error!(
"Dynamic path match but not all segments found: {}", "Dynamic path match but not all segments found: {}",
@ -464,12 +441,8 @@ impl ResourceDef {
} }
let path = res.resource_path(); let path = res.resource_path();
for (idx, segment) in segments for i in 0..names.len() {
.iter_mut() path.add(names[i], mem::take(&mut segments[i]));
.enumerate()
.take_while(|(i, _)| *i != idx)
{
path.add(names[idx], segment.take().unwrap());
} }
path.skip((pos + len) as u16); path.skip((pos + len) as u16);
true true