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

2
lib/filecheck/Cargo.toml
View File

@@ -11,4 +11,4 @@ documentation = "https://docs.rs/filecheck"
name = "filecheck"
[dependencies]
regex = "0.1.71"
regex = "0.2.2"

19
lib/filecheck/src/checker.rs
View File

@@ -30,8 +30,8 @@ const DIRECTIVE_RX: &str = r"\b(check|sameln|nextln|unordered|not|regex):\s+(.*)
impl Directive {
/// Create a new directive from a `DIRECTIVE_RX` match.
fn new(caps: Captures) -> Result<Directive> {
let cmd = caps.at(1).expect("group 1 must match");
let rest = caps.at(2).expect("group 2 must match");
let cmd = caps.get(1).map(|m| m.as_str()).expect("group 1 must match");
let rest = caps.get(2).map(|m| m.as_str()).expect("group 2 must match");
if cmd == "regex" {
return Directive::regex(rest);
@@ -208,11 +208,12 @@ impl Checker {
// Verify any pending `not:` directives now that we know their range.
for (not_idx, not_begin, rx) in nots.drain(..) {
state.recorder.directive(not_idx);
if let Some((s, e)) = rx.find(&text[not_begin..match_begin]) {
if let Some(mat) = rx.find(&text[not_begin..match_begin]) {
// Matched `not:` pattern.
state
.recorder
.matched_not(rx.as_str(), (not_begin + s, not_begin + e));
.matched_not(rx.as_str(),
(not_begin + mat.start(), not_begin + mat.end()));
return Ok(false);
} else {
state
@@ -337,23 +338,23 @@ impl<'a> State<'a> {
} else {
// We need the captures to define variables.
rx.captures(txt).map(|caps| {
let matched_range = caps.pos(0).expect("whole expression must match");
let matched_range = caps.get(0).expect("whole expression must match");
for var in defs {
let txtval = caps.name(var).unwrap_or("");
let txtval = caps.name(var).map(|mat| mat.as_str()).unwrap_or("");
self.recorder.defined_var(var, txtval);
let vardef = VarDef {
value: Value::Text(Cow::Borrowed(txtval)),
// This offset is the end of the whole matched pattern, not just the text
// defining the variable.
offset: range.0 + matched_range.1,
offset: range.0 + matched_range.end(),
};
self.vars.insert(var.clone(), vardef);
}
matched_range
})
};
Ok(if let Some((b, e)) = matched_range {
let r = (range.0 + b, range.0 + e);
Ok(if let Some(mat) = matched_range {
let r = (range.0 + mat.start(), range.0 + mat.end());
self.recorder.matched_check(rx.as_str(), r);
Some(r)
} else {

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()?)
}
}