mirror of https://github.com/fafhrd91/actix-net
fix merge
This commit is contained in:
parent
f96b7fd2d3
commit
11ff2b0b48
|
@ -235,7 +235,7 @@ impl ResourceDef {
|
||||||
if s != path.path() {
|
if s != path.path() {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
(path.len(), None)
|
(path.path().len(), None)
|
||||||
}
|
}
|
||||||
PatternType::Prefix(ref s) => {
|
PatternType::Prefix(ref s) => {
|
||||||
let len = {
|
let len = {
|
||||||
|
@ -254,7 +254,7 @@ impl ResourceDef {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
(min(path.len(), len), None)
|
(min(path.path().len(), len), None)
|
||||||
}
|
}
|
||||||
PatternType::Dynamic(ref re, ref names) => {
|
PatternType::Dynamic(ref re, ref names) => {
|
||||||
let captures = match re.captures(path.path()) {
|
let captures = match re.captures(path.path()) {
|
||||||
|
|
Loading…
Reference in New Issue