Drop i64 support, add i32 support

This is a breaking change, but having i64 support is both against the
specification and a bad idea when interfacing with e.g. JavaScript or
transmitting it via JSON

Author: mhallin

CHANGELOG.md

@@ -203,7 +203,7 @@ using the macros and not deriving `GraphQLType` directly.
 
   // Each entity has its own context
   struct TopContext {
-    entities: HashMap<i64, EntityContext>,
+    entities: HashMap<i32, EntityContext>,
     db: DatabaseConnection,
   }
 
@@ -219,7 +219,7 @@ using the macros and not deriving `GraphQLType` directly.
     // to switch out the context for the returned value. You can wrap the
     // tuple in Option<>, FieldResult<>, FieldResult<Option<>>, or just return
     // the tuple without wrapping it.
-    field entity(&executor, key: i64) -> Option<(&EntityContext, Entity)> {
+    field entity(&executor, key: i32) -> Option<(&EntityContext, Entity)> {
       executor.context().entities.get(&key)
         .map(|ctx| (ctx, executor.context().db.get_entity(key)))
     }
@@ -247,7 +247,7 @@ using the macros and not deriving `GraphQLType` directly.
 
   ```rust
   graphql_object(MyType: Database |&self| {
-    field count(&executor) -> FieldResult<i64> {
+    field count(&executor) -> FieldResult<i32> {
       let txn = jtry!(executor.context().transaction());
 
       let count = jtry!(txn.execute("SELECT COUNT(*) FROM user"));

src/ast.rs

@@ -37,7 +37,7 @@ pub enum Type<'a> {
 #[allow(missing_docs)]
 pub enum InputValue {
     Null,
-    Int(i64),
+    Int(i32),
     Float(f64),
     String(String),
     Boolean(bool),
@@ -208,7 +208,7 @@ impl InputValue {
     pub fn null() -> InputValue { InputValue::Null }
 
     /// Construct an integer value.
-    pub fn int(i: i64) -> InputValue { InputValue::Int(i) }
+    pub fn int(i: i32) -> InputValue { InputValue::Int(i) }
 
     /// Construct a floating point value.
     pub fn float(f: f64) -> InputValue { InputValue::Float(f) }
@@ -310,7 +310,7 @@ impl InputValue {
     }
 
     /// View the underlying int value, if present.
-    pub fn as_int_value(&self) -> Option<i64> {
+    pub fn as_int_value(&self) -> Option<i32> {
         match *self {
             InputValue::Int(i) => Some(i),
             _ => None,

src/executor_tests/executor.rs

@@ -15,7 +15,7 @@ mod field_execution {
         field e() -> &str { "Egg" }
         field f() -> &str { "Fish" }
 
-        field pic(size: Option<i64>) -> String {
+        field pic(size: Option<i32>) -> String {
             format!("Pic of size: {}", size.unwrap_or(50))
         }
 
@@ -219,7 +219,7 @@ mod dynamic_context_switching {
     }
 
     struct OuterContext {
-        items: HashMap<i64, InnerContext>,
+        items: HashMap<i32, InnerContext>,
     }
 
     impl Context for OuterContext {}
@@ -228,17 +228,17 @@ mod dynamic_context_switching {
     struct ItemRef;
 
     graphql_object!(Schema: OuterContext |&self| {
-        field item_opt(&executor, key: i64) -> Option<(&InnerContext, ItemRef)> {
+        field item_opt(&executor, key: i32) -> Option<(&InnerContext, ItemRef)> {
             executor.context().items.get(&key).map(|c| (c, ItemRef))
         }
 
-        field item_res(&executor, key: i64) -> FieldResult<(&InnerContext, ItemRef)> {
+        field item_res(&executor, key: i32) -> FieldResult<(&InnerContext, ItemRef)> {
             executor.context().items.get(&key)
                 .ok_or(format!("Could not find key {}", key))
                 .map(|c| (c, ItemRef))
         }
 
-        field item_res_opt(&executor, key: i64) -> FieldResult<Option<(&InnerContext, ItemRef)>> {
+        field item_res_opt(&executor, key: i32) -> FieldResult<Option<(&InnerContext, ItemRef)>> {
             if key > 100 {
                 Err(format!("Key too large: {}", key))
             } else {
@@ -247,7 +247,7 @@ mod dynamic_context_switching {
             }
         }
 
-        field item_always(&executor, key: i64) -> (&InnerContext, ItemRef) {
+        field item_always(&executor, key: i32) -> (&InnerContext, ItemRef) {
             executor.context().items.get(&key)
                 .map(|c| (c, ItemRef))
                 .unwrap()

src/executor_tests/introspection.rs

@@ -8,7 +8,7 @@ enum Sample {
     Two,
 }
 
-struct Scalar(i64);
+struct Scalar(i32);
 
 struct Interface {}
 
@@ -51,8 +51,8 @@ graphql_object!(Root: () |&self| {
     }
 
     field sample_scalar(
-        first: i64 as "The first number",
-        second = 123: i64 as "The second number"
+        first: i32 as "The first number",
+        second = 123: i32 as "The second number"
     ) -> Scalar as "A sample scalar field on the object" {
         Scalar(first + second)
     }

src/executor_tests/variables.rs

@@ -53,14 +53,14 @@ graphql_input_object!(
     #[derive(Debug)]
     struct ExampleInputObject {
         a: Option<String>,
-        b: i64,
+        b: i32,
     }
 );
 
 graphql_input_object!(
     #[derive(Debug)]
     struct InputWithDefaults {
-        a = 123: i64,
+        a = 123: i32,
     }
 );
 
@@ -109,7 +109,7 @@ graphql_object!(TestType: () |&self| {
         format!("a: {:?}", arg.a)
     }
 
-    field integer_input(value: i64) -> String {
+    field integer_input(value: i32) -> String {
         format!("value: {}", value)
     }
 

src/integrations/serde.rs

@@ -71,7 +71,7 @@ impl<'de> de::Deserialize<'de> for InputValue {
                 where E: de::Error,
             {
                 if value >= i32::min_value() as i64 && value <= i32::max_value() as i64 {
-                    Ok(InputValue::int(value))
+                    Ok(InputValue::int(value as i32))
                 }
                 else {
                     Err(E::custom(format!("integer out of range")))
@@ -146,7 +146,7 @@ impl ser::Serialize for InputValue {
     {
         match *self {
             InputValue::Null | InputValue::Variable(_) => serializer.serialize_unit(),
-            InputValue::Int(v) => serializer.serialize_i64(v),
+            InputValue::Int(v) => serializer.serialize_i64(v as i64),
             InputValue::Float(v) => serializer.serialize_f64(v),
             InputValue::String(ref v) | InputValue::Enum(ref v) => serializer.serialize_str(v),
             InputValue::Boolean(v) => serializer.serialize_bool(v),
@@ -226,7 +226,7 @@ impl ser::Serialize for Value {
     {
         match *self {
             Value::Null => serializer.serialize_unit(),
-            Value::Int(v) => serializer.serialize_i64(v),
+            Value::Int(v) => serializer.serialize_i64(v as i64),
             Value::Float(v) => serializer.serialize_f64(v),
             Value::String(ref v) => serializer.serialize_str(v),
             Value::Boolean(v) => serializer.serialize_bool(v),

src/macros/input_object.rs

@@ -37,7 +37,7 @@ is similar to argument default values:
 #
 graphql_input_object!(
     struct SampleObject {
-        foo = 123: i64 as "A sample field, defaults to 123 if omitted"
+        foo = 123: i32 as "A sample field, defaults to 123 if omitted"
     }
 );
 

src/macros/object.rs

@@ -79,7 +79,7 @@ graphql_object!(<'a> &'a SomeTrait: () as "SomeTrait" |&self| {
 struct GenericType<T> { items: Vec<T> }
 
 graphql_object!(<T> GenericType<T>: () as "GenericType" |&self| {
-    field count() -> i64 { self.items.len() as i64 }
+    field count() -> i32 { self.items.len() as i32 }
 });
 
 # fn main() { }
@@ -215,9 +215,9 @@ default value, _or_ make the type into an `Option<>`, the argument becomes
 optional. For example:
 
 ```text
-arg_name: i64               -- required
-arg_name: Option<i64>       -- optional, None if unspecified
-arg_name = 123: i64         -- optional, "123" if unspecified
+arg_name: i32               -- required
+arg_name: Option<i32>       -- optional, None if unspecified
+arg_name = 123: i32         -- optional, "123" if unspecified
 ```
 
 Due to some syntactical limitations in the macros, you must parentesize more

src/macros/tests/args.rs

@@ -22,59 +22,59 @@ Syntax to validate:
 graphql_input_object!(
     #[derive(Debug)]
     struct Point {
-        x: i64,
+        x: i32,
     }
 );
 
 graphql_object!(Root: () |&self| {
-    field simple() -> i64 { 0 }
-    field exec_arg(&executor) -> i64 { 0 }
-    field exec_arg_and_more(&executor, arg: i64) -> i64 { 0 }
+    field simple() -> i32 { 0 }
+    field exec_arg(&executor) -> i32 { 0 }
+    field exec_arg_and_more(&executor, arg: i32) -> i32 { 0 }
 
-    field single_arg(arg: i64) -> i64 { 0 }
+    field single_arg(arg: i32) -> i32 { 0 }
     field multi_args(
-        arg1: i64,
-        arg2: i64
-    ) -> i64 { 0 }
+        arg1: i32,
+        arg2: i32
+    ) -> i32 { 0 }
     field multi_args_trailing_comma(
-        arg1: i64,
-        arg2: i64,
-    ) -> i64 { 0 }
+        arg1: i32,
+        arg2: i32,
+    ) -> i32 { 0 }
 
-    field single_arg_descr(arg: i64 as "The arg") -> i64 { 0 }
+    field single_arg_descr(arg: i32 as "The arg") -> i32 { 0 }
     field multi_args_descr(
-        arg1: i64 as "The first arg",
-        arg2: i64 as "The second arg"
-    ) -> i64 { 0 }
+        arg1: i32 as "The first arg",
+        arg2: i32 as "The second arg"
+    ) -> i32 { 0 }
     field multi_args_descr_trailing_comma(
-        arg1: i64 as "The first arg",
-        arg2: i64 as "The second arg",
-    ) -> i64 { 0 }
+        arg1: i32 as "The first arg",
+        arg2: i32 as "The second arg",
+    ) -> i32 { 0 }
 
-    field arg_with_default(arg = 123: i64) -> i64 { 0 }
+    field arg_with_default(arg = 123: i32) -> i32 { 0 }
     field multi_args_with_default(
-        arg1 = 123: i64,
-        arg2 = 456: i64
-    ) -> i64 { 0 }
+        arg1 = 123: i32,
+        arg2 = 456: i32
+    ) -> i32 { 0 }
     field multi_args_with_default_trailing_comma(
-        arg1 = 123: i64,
-        arg2 = 456: i64,
-    ) -> i64 { 0 }
+        arg1 = 123: i32,
+        arg2 = 456: i32,
+    ) -> i32 { 0 }
 
-    field arg_with_default_descr(arg = 123: i64 as "The arg") -> i64 { 0 }
+    field arg_with_default_descr(arg = 123: i32 as "The arg") -> i32 { 0 }
     field multi_args_with_default_descr(
-        arg1 = 123: i64 as "The first arg",
-        arg2 = 456: i64 as "The second arg"
-    ) -> i64 { 0 }
+        arg1 = 123: i32 as "The first arg",
+        arg2 = 456: i32 as "The second arg"
+    ) -> i32 { 0 }
     field multi_args_with_default_trailing_comma_descr(
-        arg1 = 123: i64 as "The first arg",
-        arg2 = 456: i64 as "The second arg",
-    ) -> i64 { 0 }
+        arg1 = 123: i32 as "The first arg",
+        arg2 = 456: i32 as "The second arg",
+    ) -> i32 { 0 }
 
     field args_with_complex_default(
         arg1 = ("test".to_owned()): String as "A string default argument",
         arg2 = (Point { x: 1 }): Point as "An input object default argument",
-    ) -> i64 { 0 }
+    ) -> i32 { 0 }
 });
 
 fn run_args_info_query<F>(field_name: &str, f: F)

src/macros/tests/field.rs

@@ -22,35 +22,35 @@ Syntax to validate:
 */
 
 graphql_object!(Root: () |&self| {
-    field simple() -> i64 { 0 }
+    field simple() -> i32 { 0 }
 
-    field description() -> i64 as "Field description" { 0 }
+    field description() -> i32 as "Field description" { 0 }
 
     field deprecated "Deprecation reason"
-        deprecated() -> i64 { 0 }
+        deprecated() -> i32 { 0 }
 
     field deprecated "Deprecation reason"
-        deprecated_descr() -> i64 as "Field description" { 0 }
+        deprecated_descr() -> i32 as "Field description" { 0 }
 
-    field with_field_result() -> FieldResult<i64> { Ok(0) }
+    field with_field_result() -> FieldResult<i32> { Ok(0) }
 
-    field with_return() -> i64 { return 0; }
+    field with_return() -> i32 { return 0; }
 
-    field with_return_field_result() -> FieldResult<i64> { return Ok(0); }
+    field with_return_field_result() -> FieldResult<i32> { return Ok(0); }
 
     interfaces: [Interface]
 });
 
 graphql_interface!(Interface: () |&self| {
-    field simple() -> i64 { 0 }
+    field simple() -> i32 { 0 }
 
-    field description() -> i64 as "Field description" { 0 }
+    field description() -> i32 as "Field description" { 0 }
 
     field deprecated "Deprecation reason"
-        deprecated() -> i64 { 0 }
+        deprecated() -> i32 { 0 }
 
     field deprecated "Deprecation reason"
-        deprecated_descr() -> i64 as "Field description" { 0 }
+        deprecated_descr() -> i32 as "Field description" { 0 }
 
     instance_resolvers: |&_| {
         Root => Some(Root {}),