extern/bat
1
0
Fork 0
mirror of https://github.com/sharkdp/bat.git synced 2024-11-24 16:53:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Minor codestyle improvements

Browse Source
This commit is contained in:
cyqsimon 2024-01-18 23:07:11 +08:00
parent e4d637a3d8
commit 9f36a7a284
No known key found for this signature in database
GPG Key ID: 1D8CE2F297390D65
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build/syntax_mapping.rs
View File

@ -103,11 +103,11 @@ impl FromStr for Matcher {
}
// guard variable syntax leftover fragments
if non_empty_segments.iter().any(|seg| {
seg.text()
.map(|t| t.contains(['$', '{', '}']))
.unwrap_or(false)
}) {
if non_empty_segments
.iter()
.filter_map(Seg::text)
.any(|t| t.contains(['$', '{', '}']))
{
bail!(r#"Invalid matcher: "{s}""#);
}
@ -121,9 +121,7 @@ impl Matcher {
// if-let guard would be ideal here
// see: https://github.com/rust-lang/rust/issues/51114
1 if self.0[0].is_text() => {
let Some(s) = self.0[0].text() else {
unreachable!()
};
let s = self.0[0].text().unwrap();
format!(r###"Lazy::new(|| Some(build_matcher_fixed(r#"{s}"#)))"###)
}
// parser logic ensures that this case can only happen when there are dynamic segments