@@ -675,7 +675,7 @@ mod tests {
675675 . or_insert ( 0i64 ) ;
676676
677677 assert ! ( result. is_ok( ) ) ;
678- assert_eq ! ( ht. get( "counter" ) . and_then( |v| v . long( ) ) , Some ( 6 ) ) ;
678+ assert_eq ! ( ht. get( "counter" ) . and_then( Zval :: long) , Some ( 6 ) ) ;
679679 } ) ;
680680 }
681681
@@ -693,7 +693,7 @@ mod tests {
693693 . or_insert ( 42i64 ) ;
694694
695695 assert ! ( result. is_ok( ) ) ;
696- assert_eq ! ( ht. get( "key" ) . and_then( |v| v . long( ) ) , Some ( 42 ) ) ;
696+ assert_eq ! ( ht. get( "key" ) . and_then( Zval :: long) , Some ( 42 ) ) ;
697697 } ) ;
698698 }
699699
@@ -704,7 +704,7 @@ mod tests {
704704 let _ = ht. insert ( "key" , "old" ) ;
705705
706706 if let Entry :: Occupied ( mut entry) = ht. entry ( "key" ) {
707- let old = entry. insert ( "new" ) . unwrap ( ) ;
707+ let old = entry. insert ( "new" ) . expect ( "insert should succeed" ) ;
708708 assert_eq ! ( old. str ( ) , Some ( "old" ) ) ;
709709 }
710710 assert_eq ! ( ht. get( "key" ) . and_then( |v| v. str ( ) ) , Some ( "new" ) ) ;
@@ -718,7 +718,7 @@ mod tests {
718718 let _ = ht. insert ( "key" , "value" ) ;
719719
720720 if let Entry :: Occupied ( entry) = ht. entry ( "key" ) {
721- let value = entry. remove ( ) . unwrap ( ) ;
721+ let value = entry. remove ( ) . expect ( "remove should succeed" ) ;
722722 assert_eq ! ( value. str ( ) , Some ( "value" ) ) ;
723723 }
724724 assert ! ( ht. get( "key" ) . is_none( ) ) ;
0 commit comments