diff options
author | Alex Crichton <alex@alexcrichton.com> | 2018-05-01 08:49:05 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-01 08:49:05 -0500 |
commit | 44bec613697e884df64634536554c611d3135b3b (patch) | |
tree | e4027d86da2ea2cdfe74112a249cfad7d4b32d31 /src/de.rs | |
parent | ffb1b5e0616c6d5aad95752522c94550db8b2967 (diff) | |
parent | 119674e135c5c4993540680263aded9eebad6fc9 (diff) | |
download | milf-rs-44bec613697e884df64634536554c611d3135b3b.tar.gz milf-rs-44bec613697e884df64634536554c611d3135b3b.zip |
Merge pull request #237 from udoprog/spans
Make Tokenizer emit spans
Diffstat (limited to 'src/de.rs')
-rw-r--r-- | src/de.rs | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1025,7 +1025,7 @@ impl<'a> Deserializer<'a> { } fn table_key(&mut self) -> Result<Cow<'a, str>, Error> { - self.tokens.table_key().map_err(|e| self.token_error(e)) + self.tokens.table_key().map(|t| t.1).map_err(|e| self.token_error(e)) } fn eat_whitespace(&mut self) -> Result<(), Error> { @@ -1049,11 +1049,11 @@ impl<'a> Deserializer<'a> { } fn next(&mut self) -> Result<Option<Token<'a>>, Error> { - self.tokens.next().map_err(|e| self.token_error(e)) + self.tokens.next().map(|t| t.map(|t| t.1)).map_err(|e| self.token_error(e)) } fn peek(&mut self) -> Result<Option<Token<'a>>, Error> { - self.tokens.peek().map_err(|e| self.token_error(e)) + self.tokens.peek().map(|t| t.map(|t| t.1)).map_err(|e| self.token_error(e)) } fn eof(&self) -> Error { @@ -1281,7 +1281,7 @@ impl<'a> Header<'a> { if self.first || self.tokens.eat(Token::Period)? { self.first = false; self.tokens.eat_whitespace()?; - self.tokens.table_key().map(Some) + self.tokens.table_key().map(|t| t.1).map(Some) } else { self.tokens.expect(Token::RightBracket)?; if self.array { |