Skip to content

Commit d272540

Browse files
committed
[borrow_as_ptr]: Ignore temporaries
1 parent eefc2a0 commit d272540

File tree

4 files changed

+27
-3
lines changed

4 files changed

+27
-3
lines changed

clippy_lints/src/casts/borrow_as_ptr.rs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
use clippy_utils::diagnostics::span_lint_and_sugg;
1+
use std::ops::ControlFlow;
2+
23
use clippy_utils::is_no_std_crate;
34
use clippy_utils::source::snippet_with_context;
5+
use clippy_utils::{diagnostics::span_lint_and_sugg, visitors::for_each_unconsumed_temporary};
46
use rustc_errors::Applicability;
57
use rustc_hir::{BorrowKind, Expr, ExprKind, Mutability, Ty, TyKind};
68
use rustc_lint::LateContext;
@@ -23,6 +25,10 @@ pub(super) fn check<'tcx>(
2325
};
2426
let mut app = Applicability::MachineApplicable;
2527
let snip = snippet_with_context(cx, e.span, cast_expr.span.ctxt(), "..", &mut app).0;
28+
// Fix #9884
29+
if for_each_unconsumed_temporary(cx, expr, |_| ControlFlow::Break(true)).is_break() {
30+
return;
31+
}
2632

2733
span_lint_and_sugg(
2834
cx,

tests/ui/borrow_as_ptr.fixed

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,18 @@
11
//@run-rustfix
22
#![warn(clippy::borrow_as_ptr)]
3+
#![allow(clippy::useless_vec)]
4+
5+
fn a() -> i32 {
6+
0
7+
}
38

49
fn main() {
510
let val = 1;
611
let _p = std::ptr::addr_of!(val);
12+
let _p = &0 as *const i32;
13+
let _p = &a() as *const i32;
14+
let vec = vec![1];
15+
let _p = &vec.len() as *const usize;
716

817
let mut val_mut = 1;
918
let _p_mut = std::ptr::addr_of_mut!(val_mut);

tests/ui/borrow_as_ptr.rs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,18 @@
11
//@run-rustfix
22
#![warn(clippy::borrow_as_ptr)]
3+
#![allow(clippy::useless_vec)]
4+
5+
fn a() -> i32 {
6+
0
7+
}
38

49
fn main() {
510
let val = 1;
611
let _p = &val as *const i32;
12+
let _p = &0 as *const i32;
13+
let _p = &a() as *const i32;
14+
let vec = vec![1];
15+
let _p = &vec.len() as *const usize;
716

817
let mut val_mut = 1;
918
let _p_mut = &mut val_mut as *mut i32;

tests/ui/borrow_as_ptr.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
error: borrow as raw pointer
2-
--> $DIR/borrow_as_ptr.rs:6:14
2+
--> $DIR/borrow_as_ptr.rs:11:14
33
|
44
LL | let _p = &val as *const i32;
55
| ^^^^^^^^^^^^^^^^^^ help: try: `std::ptr::addr_of!(val)`
66
|
77
= note: `-D clippy::borrow-as-ptr` implied by `-D warnings`
88

99
error: borrow as raw pointer
10-
--> $DIR/borrow_as_ptr.rs:9:18
10+
--> $DIR/borrow_as_ptr.rs:18:18
1111
|
1212
LL | let _p_mut = &mut val_mut as *mut i32;
1313
| ^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `std::ptr::addr_of_mut!(val_mut)`

0 commit comments

Comments
 (0)