aboutsummaryrefslogtreecommitdiff
path: root/src/tokens.rs
diff options
context:
space:
mode:
authorEric Huss <eric@huss.org>2019-05-08 17:37:38 -0700
committerEric Huss <eric@huss.org>2019-05-08 17:37:38 -0700
commit6c162e6562c3e432bf04c82a3d1d789d80761a86 (patch)
tree5b8b428c5408cb138f5a3674ad33ba8dcb71b460 /src/tokens.rs
parent1b016589133e48d34dd5ae1b440581ded4cb4cdb (diff)
downloadmilf-rs-6c162e6562c3e432bf04c82a3d1d789d80761a86.tar.gz
milf-rs-6c162e6562c3e432bf04c82a3d1d789d80761a86.zip
2018 edition idioms.
Diffstat (limited to 'src/tokens.rs')
-rw-r--r--src/tokens.rs10
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]));
}