@@ -4755,9 +4755,9 @@ impl<'a> LoweringContext<'a> {
4755
4755
// Ok(val) => #[allow(unreachable_code)] val,
4756
4756
// Err(err) => #[allow(unreachable_code)]
4757
4757
// // If there is an enclosing `catch {...}`
4758
- // break 'catch_target Try::from_error(From::from (err)),
4758
+ // break 'catch_target Try::from_error(Into::into (err)),
4759
4759
// // Otherwise
4760
- // return Try::from_error(From::from (err)),
4760
+ // return Try::from_error(Into::into (err)),
4761
4761
// }
4762
4762
4763
4763
let unstable_span = self . sess . source_map ( ) . mark_span_with_reason (
@@ -4818,17 +4818,17 @@ impl<'a> LoweringContext<'a> {
4818
4818
} ;
4819
4819
4820
4820
// `Err(err) => #[allow(unreachable_code)]
4821
- // return Try::from_error(From::from (err)),`
4821
+ // return Try::from_error(Into::into (err)),`
4822
4822
let err_arm = {
4823
4823
let err_ident = self . str_to_ident ( "err" ) ;
4824
4824
let ( err_local, err_local_nid) = self . pat_ident ( try_span, err_ident) ;
4825
- let from_expr = {
4826
- let from_path = & [ sym:: convert, sym:: From , sym:: from ] ;
4825
+ let into_expr = {
4826
+ let into_path = & [ sym:: convert, sym:: Into , sym:: into ] ;
4827
4827
let err_expr = self . expr_ident ( try_span, err_ident, err_local_nid) ;
4828
- self . expr_call_std_path ( try_span, from_path , hir_vec ! [ err_expr] )
4828
+ self . expr_call_std_path ( try_span, into_path , hir_vec ! [ err_expr] )
4829
4829
} ;
4830
4830
let from_err_expr =
4831
- self . wrap_in_try_constructor ( sym:: from_error, from_expr , unstable_span) ;
4831
+ self . wrap_in_try_constructor ( sym:: from_error, into_expr , unstable_span) ;
4832
4832
let thin_attrs = ThinVec :: from ( attrs) ;
4833
4833
let catch_scope = self . catch_scopes . last ( ) . map ( |x| * x) ;
4834
4834
let ret_expr = if let Some ( catch_node) = catch_scope {
0 commit comments