diff --git a/juniper/src/executor_tests/interfaces_unions.rs b/juniper/src/executor_tests/interfaces_unions.rs index 1044baaf..c2551215 100644 --- a/juniper/src/executor_tests/interfaces_unions.rs +++ b/juniper/src/executor_tests/interfaces_unions.rs @@ -1,6 +1,6 @@ mod interface { use crate::{ - graphql_interface, graphql_object, + graphql_interface, graphql_object, graphql_value, schema::model::RootNode, types::scalars::{EmptyMutation, EmptySubscription}, GraphQLObject, @@ -96,7 +96,7 @@ mod interface { mod union { use crate::{ - graphql_object, graphql_union, + graphql_object, graphql_union, graphql_value, schema::model::RootNode, types::scalars::{EmptyMutation, EmptySubscription}, }; diff --git a/juniper/src/tests/introspection_tests.rs b/juniper/src/tests/introspection_tests.rs index f4f06491..a887907c 100644 --- a/juniper/src/tests/introspection_tests.rs +++ b/juniper/src/tests/introspection_tests.rs @@ -1,7 +1,7 @@ use std::collections::HashSet; use crate::{ - graphql_vars, + graphql_value, graphql_vars, introspection::IntrospectionFormat, schema::model::RootNode, tests::fixtures::starwars::schema::{Database, Query}, diff --git a/juniper/src/tests/schema_introspection.rs b/juniper/src/tests/schema_introspection.rs index 1e1b03e0..291c85f1 100644 --- a/juniper/src/tests/schema_introspection.rs +++ b/juniper/src/tests/schema_introspection.rs @@ -1,4 +1,4 @@ -use crate::value::Value; +use crate::graphql::{self, Value}; // Sort a nested schema Value. // In particular, lists are sorted by the "name" key of children, if present. @@ -34,7 +34,7 @@ pub(super) fn sort_schema_value(value: &mut Value) { } pub(crate) fn schema_introspection_result() -> Value { - let mut v = graphql_value!({ + let mut v = graphql::value!({ "__schema": { "description": null, "queryType": { @@ -1451,7 +1451,7 @@ pub(crate) fn schema_introspection_result() -> Value { } pub(crate) fn schema_introspection_result_without_descriptions() -> Value { - let mut v = graphql_value!({ + let mut v = graphql::value!({ "__schema": { "queryType": { "name": "Query" diff --git a/juniper_codegen/src/util/mod.rs b/juniper_codegen/src/util/mod.rs index 510c3aeb..d83cc000 100644 --- a/juniper_codegen/src/util/mod.rs +++ b/juniper_codegen/src/util/mod.rs @@ -1144,9 +1144,9 @@ impl GraphQLTypeDefiniton { #where_clause { fn to_input_value(&self) -> ::juniper::InputValue<#scalar> { - ::juniper::InputValue::object(vec![ + ::juniper::InputValue::object([ #( #to_inputs )* - ].into_iter().collect()) + ]) } }