From bfcfa89e9566ef179fae47e62a8f8290ff3a3980 Mon Sep 17 00:00:00 2001 From: Victor Berger Date: Tue, 18 Nov 2014 09:13:21 +0100 Subject: Update to namespaced enum variants. --- src/parser.rs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/parser.rs') diff --git a/src/parser.rs b/src/parser.rs index 921b917..69549e7 100644 --- a/src/parser.rs +++ b/src/parser.rs @@ -4,7 +4,8 @@ use std::error::Error; use std::num::FromStrRadix; use std::str; -use {Array, Table, Value, Float, Integer, Boolean, Datetime, TomlTable}; +use {Value, TomlTable}; +use Value::{Array, Table, Float, Integer, Boolean, Datetime}; /// Parser for converting a string to a TOML `Value` instance. /// @@ -285,7 +286,7 @@ impl<'a> Parser<'a> { self.eat('\n'); } else { // empty - return Some(::String(ret)) + return Some(Value::String(ret)) } } @@ -328,7 +329,7 @@ impl<'a> Parser<'a> { } } - return Some(::String(ret)); + return Some(Value::String(ret)); fn escape(me: &mut Parser, pos: uint, multiline: bool) -> Option { match me.cur.next() { @@ -447,7 +448,7 @@ impl<'a> Parser<'a> { } } - return Some(::String(ret)); + return Some(Value::String(ret)); } fn number_or_datetime(&mut self, start: uint) -> Option { @@ -768,7 +769,8 @@ impl Error for ParserError { #[cfg(test)] mod tests { - use {Table, Parser}; + use Value::Table; + use Parser; #[test] fn crlf() { -- cgit v1.2.3