summaryrefslogtreecommitdiffstats
path: root/src/pattern
diff options
context:
space:
mode:
authorCanop <cano.petrole@gmail.com>2020-07-26 09:49:45 +0200
committerCanop <cano.petrole@gmail.com>2020-07-26 09:49:45 +0200
commit53cc8f0fa652c7e04d04490c0d6cfd84006c58ed (patch)
tree521320c51166a4289c5bbbceaec8750bc60bfe67 /src/pattern
parent4f2ace728427c4d37cd3996570d14791a5415a20 (diff)
small code cleaning
Diffstat (limited to 'src/pattern')
-rw-r--r--src/pattern/composite_pattern.rs9
-rw-r--r--src/pattern/input_pattern.rs2
-rw-r--r--src/pattern/pattern.rs2
3 files changed, 6 insertions, 7 deletions
diff --git a/src/pattern/composite_pattern.rs b/src/pattern/composite_pattern.rs
index 6e506ad..0e5e823 100644
--- a/src/pattern/composite_pattern.rs
+++ b/src/pattern/composite_pattern.rs
@@ -165,15 +165,14 @@ impl CompositePattern {
}
}
- ///
+ /// return the first content pattern found among atomic patterns
pub fn get_content_pattern(&self) -> Option<&ContentPattern> {
for pattern in self.expr.iter_atoms() {
- match pattern {
- Pattern::Content(cp) => { return Some(&cp); }
- _ => {}
+ if let Pattern::Content(cp) = pattern {
+ return Some(&cp);
}
}
- return None;
+ None
}
}
diff --git a/src/pattern/input_pattern.rs b/src/pattern/input_pattern.rs
index 02e079d..0f02cd5 100644
--- a/src/pattern/input_pattern.rs
+++ b/src/pattern/input_pattern.rs
@@ -53,6 +53,6 @@ impl InputPattern {
raw: rp.to_string(),
pattern: Pattern::NameRegex(rp),
})
- .unwrap_or_else(|| InputPattern::none())
+ .unwrap_or_else(InputPattern::none)
}
}
diff --git a/src/pattern/pattern.rs b/src/pattern/pattern.rs
index 15e32b0..0cde022 100644
--- a/src/pattern/pattern.rs
+++ b/src/pattern/pattern.rs
@@ -162,7 +162,7 @@ impl Pattern {
}
}
- ///
+ /// return the first found content pattern
pub fn get_content_pattern(&self) -> Option<&ContentPattern> {
match self {
Pattern::Content(cp) => Some(cp),