diff options
author | Alex Crichton <alex@alexcrichton.com> | 2019-05-09 06:49:11 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-09 06:49:11 -0700 |
commit | e887edc70f0341cfbf37f646b6213d6fb6e00439 (patch) | |
tree | 63e2a9104a1c0ed297edd2ae41bd4536fde2ce0d /src/tokens.rs | |
parent | 320464be3b014deaaf9387583862b1d4a69d89f8 (diff) | |
parent | 0fca4dd2d30a2044af454cf55211e67cf76f333c (diff) | |
download | milf-rs-e887edc70f0341cfbf37f646b6213d6fb6e00439.tar.gz milf-rs-e887edc70f0341cfbf37f646b6213d6fb6e00439.zip |
Merge pull request #308 from ehuss/edition-2018
Migrate to 2018 edition
Diffstat (limited to 'src/tokens.rs')
-rw-r--r-- | src/tokens.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/tokens.rs b/src/tokens.rs index 6413ce1..f9d3eb4 100644 --- a/src/tokens.rs +++ b/src/tokens.rs @@ -294,8 +294,8 @@ impl<'a> Tokenizer<'a> { &mut self, delim: char, start: usize, - new_ch: &mut FnMut( - &mut Tokenizer, + new_ch: &mut dyn FnMut( + &mut Tokenizer<'_>, &mut MaybeString, bool, usize, @@ -514,7 +514,7 @@ impl MaybeString { } } - fn into_cow(self, input: &str) -> Cow<str> { + fn into_cow(self, input: &str) -> Cow<'_, str> { match self { MaybeString::NotEscaped(start) => Cow::Borrowed(&input[start..]), MaybeString::Owned(s) => Cow::Owned(s), @@ -665,9 +665,9 @@ mod tests { #[test] fn all() { - fn t(input: &str, expected: &[((usize, usize), Token, &str)]) { + fn t(input: &str, expected: &[((usize, usize), Token<'_>, &str)]) { let mut tokens = Tokenizer::new(input); - let mut actual: Vec<((usize, usize), Token, &str)> = Vec::new(); + let mut actual: Vec<((usize, usize), Token<'_>, &str)> = Vec::new(); while let Some((span, token)) = tokens.next().unwrap() { actual.push((span.into(), token, &input[span.start..span.end])); } |