Skip to content

Refactor #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fundon wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Refactor #47

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7e8a7e6
fix: required parameter should not be empty
fundon Dec 7, 2025
3301efb
Update tests/issues.rs
fundon Dec 7, 2025
e745f09
Update tests/issues.rs
fundon Dec 7, 2025
7e7a6f3
fix: when the node is slash, match its static nodes first
fundon Dec 8, 2025
e1b0195
chore: add no_std back
fundon Dec 8, 2025
1f69b89
chore: remove redundant variables
fundon Dec 8, 2025
6438acd
Merge branch 'main' into refactor
fundon Dec 12, 2025
c3e7b37
chore: remove redundant variables
fundon Dec 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 7 additions & 11 deletions src/node.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,14 +164,13 @@ impl<T: fmt::Debug> Node<T> {

// parameter
if let Some(id) = self.nodes1.as_ref().and_then(|nodes| {
let b = m > 0;
nodes
.iter()
.filter(|node| match node.key {
Key::Parameter(pk)
if pk == Kind::Normal || pk == Kind::OneOrMore =>
{
b
m > 0
}
_ => true,
})
Expand Down Expand Up @@ -250,14 +249,13 @@ impl<T: fmt::Debug> Node<T> {

// parameter => `:a:b:c`
if let Some(id) = self.nodes1.as_ref().and_then(|nodes| {
let b = m - 1 > 0;
nodes
.iter()
.filter(|node| match node.key {
Key::Parameter(pk)
if pk == Kind::Normal || pk == Kind::OneOrMore =>
{
b
m - 1 > 0
}
_ => true,
})
Expand All @@ -271,14 +269,13 @@ impl<T: fmt::Debug> Node<T> {
// parameter => `:a:b?:c?`
if k == &Kind::Optional || k == &Kind::OptionalSegment {
if let Some(id) = self.nodes1.as_ref().and_then(|nodes| {
let b = m > 0;
nodes
.iter()
.filter(|node| match &node.key {
Key::Parameter(pk)
if pk == &Kind::Normal || pk == &Kind::OneOrMore =>
{
b
m > 0
}
_ => true,
})
Expand Down Expand Up @@ -341,7 +338,7 @@ impl<T: fmt::Debug> Node<T> {
if let Key::String(s) = &node.key {
let is_slash = is_one_or_more && s.len() == 1 && s[0] == b'/';
if is_slash {
let r = bytes
if let Some(id) = bytes
.iter()
.enumerate()
.filter_map(|(n, b)| (s[0] == *b).then_some(n))
Expand All @@ -358,10 +355,9 @@ impl<T: fmt::Debug> Node<T> {
})
})
})
});

if r.is_some() {
return r;
})
{
return Some(id);
}
}

Expand Down