@@ -43,8 +43,8 @@ fn insert() {
4343
4444#[ test]
4545fn insert_full ( ) {
46- let insert = vec ! [ 9 , 2 , 7 , 1 , 4 , 6 , 13 ] ;
47- let present = vec ! [ 1 , 6 , 2 ] ;
46+ let insert = [ 9 , 2 , 7 , 1 , 4 , 6 , 13 ] ;
47+ let present = [ 1 , 6 , 2 ] ;
4848 let mut map = IndexMap :: with_capacity ( insert. len ( ) ) ;
4949
5050 for ( i, & elt) in insert. iter ( ) . enumerate ( ) {
@@ -207,10 +207,10 @@ fn reserve() {
207207 assert_eq ! ( map. capacity( ) , capacity) ;
208208 assert_eq ! ( map. get( & i) , Some ( & ( i * i) ) ) ;
209209 }
210- map. insert ( capacity, std :: usize:: MAX ) ;
210+ map. insert ( capacity, usize:: MAX ) ;
211211 assert_eq ! ( map. len( ) , capacity + 1 ) ;
212212 assert ! ( map. capacity( ) > capacity) ;
213- assert_eq ! ( map. get( & capacity) , Some ( & std :: usize :: MAX ) ) ;
213+ assert_eq ! ( map. get( & capacity) , Some ( & usize :: MAX ) ) ;
214214}
215215
216216#[ test]
@@ -230,7 +230,7 @@ fn shrink_to_fit() {
230230 assert_eq ! ( map. len( ) , i) ;
231231 map. insert ( i, i * i) ;
232232 assert_eq ! ( map. len( ) , i + 1 ) ;
233- assert ! ( map. capacity( ) >= i + 1 ) ;
233+ assert ! ( map. capacity( ) > i ) ;
234234 assert_eq ! ( map. get( & i) , Some ( & ( i * i) ) ) ;
235235 map. shrink_to_fit ( ) ;
236236 assert_eq ! ( map. len( ) , i + 1 ) ;
@@ -327,11 +327,11 @@ fn partial_eq_and_eq() {
327327#[ test]
328328fn extend ( ) {
329329 let mut map = IndexMap :: new ( ) ;
330- map. extend ( vec ! [ ( & 1 , & 2 ) , ( & 3 , & 4 ) ] ) ;
331- map. extend ( vec ! [ ( 5 , 6 ) ] ) ;
330+ map. extend ( [ ( & 1 , & 2 ) , ( & 3 , & 4 ) ] ) ;
331+ map. extend ( [ ( 5 , 6 ) ] ) ;
332332 assert_eq ! (
333333 map. into_iter( ) . collect:: <Vec <_>>( ) ,
334- vec! [ ( 1 , 2 ) , ( 3 , 4 ) , ( 5 , 6 ) ]
334+ [ ( 1 , 2 ) , ( 3 , 4 ) , ( 5 , 6 ) ]
335335 ) ;
336336}
337337
@@ -374,18 +374,13 @@ fn entry_and_modify() {
374374fn entry_or_default ( ) {
375375 let mut map = IndexMap :: new ( ) ;
376376
377- #[ derive( Debug , PartialEq ) ]
377+ #[ derive( Debug , Default , PartialEq ) ]
378378 enum TestEnum {
379+ #[ default]
379380 DefaultValue ,
380381 NonDefaultValue ,
381382 }
382383
383- impl Default for TestEnum {
384- fn default ( ) -> Self {
385- TestEnum :: DefaultValue
386- }
387- }
388-
389384 map. insert ( 1 , TestEnum :: NonDefaultValue ) ;
390385 assert_eq ! ( & mut TestEnum :: NonDefaultValue , map. entry( 1 ) . or_default( ) ) ;
391386
@@ -485,8 +480,7 @@ fn from_entries() {
485480
486481#[ test]
487482fn keys ( ) {
488- let vec = vec ! [ ( 1 , 'a' ) , ( 2 , 'b' ) , ( 3 , 'c' ) ] ;
489- let map: IndexMap < _ , _ > = vec. into_iter ( ) . collect ( ) ;
483+ let map = IndexMap :: < _ , _ > :: from_iter ( [ ( 1 , 'a' ) , ( 2 , 'b' ) , ( 3 , 'c' ) ] ) ;
490484 let keys: Vec < _ > = map. keys ( ) . copied ( ) . collect ( ) ;
491485 assert_eq ! ( keys. len( ) , 3 ) ;
492486 assert ! ( keys. contains( & 1 ) ) ;
@@ -496,8 +490,7 @@ fn keys() {
496490
497491#[ test]
498492fn into_keys ( ) {
499- let vec = vec ! [ ( 1 , 'a' ) , ( 2 , 'b' ) , ( 3 , 'c' ) ] ;
500- let map: IndexMap < _ , _ > = vec. into_iter ( ) . collect ( ) ;
493+ let map = IndexMap :: < _ , _ > :: from_iter ( [ ( 1 , 'a' ) , ( 2 , 'b' ) , ( 3 , 'c' ) ] ) ;
501494 let keys: Vec < i32 > = map. into_keys ( ) . collect ( ) ;
502495 assert_eq ! ( keys. len( ) , 3 ) ;
503496 assert ! ( keys. contains( & 1 ) ) ;
@@ -507,8 +500,7 @@ fn into_keys() {
507500
508501#[ test]
509502fn values ( ) {
510- let vec = vec ! [ ( 1 , 'a' ) , ( 2 , 'b' ) , ( 3 , 'c' ) ] ;
511- let map: IndexMap < _ , _ > = vec. into_iter ( ) . collect ( ) ;
503+ let map = IndexMap :: < _ , _ > :: from_iter ( [ ( 1 , 'a' ) , ( 2 , 'b' ) , ( 3 , 'c' ) ] ) ;
512504 let values: Vec < _ > = map. values ( ) . copied ( ) . collect ( ) ;
513505 assert_eq ! ( values. len( ) , 3 ) ;
514506 assert ! ( values. contains( & 'a' ) ) ;
@@ -518,8 +510,7 @@ fn values() {
518510
519511#[ test]
520512fn values_mut ( ) {
521- let vec = vec ! [ ( 1 , 1 ) , ( 2 , 2 ) , ( 3 , 3 ) ] ;
522- let mut map: IndexMap < _ , _ > = vec. into_iter ( ) . collect ( ) ;
513+ let mut map = IndexMap :: < _ , _ > :: from_iter ( [ ( 1 , 1 ) , ( 2 , 2 ) , ( 3 , 3 ) ] ) ;
523514 for value in map. values_mut ( ) {
524515 * value *= 2
525516 }
@@ -532,8 +523,7 @@ fn values_mut() {
532523
533524#[ test]
534525fn into_values ( ) {
535- let vec = vec ! [ ( 1 , 'a' ) , ( 2 , 'b' ) , ( 3 , 'c' ) ] ;
536- let map: IndexMap < _ , _ > = vec. into_iter ( ) . collect ( ) ;
526+ let map = IndexMap :: < _ , _ > :: from_iter ( [ ( 1 , 'a' ) , ( 2 , 'b' ) , ( 3 , 'c' ) ] ) ;
537527 let values: Vec < char > = map. into_values ( ) . collect ( ) ;
538528 assert_eq ! ( values. len( ) , 3 ) ;
539529 assert ! ( values. contains( & 'a' ) ) ;
@@ -698,8 +688,7 @@ fn shift_remove_full() {
698688
699689#[ test]
700690fn sorted_unstable_by ( ) {
701- let mut map: IndexMap < i32 , i32 > = IndexMap :: new ( ) ;
702- map. extend ( vec ! [ ( 1 , 10 ) , ( 2 , 20 ) , ( 3 , 30 ) , ( 4 , 40 ) , ( 5 , 50 ) ] ) ;
691+ let map = IndexMap :: < i32 , i32 > :: from_iter ( [ ( 1 , 10 ) , ( 2 , 20 ) , ( 3 , 30 ) , ( 4 , 40 ) , ( 5 , 50 ) ] ) ;
703692 let sorted = map. sorted_unstable_by ( |_a, b, _c, d| d. cmp ( & b) ) ;
704693
705694 assert_eq ! (
@@ -750,28 +739,24 @@ fn insert_before_oob() {
750739
751740#[ test]
752741fn clear ( ) {
753- let mut map: IndexMap < i32 , i32 > = IndexMap :: new ( ) ;
754- map. extend ( vec ! [ ( 1 , 10 ) , ( 2 , 20 ) , ( 3 , 30 ) , ( 4 , 40 ) , ( 5 , 50 ) ] ) ;
742+ let mut map = IndexMap :: < i32 , i32 > :: from_iter ( [ ( 1 , 10 ) , ( 2 , 20 ) , ( 3 , 30 ) , ( 4 , 40 ) , ( 5 , 50 ) ] ) ;
743+ assert_ne ! ( map. len ( ) , 0 ) ;
755744 map. clear ( ) ;
756745 assert_eq ! ( map. len( ) , 0 ) ;
757746}
758747
759748#[ test]
760749fn get_range ( ) {
761- let mut index_map: IndexMap < i32 , i32 > = IndexMap :: new ( ) ;
762- index_map. insert ( 1 , 10 ) ;
763- index_map. insert ( 2 , 20 ) ;
764- index_map. insert ( 3 , 30 ) ;
765- index_map. insert ( 4 , 40 ) ;
766- index_map. insert ( 5 , 50 ) ;
750+ let map = IndexMap :: < i32 , i32 > :: from_iter ( [ ( 1 , 10 ) , ( 2 , 20 ) , ( 3 , 30 ) , ( 4 , 40 ) , ( 5 , 50 ) ] ) ;
767751
768- let result = index_map . get_range ( 2 ..2 ) ;
752+ let result = map . get_range ( 2 ..2 ) ;
769753 assert ! ( result. unwrap( ) . is_empty( ) ) ;
770754
771- let result = index_map. get_range ( 4 ..2 ) ;
755+ #[ expect( clippy:: reversed_empty_ranges) ]
756+ let result = map. get_range ( 4 ..2 ) ;
772757 assert ! ( result. is_none( ) ) ;
773758
774- let result = index_map . get_range ( 2 ..4 ) ;
759+ let result = map . get_range ( 2 ..4 ) ;
775760 let slice: & Slice < i32 , i32 > = result. unwrap ( ) ;
776761 assert_eq ! ( slice. len( ) , 2 ) ;
777762 assert_eq ! ( slice, & [ ( 3 , 30 ) , ( 4 , 40 ) ] ) ;
@@ -789,6 +774,7 @@ fn get_range_mut() {
789774 let result = index_map. get_range_mut ( 2 ..2 ) ;
790775 assert ! ( result. unwrap( ) . is_empty( ) ) ;
791776
777+ #[ expect( clippy:: reversed_empty_ranges) ]
792778 let result = index_map. get_range_mut ( 4 ..2 ) ;
793779 assert ! ( result. is_none( ) ) ;
794780
0 commit comments