@@ -9,7 +9,6 @@ use std::sync::Arc;
99
1010use common:: DirectiveName ;
1111use common:: Location ;
12- use common:: PointerAddress ;
1312use common:: WithLocation ;
1413use fnv:: FnvHashMap ;
1514use graphql_ir:: Directive ;
@@ -47,14 +46,11 @@ pub fn generate_typename(program: &Program, is_for_codegen: bool) -> Program {
4746. replace_or_else ( || program. clone ( ) )
4847}
4948
50- // Note on correctness: the PointerAddress here is calculated from addresses of the input
51- // context. Because those value are still referenced, that memory cannot be freed/
52- // reused for the lifetime of the transform.
53- type Seen =FnvHashMap < PointerAddress , Transformed < Selection > > ;
49+ type Seen < ' a > =FnvHashMap < & ' a InlineFragment , Transformed < Selection > > ;
5450
5551struct GenerateTypenameTransform < ' s > {
5652program : & ' s Program ,
57- seen : Seen ,
53+ seen : Seen < ' s > ,
5854is_for_codegen : bool ,
5955parent_type : Option < Type > ,
6056}
@@ -70,22 +66,22 @@ impl<'s> GenerateTypenameTransform<'s> {
7066}
7167}
7268
73- impl < ' s > Transformer < ' _ > for GenerateTypenameTransform < ' s > {
69+ impl < ' s > Transformer < ' s > for GenerateTypenameTransform < ' s > {
7470const NAME : & ' static str ="GenerateTypenameTransform" ;
7571const VISIT_ARGUMENTS : bool =false ;
7672const VISIT_DIRECTIVES : bool =false ;
7773
7874fn transform_operation (
7975& mut self ,
80- operation : & OperationDefinition ,
76+ operation : & ' s OperationDefinition ,
8177) ->Transformed < OperationDefinition > {
8278self . parent_type =Some ( operation. type_ ) ;
8379self . default_transform_operation ( operation)
8480}
8581
8682fn transform_fragment (
8783& mut self ,
88- fragment : & FragmentDefinition ,
84+ fragment : & ' s FragmentDefinition ,
8985) ->Transformed < FragmentDefinition > {
9086self . parent_type =Some ( fragment. type_condition ) ;
9187let schema =& self . program . schema ;
@@ -115,7 +111,7 @@ impl<'s> Transformer<'_> for GenerateTypenameTransform<'s> {
115111}
116112}
117113
118- fn transform_linked_field ( & mut self , field : & LinkedField ) ->Transformed < Selection > {
114+ fn transform_linked_field ( & mut self , field : & ' s LinkedField ) ->Transformed < Selection > {
119115let schema =& self . program . schema ;
120116let field_definition = schema. field ( field. definition . item ) ;
121117let parent_type =self . parent_type ;
@@ -154,12 +150,14 @@ impl<'s> Transformer<'_> for GenerateTypenameTransform<'s> {
154150}
155151}
156152
157- fn transform_inline_fragment ( & mut self , fragment : & InlineFragment ) ->Transformed < Selection > {
158- let key =PointerAddress :: new ( fragment) ;
159- if let Some ( prev) =self . seen . get ( & key) {
153+ fn transform_inline_fragment (
154+ & mut self ,
155+ fragment : & ' s InlineFragment ,
156+ ) ->Transformed < Selection > {
157+ if let Some ( prev) =self . seen . get ( fragment) {
160158return prev. clone ( ) ;
161159}
162- self . seen . insert ( key , Transformed :: Delete ) ;
160+ self . seen . insert ( fragment , Transformed :: Delete ) ;
163161let parent_type =self . parent_type ;
164162if fragment. type_condition . is_some ( ) {
165163self . parent_type = fragment. type_condition ;
@@ -204,7 +202,7 @@ impl<'s> Transformer<'_> for GenerateTypenameTransform<'s> {
204202} ) ) )
205203}
206204} ;
207- self . seen . insert ( key , result. clone ( ) ) ;
205+ self . seen . insert ( fragment , result. clone ( ) ) ;
208206 result
209207}
210208