Some minor tweaks

graphql-rust · Sep 26, 2018 · 03dfdd6 · 03dfdd6
1 parent aa357f7
commit 03dfdd6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 17 deletions.
diff --git a/juniper/src/ast.rs b/juniper/src/ast.rs
@@ -102,7 +102,7 @@ pub struct InlineFragment<'a, S> {
 /// ```
 #[derive(Clone, PartialEq, Debug)]
 #[allow(missing_docs)]
-pub enum Selection<'a, S> {
+pub enum Selection<'a, S = DefaultScalarValue> {
     Field(Spanning<Field<'a, S>>),
     FragmentSpread(Spanning<FragmentSpread<'a, S>>),
     InlineFragment(Spanning<InlineFragment<'a, S>>),
@@ -541,35 +541,32 @@ impl<'a, S> VariableDefinitions<'a, S> {
 mod tests {
     use super::InputValue;
     use parser::Spanning;
-    use value::DefaultScalarValue;
-
-    type TestValue = InputValue<DefaultScalarValue>;
 
     #[test]
     fn test_input_value_fmt() {
-        let value: TestValue = InputValue::null();
+        let value: InputValue = InputValue::null();
         assert_eq!(format!("{}", value), "null");
 
-        let value: TestValue = InputValue::scalar(123);
+        let value: InputValue = InputValue::scalar(123);
         assert_eq!(format!("{}", value), "123");
 
-        let value: TestValue = InputValue::scalar(12.3);
+        let value: InputValue = InputValue::scalar(12.3);
         assert_eq!(format!("{}", value), "12.3");
 
-        let value: TestValue = InputValue::scalar("FOO".to_owned());
+        let value: InputValue = InputValue::scalar("FOO".to_owned());
         assert_eq!(format!("{}", value), "\"FOO\"");
 
-        let value: TestValue = InputValue::scalar(true);
+        let value: InputValue = InputValue::scalar(true);
         assert_eq!(format!("{}", value), "true");
 
-        let value: TestValue = InputValue::enum_value("BAR".to_owned());
+        let value: InputValue = InputValue::enum_value("BAR".to_owned());
         assert_eq!(format!("{}", value), "BAR");
 
-        let value: TestValue = InputValue::variable("baz".to_owned());
+        let value: InputValue = InputValue::variable("baz".to_owned());
         assert_eq!(format!("{}", value), "$baz");
 
         let list = vec![InputValue::scalar(1), InputValue::scalar(2)];
-        let value: TestValue = InputValue::list(list);
+        let value: InputValue = InputValue::list(list);
         assert_eq!(format!("{}", value), "[1, 2]");
 
         let object = vec![
@@ -582,7 +579,7 @@ mod tests {
                 Spanning::unlocated(InputValue::scalar(2)),
             ),
         ];
-        let value: TestValue = InputValue::parsed_object(object);
+        let value: InputValue = InputValue::parsed_object(object);
         assert_eq!(format!("{}", value), "{foo: 1, bar: 2}");
     }
 }
diff --git a/juniper/src/executor/look_ahead.rs b/juniper/src/executor/look_ahead.rs
@@ -867,7 +867,7 @@ query Hero {
 
     #[test]
     fn check_complex_query() {
-        let docs = parse_document_source::<DefaultScalarValue>(
+        let docs = parse_document_source(
             "
 query HeroNameAndFriends($id: Integer!, $withFriends: Boolean! = true) {
   hero(id: $id) {

diff --git a/juniper/src/integrations/url.rs b/juniper/src/integrations/url.rs
@@ -1,6 +1,6 @@
 use url::Url;
 
-use value::{ParseScalarValue, ParseScalarResult};
+use value::{ParseScalarResult, ParseScalarValue};
 use Value;
 
 graphql_scalar!(Url where Scalar = <S>{
@@ -23,12 +23,11 @@ graphql_scalar!(Url where Scalar = <S>{
 #[cfg(test)]
 mod test {
     use url::Url;
-    use value::DefaultScalarValue;
 
     #[test]
     fn url_from_input_value() {
         let raw = "https://example.net/";
-        let input: ::InputValue<DefaultScalarValue> = ::InputValue::scalar(raw.to_string());
+        let input: ::InputValue = ::InputValue::scalar(raw.to_string());
 
         let parsed: Url = ::FromInputValue::from_input_value(&input).unwrap();
         let url = Url::parse(raw).unwrap();