File tree Expand file tree Collapse file tree 1 file changed +6
-9
lines changed
Expand file tree Collapse file tree 1 file changed +6
-9
lines changed Original file line number Diff line number Diff line change 4848 target_fields. push ( field) ;
4949 return Ok ( ( ) ) ;
5050 } ;
51-
51+
5252 can_fields_merge ( & matching_field, & field, type_name, field_map) ?;
53-
53+
5454 field. position = field. position . min ( matching_field. position ) ;
5555
5656 field. selection_set . span =
6161 . selection_set
6262 . items
6363 . extend ( matching_field. selection_set . items . clone ( ) ) ;
64-
64+
6565 target_fields[ matching_idx] = field;
6666
6767 Ok ( ( ) )
@@ -150,8 +150,7 @@ pub fn has_same_type_shape(
150150 } else {
151151 return Err ( format ! (
152152 "Fields '{}' on type '{}' conflict because only one is non nullable" ,
153- field_name,
154- type_name,
153+ field_name, type_name,
155154 ) ) ;
156155 }
157156 }
@@ -163,8 +162,7 @@ pub fn has_same_type_shape(
163162 } else {
164163 return Err ( format ! (
165164 "Fields '{}' on type '{}' conflict because only one is a list type" ,
166- field_name,
167- type_name,
165+ field_name, type_name,
168166 ) ) ;
169167 }
170168
@@ -181,8 +179,7 @@ pub fn has_same_type_shape(
181179 } else {
182180 Err ( format ! (
183181 "Fields '{}' on type '{}' conflict due to mismatched types" ,
184- field_name,
185- type_name,
182+ field_name, type_name,
186183 ) )
187184 } ;
188185 }
You can’t perform that action at this time.
0 commit comments