Upgrade rust/crates/regex to 1.5.4
Test: make
Change-Id: I0eab39246dc2aea41a62c15661e350b490f06c1d
diff --git a/src/expand.rs b/src/expand.rs
index 70dbf91..fd9c2d0 100644
--- a/src/expand.rs
+++ b/src/expand.rs
@@ -1,12 +1,12 @@
use std::str;
-use find_byte::find_byte;
+use crate::find_byte::find_byte;
-use re_bytes;
-use re_unicode;
+use crate::re_bytes;
+use crate::re_unicode;
pub fn expand_str(
- caps: &re_unicode::Captures,
+ caps: &re_unicode::Captures<'_>,
mut replacement: &str,
dst: &mut String,
) {
@@ -48,7 +48,7 @@
}
pub fn expand_bytes(
- caps: &re_bytes::Captures,
+ caps: &re_bytes::Captures<'_>,
mut replacement: &[u8],
dst: &mut Vec<u8>,
) {
@@ -125,7 +125,7 @@
/// starting at the beginning of `replacement`.
///
/// If no such valid reference could be found, None is returned.
-fn find_cap_ref(replacement: &[u8]) -> Option<CaptureRef> {
+fn find_cap_ref(replacement: &[u8]) -> Option<CaptureRef<'_>> {
let mut i = 0;
let rep: &[u8] = replacement.as_ref();
if rep.len() <= 1 || rep[0] != b'$' {
@@ -157,7 +157,7 @@
})
}
-fn find_cap_ref_braced(rep: &[u8], mut i: usize) -> Option<CaptureRef> {
+fn find_cap_ref_braced(rep: &[u8], mut i: usize) -> Option<CaptureRef<'_>> {
let start = i;
while rep.get(i).map_or(false, |&b| b != b'}') {
i += 1;