Removing more uneeded regex checks

This commit is contained in:
Matt McCoy 2016-06-21 23:26:13 -04:00
parent eca26018e8
commit c08385e061

View file

@ -175,10 +175,7 @@ impl<T: Read+Write> Client<T> {
} }
fn parse_capability(&mut self, lines: Vec<String>) -> Result<Vec<String>> { fn parse_capability(&mut self, lines: Vec<String>) -> Result<Vec<String>> {
let capability_regex = match Regex::new(r"^\* CAPABILITY (.*)\r\n") { let capability_regex = Regex::new(r"^\* CAPABILITY (.*)\r\n").unwrap();
Ok(re) => re,
Err(err) => panic!("{}", err),
};
//Check Ok //Check Ok
match self.parse_response_ok(lines.clone()) { match self.parse_response_ok(lines.clone()) {
@ -238,7 +235,7 @@ impl<T: Read+Write> Client<T> {
} }
fn parse_response_ok(&mut self, lines: Vec<String>) -> Result<()> { fn parse_response_ok(&mut self, lines: Vec<String>) -> Result<()> {
let ok_regex = Regex::new(r"^([a-zA-Z0-9]+) ([a-zA-Z0-9]+)(.*)"); let ok_regex = Regex::new(r"^([a-zA-Z0-9]+) ([a-zA-Z0-9]+)(.*)").unwrap();
let last_line = lines.last().unwrap(); let last_line = lines.last().unwrap();
for cap in ok_regex.captures_iter(last_line) { for cap in ok_regex.captures_iter(last_line) {