@@ -554,9 +554,13 @@ mod test {
554
554
}
555
555
}
556
556
557
- fn list_funcs ( h : & Hugr ) -> HashMap < & String , ( Node , & FuncDefn ) > {
557
+ fn list_funcs ( h : & Hugr ) -> HashMap < & str , ( Node , & FuncDefn ) > {
558
558
h. entry_descendants ( )
559
- . filter_map ( |n| h. get_optype ( n) . as_func_defn ( ) . map ( |fd| ( & fd. name , ( n, fd) ) ) )
559
+ . filter_map ( |n| {
560
+ h. get_optype ( n)
561
+ . as_func_defn ( )
562
+ . map ( |fd| ( fd. name . as_str ( ) , ( n, fd) ) )
563
+ } )
560
564
. collect :: < HashMap < _ , _ > > ( )
561
565
}
562
566
@@ -603,12 +607,12 @@ mod test {
603
607
let mono_hugr = hugr;
604
608
605
609
let mut funcs = list_funcs ( & mono_hugr) ;
606
- let ( m, _) = funcs. remove ( & "id2" . to_string ( ) ) . unwrap ( ) ;
610
+ let ( m, _) = funcs. remove ( & "id2" ) . unwrap ( ) ;
607
611
assert_eq ! ( m, mono. handle( ) . node( ) ) ;
608
612
assert_eq ! ( mono_hugr. get_parent( m) , Some ( mono_hugr. entrypoint( ) ) ) ;
609
613
// ALAN: TODO: update wrt. mangling policy for name/link_name
610
614
for _ in [ usize_t ( ) , ity ( ) ] {
611
- let ( n, _) = funcs. get ( & "id" . to_string ( ) ) . unwrap ( ) ;
615
+ let ( n, _) = funcs. get ( & "id" ) . unwrap ( ) ;
612
616
assert_eq ! ( mono_hugr. get_parent( * n) , Some ( m) ) ; // Not lifted to top
613
617
}
614
618
Ok ( ( ) )
0 commit comments