Mirrors/choose
2
0
Fork 0
mirror of https://github.com/theryangeary/choose synced 2024-11-26 21:00:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove repeated Regex compilation

Browse source
This commit is contained in:
Ryan Geary 2019-10-09 18:23:02 -04:00
parent 09ddbb4f65
commit f722cbcbbb
2 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/choice.rs
View file

@ -219,22 +219,13 @@ impl Choice {
&self,
line: &String,
opt: &Opt,
re: &Regex,
handle: &mut BufWriter<std::io::StdoutLock>,
) {
write!(handle, "{}", self.get_choice_slice(line, opt).join(" "));
write!(handle, "{}", self.get_choice_slice(line, opt, re).join(" "));
}
fn get_choice_slice<'a>(&self, line: &'a String, opt: &Opt) -> Vec<&'a str> {
let re = Regex::new(match &opt.field_separator {
Some(s) => s,
None => "[[:space:]]",
})
.unwrap_or_else(|e| {
eprintln!("Failed to compile regular expression: {}", e);
// Exit code of 1 means failed to compile field_separator regex
process::exit(1);
});
fn get_choice_slice<'a>(&self, line: &'a String, opt: &Opt, re: &Regex) -> Vec<&'a str> {
let words = re
.split(line)
.into_iter()

14
src/main.rs
View file

@ -1,5 +1,7 @@
use regex::Regex;
use std::fs::File;
use std::io::{self, BufRead, BufReader, Read, Write};
use std::process;
use structopt::StructOpt;
mod choice;
@ -18,12 +20,22 @@ fn main() {
let lock = stdout.lock();
let mut handle = io::BufWriter::new(lock);
let re = Regex::new(match &opt.field_separator {
Some(s) => s,
None => "[[:space:]]",
})
.unwrap_or_else(|e| {
eprintln!("Failed to compile regular expression: {}", e);
// Exit code of 1 means failed to compile field_separator regex
process::exit(1);
});
let lines = buf.lines();
for line in lines {
match line {
Ok(l) => {
for choice in &opt.choice {
choice.print_choice(&l, &opt, &mut handle);
choice.print_choice(&l, &opt, &re, &mut handle);
}
writeln!(handle, "");
}