@@ -682,8 +682,7 @@ macro_rules! take_arg {
682682#[ cfg( test) ]
683683mod tests {
684684 use super :: * ;
685- use itertools:: { Diff , diff_with} ;
686- use std:: iter:: FromIterator ;
685+ use itertools:: { Diff , Itertools as _, diff_with} ;
687686
688687 macro_rules! arg {
689688 ( $name: ident( $x: expr) ) => {
@@ -1028,40 +1027,38 @@ mod tests {
10281027 }
10291028 }
10301029
1031- // https://github.com/rust-lang/rust-clippy/issues/6550
1032- #[ allow( clippy:: from_iter_instead_of_collect) ]
10331030 #[ test]
10341031 fn test_argument_into_iter ( ) {
10351032 // Needs type annotation or ascription
10361033 let raw: Argument < ArgData > = arg ! ( Raw ( "value" ) ) ;
10371034 let unknown: Argument < ArgData > = arg ! ( UnknownFlag ( "-foo" ) ) ;
1038- assert_eq ! ( Vec :: from_iter ( raw. iter_os_strings( ) ) , ovec![ "value" ] ) ;
1039- assert_eq ! ( Vec :: from_iter ( unknown. iter_os_strings( ) ) , ovec![ "-foo" ] ) ;
1035+ assert_eq ! ( raw. iter_os_strings( ) . collect_vec ( ) , ovec![ "value" ] ) ;
1036+ assert_eq ! ( unknown. iter_os_strings( ) . collect_vec ( ) , ovec![ "-foo" ] ) ;
10401037 assert_eq ! (
1041- Vec :: from_iter ( arg!( Flag ( "-foo" , FooFlag ) ) . iter_os_strings( ) ) ,
1038+ arg!( Flag ( "-foo" , FooFlag ) ) . iter_os_strings( ) . collect_vec ( ) ,
10421039 ovec![ "-foo" ]
10431040 ) ;
10441041
10451042 let arg = arg ! ( WithValue ( "-foo" , Foo ( "bar" ) , Concatenated ) ) ;
1046- assert_eq ! ( Vec :: from_iter ( arg. iter_os_strings( ) ) , ovec![ "-foobar" ] ) ;
1043+ assert_eq ! ( arg. iter_os_strings( ) . collect_vec ( ) , ovec![ "-foobar" ] ) ;
10471044
10481045 let arg = arg ! ( WithValue ( "-foo" , Foo ( "bar" ) , Concatenated ( b'=' ) ) ) ;
1049- assert_eq ! ( Vec :: from_iter ( arg. iter_os_strings( ) ) , ovec![ "-foo=bar" ] ) ;
1046+ assert_eq ! ( arg. iter_os_strings( ) . collect_vec ( ) , ovec![ "-foo=bar" ] ) ;
10501047
10511048 let arg = arg ! ( WithValue ( "-foo" , Foo ( "bar" ) , CanBeSeparated ) ) ;
1052- assert_eq ! ( Vec :: from_iter ( arg. iter_os_strings( ) ) , ovec![ "-foobar" ] ) ;
1049+ assert_eq ! ( arg. iter_os_strings( ) . collect_vec ( ) , ovec![ "-foobar" ] ) ;
10531050
10541051 let arg = arg ! ( WithValue ( "-foo" , Foo ( "bar" ) , CanBeSeparated ( b'=' ) ) ) ;
1055- assert_eq ! ( Vec :: from_iter ( arg. iter_os_strings( ) ) , ovec![ "-foo=bar" ] ) ;
1052+ assert_eq ! ( arg. iter_os_strings( ) . collect_vec ( ) , ovec![ "-foo=bar" ] ) ;
10561053
10571054 let arg = arg ! ( WithValue ( "-foo" , Foo ( "bar" ) , CanBeConcatenated ) ) ;
1058- assert_eq ! ( Vec :: from_iter ( arg. iter_os_strings( ) ) , ovec![ "-foo" , "bar" ] ) ;
1055+ assert_eq ! ( arg. iter_os_strings( ) . collect_vec ( ) , ovec![ "-foo" , "bar" ] ) ;
10591056
10601057 let arg = arg ! ( WithValue ( "-foo" , Foo ( "bar" ) , CanBeConcatenated ( b'=' ) ) ) ;
1061- assert_eq ! ( Vec :: from_iter ( arg. iter_os_strings( ) ) , ovec![ "-foo" , "bar" ] ) ;
1058+ assert_eq ! ( arg. iter_os_strings( ) . collect_vec ( ) , ovec![ "-foo" , "bar" ] ) ;
10621059
10631060 let arg = arg ! ( WithValue ( "-foo" , Foo ( "bar" ) , Separated ) ) ;
1064- assert_eq ! ( Vec :: from_iter ( arg. iter_os_strings( ) ) , ovec![ "-foo" , "bar" ] ) ;
1061+ assert_eq ! ( arg. iter_os_strings( ) . collect_vec ( ) , ovec![ "-foo" , "bar" ] ) ;
10651062 }
10661063
10671064 #[ test]
0 commit comments