From 31ee496621384f9c6d670c32d576411cfcc79bc1 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Tue, 23 Dec 2014 08:01:35 -0800 Subject: Update to rust master --- src/parser.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/parser.rs') diff --git a/src/parser.rs b/src/parser.rs index 750cfec..00eafc3 100644 --- a/src/parser.rs +++ b/src/parser.rs @@ -13,7 +13,7 @@ use Value::{mod, Array, Table, Float, Integer, Boolean, Datetime}; /// list of errors which have occurred during parsing. pub struct Parser<'a> { input: &'a str, - cur: str::CharOffsets<'a>, + cur: str::CharIndices<'a>, /// A list of all errors which have occurred during parsing. /// @@ -471,12 +471,12 @@ impl<'a> Parser<'a> { if self.input.char_at_reverse(end) == '.' { None } else { - from_str::(self.input.slice(start, end)).map(Float) + self.input.slice(start, end).parse().map(Float) } } else if !negative && self.eat('-') { self.datetime(start, end + 1) } else { - from_str::(self.input.slice(start, end)).map(Integer) + self.input.slice(start, end).parse().map(Integer) }; if ret.is_none() { self.errors.push(ParserError { -- cgit v1.2.3