T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated the regex crate to 0.2.2 as per issue #88 (#90)

Browse Source 
* Updated the regex crate to 0.2.2 as per issue #88
* Added potential fix for cryptic CI error.
* Fixed incorrect handling of regex name call.

Fixes #88
This commit is contained in:
Igor
2017-06-03 22:40:53 +03:00
committed by Jakob Stoklund Olesen
parent c1d095de18
commit de0f0e5f0a
3 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/filecheck/src/pattern.rs
View File

@@ -4,7 +4,7 @@ use error::{Error, Result};
use variable::{varname_prefix, VariableMap, Value};
use std::str::FromStr;
use std::fmt::{self, Display, Formatter, Write};
use regex::{Regex, RegexBuilder, quote};
use regex::{Regex, RegexBuilder, escape};
/// A pattern to match as specified in a directive.
///
@@ -313,7 +313,7 @@ impl Pattern {
for part in &self.parts {
match *part {
Part::Text(ref s) => {
out.push_str(&quote(s));
out.push_str(&escape(s));
}
Part::Regex(ref rx) => out.push_str(rx),
Part::Var(ref var) => {
@@ -322,7 +322,7 @@ impl Pattern {
None => {
return Err(Error::UndefVariable(format!("undefined variable ${}", var)))
}
Some(Value::Text(s)) => out.push_str(&quote(&s)),
Some(Value::Text(s)) => out.push_str(&escape(&s)),
// Wrap regex in non-capturing group for safe concatenation.
Some(Value::Regex(rx)) => write!(out, "(?:{})", rx).unwrap(),
}
@@ -335,7 +335,7 @@ impl Pattern {
None => {
return Err(Error::UndefVariable(format!("undefined variable ${}", var)))
}
Some(Value::Text(s)) => write!(out, "{})", quote(&s[..])).unwrap(),
Some(Value::Text(s)) => write!(out, "{})", escape(&s[..])).unwrap(),
Some(Value::Regex(rx)) => write!(out, "{})", rx).unwrap(),
}
}
@@ -353,7 +353,7 @@ impl Pattern {
}
}
Ok(RegexBuilder::new(&out).multi_line(true).compile()?)
Ok(RegexBuilder::new(&out).multi_line(true).build()?)
}
}