@@ -204,11 +204,11 @@ impl<'tcx> LateLintPass<'tcx> for DropForgetRef {
204204 {
205205 let arg_ty = cx. typeck_results ( ) . expr_ty ( arg) ;
206206 let is_copy = is_copy ( cx, arg_ty) ;
207- let drop_is_only_expr_in_arm = and_only_expr_in_arm ( cx, arg, expr) ;
207+ let drop_is_single_call_in_arm = is_single_call_in_arm ( cx, arg, expr) ;
208208 let ( lint, msg) = match fn_name {
209209 sym:: mem_drop if arg_ty. is_ref ( ) => ( DROP_REF , DROP_REF_SUMMARY ) ,
210210 sym:: mem_forget if arg_ty. is_ref ( ) => ( FORGET_REF , FORGET_REF_SUMMARY ) ,
211- sym:: mem_drop if is_copy && !drop_is_only_expr_in_arm => ( DROP_COPY , DROP_COPY_SUMMARY ) ,
211+ sym:: mem_drop if is_copy && !drop_is_single_call_in_arm => ( DROP_COPY , DROP_COPY_SUMMARY ) ,
212212 sym:: mem_forget if is_copy => ( FORGET_COPY , FORGET_COPY_SUMMARY ) ,
213213 sym:: mem_drop if is_type_lang_item ( cx, arg_ty, LangItem :: ManuallyDrop ) => {
214214 span_lint_and_help (
@@ -225,7 +225,7 @@ impl<'tcx> LateLintPass<'tcx> for DropForgetRef {
225225 if !( arg_ty. needs_drop ( cx. tcx , cx. param_env )
226226 || is_must_use_func_call ( cx, arg)
227227 || is_must_use_ty ( cx, arg_ty)
228- || drop_is_only_expr_in_arm
228+ || drop_is_single_call_in_arm
229229 ) =>
230230 {
231231 ( DROP_NON_DROP , DROP_NON_DROP_SUMMARY )
@@ -252,7 +252,7 @@ impl<'tcx> LateLintPass<'tcx> for DropForgetRef {
252252// <pat> => drop(fn_with_side_effect_and_returning_some_value()),
253253// ..
254254// }
255- fn and_only_expr_in_arm < ' tcx > ( cx : & LateContext < ' tcx > , arg : & ' tcx Expr < ' _ > , drop_expr : & ' tcx Expr < ' _ > ) -> bool {
255+ fn is_single_call_in_arm < ' tcx > ( cx : & LateContext < ' tcx > , arg : & ' tcx Expr < ' _ > , drop_expr : & ' tcx Expr < ' _ > ) -> bool {
256256 if matches ! ( arg. kind, ExprKind :: Call ( ..) | ExprKind :: MethodCall ( ..) ) {
257257 let parent_node = get_parent_node ( cx. tcx , drop_expr. hir_id ) ;
258258 if let Some ( Node :: Arm ( Arm { body, .. } ) ) = & parent_node {
0 commit comments