Skip to content

Commit

Permalink
Auto merge of #7294 - stevenengler:unsafe-ptr-deref-msg, r=Manishearth
Browse files Browse the repository at this point in the history
Improve message for `not_unsafe_ptr_arg_deref` lint

changelog: Improved message for the ['not_unsafe_ptr_arg_deref'] lint

Doesn't close any issue, but implements a suggestion from #3045 (comment).
  • Loading branch information
bors committed May 31, 2021
2 parents d1308ae + 58491d3 commit 860cb8f
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion clippy_lints/src/functions/not_unsafe_ptr_arg_deref.rs
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ impl<'a, 'tcx> DerefVisitor<'a, 'tcx> {
self.cx,
NOT_UNSAFE_PTR_ARG_DEREF,
ptr.span,
"this public function dereferences a raw pointer but is not marked `unsafe`",
"this public function might dereference a raw pointer but is not marked `unsafe`",
);
}
}
Expand Down
18 changes: 9 additions & 9 deletions tests/ui/functions.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -30,57 +30,57 @@ error: this function has too many arguments (8/7)
LL | fn bad_method(_one: u32, _two: u32, _three: &str, _four: bool, _five: f32, _six: f32, _seven: bool, _eight: ()) {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

error: this public function dereferences a raw pointer but is not marked `unsafe`
error: this public function might dereference a raw pointer but is not marked `unsafe`
--> $DIR/functions.rs:63:34
|
LL | println!("{}", unsafe { *p });
| ^
|
= note: `-D clippy::not-unsafe-ptr-arg-deref` implied by `-D warnings`

error: this public function dereferences a raw pointer but is not marked `unsafe`
error: this public function might dereference a raw pointer but is not marked `unsafe`
--> $DIR/functions.rs:64:35
|
LL | println!("{:?}", unsafe { p.as_ref() });
| ^

error: this public function dereferences a raw pointer but is not marked `unsafe`
error: this public function might dereference a raw pointer but is not marked `unsafe`
--> $DIR/functions.rs:65:33
|
LL | unsafe { std::ptr::read(p) };
| ^

error: this public function dereferences a raw pointer but is not marked `unsafe`
error: this public function might dereference a raw pointer but is not marked `unsafe`
--> $DIR/functions.rs:76:30
|
LL | println!("{}", unsafe { *p });
| ^

error: this public function dereferences a raw pointer but is not marked `unsafe`
error: this public function might dereference a raw pointer but is not marked `unsafe`
--> $DIR/functions.rs:77:31
|
LL | println!("{:?}", unsafe { p.as_ref() });
| ^

error: this public function dereferences a raw pointer but is not marked `unsafe`
error: this public function might dereference a raw pointer but is not marked `unsafe`
--> $DIR/functions.rs:78:29
|
LL | unsafe { std::ptr::read(p) };
| ^

error: this public function dereferences a raw pointer but is not marked `unsafe`
error: this public function might dereference a raw pointer but is not marked `unsafe`
--> $DIR/functions.rs:87:34
|
LL | println!("{}", unsafe { *p });
| ^

error: this public function dereferences a raw pointer but is not marked `unsafe`
error: this public function might dereference a raw pointer but is not marked `unsafe`
--> $DIR/functions.rs:88:35
|
LL | println!("{:?}", unsafe { p.as_ref() });
| ^

error: this public function dereferences a raw pointer but is not marked `unsafe`
error: this public function might dereference a raw pointer but is not marked `unsafe`
--> $DIR/functions.rs:89:33
|
LL | unsafe { std::ptr::read(p) };
Expand Down

0 comments on commit 860cb8f

Please sign in to comment.