@@ -42,9 +42,9 @@ pub fn block_constraints<'c>(context: &'c Context<'c>) -> Option<BTreeSet<BlockC
42
42
let defaults = query
43
43
. variable_definitions
44
44
. iter ( )
45
- . filter ( |d| !vars. 0 . contains_key ( d. name ) )
46
- . filter_map ( |d| Some ( ( d. name , d. default_value . as_ref ( ) ?. to_graphql ( ) ) ) )
47
- . collect :: < BTreeMap < & str , StaticValue > > ( ) ;
45
+ . filter ( |d| !vars. 0 . contains_key ( & d. name ) )
46
+ . filter_map ( |d| Some ( ( d. name . clone ( ) , d. default_value . as_ref ( ) ?. to_graphql ( ) ) ) )
47
+ . collect :: < BTreeMap < String , StaticValue > > ( ) ;
48
48
( & query. selection_set , defaults)
49
49
}
50
50
OperationDefinition :: Query ( _)
@@ -88,9 +88,9 @@ pub fn make_query_deterministic(
88
88
let defaults = query
89
89
. variable_definitions
90
90
. iter ( )
91
- . filter ( |d| !vars. 0 . contains_key ( d. name ) )
92
- . filter_map ( |d| Some ( ( d. name , d. default_value . as_ref ( ) ?. to_graphql ( ) ) ) )
93
- . collect :: < BTreeMap < & str , StaticValue > > ( ) ;
91
+ . filter ( |d| !vars. 0 . contains_key ( & d. name ) )
92
+ . filter_map ( |d| Some ( ( d. name . clone ( ) , d. default_value . as_ref ( ) ?. to_graphql ( ) ) ) )
93
+ . collect :: < BTreeMap < String , StaticValue > > ( ) ;
94
94
( & mut query. selection_set , defaults)
95
95
}
96
96
OperationDefinition :: Query ( _)
@@ -123,7 +123,7 @@ pub fn make_query_deterministic(
123
123
None => {
124
124
selection_field
125
125
. arguments
126
- . push ( ( "block" , deterministic_block ( & latest. hash ) ) ) ;
126
+ . push ( ( "block" . to_string ( ) , deterministic_block ( & latest. hash ) ) ) ;
127
127
}
128
128
} ;
129
129
}
@@ -146,21 +146,21 @@ pub fn make_query_deterministic(
146
146
. ok ( )
147
147
}
148
148
149
- fn deterministic_block < ' c > ( hash : & Bytes32 ) -> Value < ' c , & ' c str > {
149
+ fn deterministic_block < ' c > ( hash : & Bytes32 ) -> Value < ' c , String > {
150
150
Value :: Object ( BTreeMap :: from_iter ( [ (
151
- "hash" ,
151
+ "hash" . to_string ( ) ,
152
152
Value :: String ( hash. to_string ( ) ) ,
153
153
) ] ) )
154
154
}
155
155
156
- fn field_constraint < ' c > (
156
+ fn field_constraint (
157
157
vars : & QueryVariables ,
158
- defaults : & BTreeMap < & str , StaticValue > ,
159
- field : & Value < ' c , & ' c str > ,
158
+ defaults : & BTreeMap < String , StaticValue > ,
159
+ field : & Value < ' _ , String > ,
160
160
) -> Option < BlockConstraint > {
161
161
match field {
162
162
Value :: Object ( fields) => parse_constraint ( vars, defaults, fields) ,
163
- Value :: Variable ( name) => match vars. get ( * name) ? {
163
+ Value :: Variable ( name) => match vars. get ( name) ? {
164
164
Value :: Object ( fields) => parse_constraint ( vars, defaults, fields) ,
165
165
_ => None ,
166
166
} ,
@@ -170,7 +170,7 @@ fn field_constraint<'c>(
170
170
171
171
fn parse_constraint < ' c , T : Text < ' c > > (
172
172
vars : & QueryVariables ,
173
- defaults : & BTreeMap < & str , StaticValue > ,
173
+ defaults : & BTreeMap < String , StaticValue > ,
174
174
fields : & BTreeMap < T :: Value , Value < ' c , T > > ,
175
175
) -> Option < BlockConstraint > {
176
176
let field = fields. iter ( ) . at_most_one ( ) . ok ( ) ?;
@@ -190,7 +190,7 @@ fn parse_constraint<'c, T: Text<'c>>(
190
190
fn parse_hash < ' c , T : Text < ' c > > (
191
191
hash : & Value < ' c , T > ,
192
192
variables : & QueryVariables ,
193
- defaults : & BTreeMap < & str , StaticValue > ,
193
+ defaults : & BTreeMap < String , StaticValue > ,
194
194
) -> Option < Bytes32 > {
195
195
match hash {
196
196
Value :: String ( hash) => hash. parse ( ) . ok ( ) ,
@@ -208,7 +208,7 @@ fn parse_hash<'c, T: Text<'c>>(
208
208
fn parse_number < ' c , T : Text < ' c > > (
209
209
number : & Value < ' c , T > ,
210
210
variables : & QueryVariables ,
211
- defaults : & BTreeMap < & str , StaticValue > ,
211
+ defaults : & BTreeMap < String , StaticValue > ,
212
212
) -> Option < u64 > {
213
213
let n = match number {
214
214
Value :: Int ( n) => n,
0 commit comments