Auto merge of #317 - BurntSushi:fixes, r=BurntSushi

Fixes for #312 and #316

Author: bors

CHANGELOG.md

@@ -52,6 +52,7 @@ Breaking changes for the regex API:
 * The `RegexBuilder` type has switched from owned `self` method receivers to
   `&mut self` method receivers. Most uses will continue to work unchanged, but
   some code may require naming an intermediate variable to hold the builder.
+* The `compile` method on `RegexBuilder` has been renamed to `build`.
 * The free `is_match` function has been removed. It is replaced by compiling
   a `Regex` and calling its `is_match` method.
 * The `PartialEq` and `Eq` impls on `Regex` have been dropped. If you relied

src/re_bytes.rs

@@ -991,9 +991,9 @@ impl<F> Replacer for F where F: FnMut(&Captures) -> Vec<u8> {
 /// and performant (since capture groups don't need to be found).
 ///
 /// `'t` is the lifetime of the literal text.
-pub struct NoExpand<'r>(pub &'r [u8]);
+pub struct NoExpand<'t>(pub &'t [u8]);
 
-impl<'a> Replacer for NoExpand<'a> {
+impl<'t> Replacer for NoExpand<'t> {
     fn replace_append(&mut self, _: &Captures, dst: &mut Vec<u8>) {
         dst.extend_from_slice(self.0);
     }

src/re_unicode.rs

@@ -1190,9 +1190,9 @@ impl<F> Replacer for F where F: FnMut(&Captures) -> String {
 /// and performant (since capture groups don't need to be found).
 ///
 /// `'t` is the lifetime of the literal text.
-pub struct NoExpand<'r>(pub &'r str);
+pub struct NoExpand<'t>(pub &'t str);
 
-impl<'a> Replacer for NoExpand<'a> {
+impl<'t> Replacer for NoExpand<'t> {
     fn replace_append(&mut self, _: &Captures, dst: &mut String) {
         dst.push_str(self.0);
     }