@@ -2507,12 +2507,10 @@ impl fmt::Display for TryFromIntError {
2507
2507
macro_rules! try_from_unbounded {
2508
2508
( $source: ty, $( $target: ty) ,* ) => { $(
2509
2509
#[ unstable( feature = "try_from" , issue = "33417" ) ]
2510
- impl TryFrom <$source> for $target {
2511
- type Error = TryFromIntError ;
2512
-
2510
+ impl From <$source> for $target {
2513
2511
#[ inline]
2514
- fn try_from ( u : $source) -> Result < $target, TryFromIntError > {
2515
- Ok ( u as $target)
2512
+ fn from ( value : $source) -> $target {
2513
+ value as $target
2516
2514
}
2517
2515
}
2518
2516
) * }
@@ -2584,31 +2582,17 @@ macro_rules! rev {
2584
2582
}
2585
2583
2586
2584
/// intra-sign conversions
2587
- try_from_unbounded ! ( u8 , u8 , u16 , u32 , u64 , u128 ) ;
2588
- try_from_unbounded ! ( u16 , u16 , u32 , u64 , u128 ) ;
2589
- try_from_unbounded ! ( u32 , u32 , u64 , u128 ) ;
2590
- try_from_unbounded ! ( u64 , u64 , u128 ) ;
2591
- try_from_unbounded ! ( u128 , u128 ) ;
2592
2585
try_from_upper_bounded ! ( u16 , u8 ) ;
2593
2586
try_from_upper_bounded ! ( u32 , u16 , u8 ) ;
2594
2587
try_from_upper_bounded ! ( u64 , u32 , u16 , u8 ) ;
2595
2588
try_from_upper_bounded ! ( u128 , u64 , u32 , u16 , u8 ) ;
2596
2589
2597
- try_from_unbounded ! ( i8 , i8 , i16 , i32 , i64 , i128 ) ;
2598
- try_from_unbounded ! ( i16 , i16 , i32 , i64 , i128 ) ;
2599
- try_from_unbounded ! ( i32 , i32 , i64 , i128 ) ;
2600
- try_from_unbounded ! ( i64 , i64 , i128 ) ;
2601
- try_from_unbounded ! ( i128 , i128 ) ;
2602
2590
try_from_both_bounded ! ( i16 , i8 ) ;
2603
2591
try_from_both_bounded ! ( i32 , i16 , i8 ) ;
2604
2592
try_from_both_bounded ! ( i64 , i32 , i16 , i8 ) ;
2605
2593
try_from_both_bounded ! ( i128 , i64 , i32 , i16 , i8 ) ;
2606
2594
2607
2595
// unsigned-to-signed
2608
- try_from_unbounded ! ( u8 , i16 , i32 , i64 , i128 ) ;
2609
- try_from_unbounded ! ( u16 , i32 , i64 , i128 ) ;
2610
- try_from_unbounded ! ( u32 , i64 , i128 ) ;
2611
- try_from_unbounded ! ( u64 , i128 ) ;
2612
2596
try_from_upper_bounded ! ( u8 , i8 ) ;
2613
2597
try_from_upper_bounded ! ( u16 , i8 , i16 ) ;
2614
2598
try_from_upper_bounded ! ( u32 , i8 , i16 , i32 ) ;
@@ -2627,10 +2611,8 @@ try_from_both_bounded!(i64, u32, u16, u8);
2627
2611
try_from_both_bounded ! ( i128 , u64 , u32 , u16 , u8 ) ;
2628
2612
2629
2613
// usize/isize
2630
- try_from_unbounded ! ( usize , usize ) ;
2631
2614
try_from_upper_bounded ! ( usize , isize ) ;
2632
2615
try_from_lower_bounded ! ( isize , usize ) ;
2633
- try_from_unbounded ! ( isize , isize ) ;
2634
2616
2635
2617
#[ cfg( target_pointer_width = "16" ) ]
2636
2618
mod ptr_try_from_impls {
@@ -2647,14 +2629,14 @@ mod ptr_try_from_impls {
2647
2629
try_from_both_bounded ! ( isize , i8 ) ;
2648
2630
try_from_unbounded ! ( isize , i16 , i32 , i64 , i128 ) ;
2649
2631
2650
- rev ! ( try_from_unbounded, usize , u8 , u16 ) ;
2632
+ rev ! ( try_from_unbounded, usize , u16 ) ;
2651
2633
rev ! ( try_from_upper_bounded, usize , u32 , u64 , u128 ) ;
2652
2634
rev ! ( try_from_lower_bounded, usize , i8 , i16 ) ;
2653
2635
rev ! ( try_from_both_bounded, usize , i32 , i64 , i128 ) ;
2654
2636
2655
2637
rev ! ( try_from_unbounded, isize , u8 ) ;
2656
2638
rev ! ( try_from_upper_bounded, isize , u16 , u32 , u64 , u128 ) ;
2657
- rev ! ( try_from_unbounded, isize , i8 , i16 ) ;
2639
+ rev ! ( try_from_unbounded, isize , i16 ) ;
2658
2640
rev ! ( try_from_both_bounded, isize , i32 , i64 , i128 ) ;
2659
2641
}
2660
2642
@@ -2673,14 +2655,14 @@ mod ptr_try_from_impls {
2673
2655
try_from_both_bounded ! ( isize , i8 , i16 ) ;
2674
2656
try_from_unbounded ! ( isize , i32 , i64 , i128 ) ;
2675
2657
2676
- rev ! ( try_from_unbounded, usize , u8 , u16 , u32 ) ;
2658
+ rev ! ( try_from_unbounded, usize , u16 , u32 ) ;
2677
2659
rev ! ( try_from_upper_bounded, usize , u64 , u128 ) ;
2678
2660
rev ! ( try_from_lower_bounded, usize , i8 , i16 , i32 ) ;
2679
2661
rev ! ( try_from_both_bounded, usize , i64 , i128 ) ;
2680
2662
2681
2663
rev ! ( try_from_unbounded, isize , u8 , u16 ) ;
2682
2664
rev ! ( try_from_upper_bounded, isize , u32 , u64 , u128 ) ;
2683
- rev ! ( try_from_unbounded, isize , i8 , i16 , i32 ) ;
2665
+ rev ! ( try_from_unbounded, isize , i16 , i32 ) ;
2684
2666
rev ! ( try_from_both_bounded, isize , i64 , i128 ) ;
2685
2667
}
2686
2668
@@ -2699,14 +2681,14 @@ mod ptr_try_from_impls {
2699
2681
try_from_both_bounded ! ( isize , i8 , i16 , i32 ) ;
2700
2682
try_from_unbounded ! ( isize , i64 , i128 ) ;
2701
2683
2702
- rev ! ( try_from_unbounded, usize , u8 , u16 , u32 , u64 ) ;
2684
+ rev ! ( try_from_unbounded, usize , u16 , u32 , u64 ) ;
2703
2685
rev ! ( try_from_upper_bounded, usize , u128 ) ;
2704
2686
rev ! ( try_from_lower_bounded, usize , i8 , i16 , i32 , i64 ) ;
2705
2687
rev ! ( try_from_both_bounded, usize , i128 ) ;
2706
2688
2707
2689
rev ! ( try_from_unbounded, isize , u8 , u16 , u32 ) ;
2708
2690
rev ! ( try_from_upper_bounded, isize , u64 , u128 ) ;
2709
- rev ! ( try_from_unbounded, isize , i8 , i16 , i32 , i64 ) ;
2691
+ rev ! ( try_from_unbounded, isize , i16 , i32 , i64 ) ;
2710
2692
rev ! ( try_from_both_bounded, isize , i128 ) ;
2711
2693
}
2712
2694
0 commit comments