hatter/finding
1
0
Fork 0
mirror of https://github.com/jht5945/finding.git synced 2025-12-27 13:20:03 +08:00
Code Issues Releases Wiki Activity

use iter any

Browse Source
This commit is contained in:
Hatter Jiang
2020-04-28 00:38:05 +08:00
parent 6b7c2b3759
commit 93d39ecd50
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main.rs
View File

@@ -124,7 +124,7 @@ fn match_lines(tag: &str, content: &str, options: &Options) -> bool {
let ss: Vec<&str> = match_line.line_string.split(search_text).collect(); let ss: Vec<&str> = match_line.line_string.split(search_text).collect();
for j in 0..ss.len() { for j in 0..ss.len() {
print!("{}", ss[j]); print!("{}", ss[j]);
if j < ss.len() -1 { if j < ss.len() - 1 {
print_color(Some(term::color::RED), true, search_text); print_color(Some(term::color::RED), true, search_text);
} }
} }
@@ -143,8 +143,8 @@ fn find_text_files(options: &Options, dir_path: &Path) {
if options.ignore_case { if options.ignore_case {
print_message(MessageType::WARN, "Using ignore case mode, highlight print is disabled."); print_message(MessageType::WARN, "Using ignore case mode, highlight print is disabled.");
} }
let file_exts = match options.file_ext.as_str() { let file_exts = match &options.file_ext {
"" => vec![], ext if ext.is_empty() => vec![],
ext => ext.split(',').map(|s| s.trim()).filter(|s| !s.is_empty()).map(|s| ".".to_owned() + s).collect(), ext => ext.split(',').map(|s| s.trim()).filter(|s| !s.is_empty()).map(|s| ".".to_owned() + s).collect(),
}; };
let total_file_count_cell = RefCell::new(0u64); let total_file_count_cell = RefCell::new(0u64);
@@ -158,14 +158,7 @@ fn find_text_files(options: &Options, dir_path: &Path) {
Some(s) => s, None => return, Some(s) => s, None => return,
}; };
if !file_exts.is_empty() { if !file_exts.is_empty() {
let mut file_ext_matches = false; if !file_exts.iter().any(|file_ext| p_str.to_lowercase().ends_with(file_ext)) {
for file_ext in &file_exts {
if p_str.to_lowercase().ends_with(file_ext) {
file_ext_matches = true;
break;
}
}
if !file_ext_matches {
return; return;
} }
} }