[breaking] Merge pull request #1 from Keats/master

Rename Value::{ListValue, ObjectValue, EnumValue}

Author: tailhook

src/query.rs

@@ -118,9 +118,9 @@ pub enum Value {
     String(String),
     Boolean(bool),
     Null,
-    EnumValue(Name),
-    ListValue(Vec<Value>),
-    ObjectValue(BTreeMap<Name, Value>),
+    Enum(Name),
+    List(Vec<Value>),
+    Object(BTreeMap<Name, Value>),
 }
 
 #[derive(Debug, Clone, PartialEq)]

src/query_format.rs

@@ -245,8 +245,8 @@ impl Displayable for Value {
             Value::Boolean(true) => f.write("true"),
             Value::Boolean(false) => f.write("false"),
             Value::Null => f.write("null"),
-            Value::EnumValue(ref name) => f.write(name),
-            Value::ListValue(ref items) => {
+            Value::Enum(ref name) => f.write(name),
+            Value::List(ref items) => {
                 f.write("[");
                 if items.len() > 0 {
                     items[0].display(f);
@@ -257,7 +257,7 @@ impl Displayable for Value {
                 }
                 f.write("]");
             }
-            Value::ObjectValue(ref items) => {
+            Value::Object(ref items) => {
                 f.write("{");
                 let mut first = true;
                 for (ref name, ref value) in items.iter() {

src/query_grammar.rs

@@ -221,7 +221,7 @@ pub fn plain_value<'a>(input: &mut TokenStream<'a>)
     ident("true").map(|_| Value::Boolean(true))
     .or(ident("false").map(|_| Value::Boolean(false)))
     .or(ident("null").map(|_| Value::Null))
-    .or(name().map(Value::EnumValue))
+    .or(name().map(Value::Enum))
     .or(parser(int_value))
     .or(parser(float_value))
     .or(parser(string_value))
@@ -235,11 +235,11 @@ pub fn value<'a>(input: &mut TokenStream<'a>)
     parser(plain_value)
     .or(punct("$").with(name()).map(Value::Variable))
     .or(punct("[").with(many(parser(value))).skip(punct("]"))
-        .map(|lst| Value::ListValue(lst)))
+        .map(|lst| Value::List(lst)))
     .or(punct("{")
         .with(many(name().skip(punct(":")).and(parser(value))))
         .skip(punct("}"))
-        .map(|lst| Value::ObjectValue(lst)))
+        .map(|lst| Value::Object(lst)))
     .parse_stream(input)
 }
 
@@ -248,11 +248,11 @@ pub fn default_value<'a>(input: &mut TokenStream<'a>)
 {
     parser(plain_value)
     .or(punct("[").with(many(parser(default_value))).skip(punct("]"))
-        .map(|lst| Value::ListValue(lst)))
+        .map(|lst| Value::List(lst)))
     .or(punct("{")
         .with(many(name().skip(punct(":")).and(parser(default_value))))
         .skip(punct("}"))
-        .map(|map| Value::ObjectValue(map)))
+        .map(|map| Value::Object(map)))
     .parse_stream(input)
 }