Rollup merge of #148490 - hkBst:dangling-ptr-lint-2, r=Urgau

dangling pointer from temp cleanup

Continuation of #148348
r? `@Urgau`

Author: matthiaskrgr

compiler/rustc_lint/messages.ftl

@@ -205,15 +205,17 @@ lint_dangling_pointers_from_locals = {$fn_kind} returns a dangling pointer to dr
     .ret_ty = return type is `{$ret_ty}`
     .local_var = local variable `{$local_var_name}` is dropped at the end of the {$fn_kind}
     .created_at = dangling pointer created here
-    .note = a dangling pointer is safe, but dereferencing one is undefined behavior
-
-lint_dangling_pointers_from_temporaries = a dangling pointer will be produced because the temporary `{$ty}` will be dropped
-    .label_ptr = this pointer will immediately be invalid
-    .label_temporary = this `{$ty}` is deallocated at the end of the statement, bind it to a variable to extend its lifetime
-    .note = pointers do not have a lifetime; when calling `{$callee}` the `{$ty}` will be deallocated at the end of the statement because nothing is referencing it as far as the type system is concerned
-    .help_bind = you must make sure that the variable you bind the `{$ty}` to lives at least as long as the pointer returned by the call to `{$callee}`
-    .help_returned = in particular, if this pointer is returned from the current function, binding the `{$ty}` inside the function will not suffice
-    .help_visit = for more information, see <https://doc.rust-lang.org/reference/destructors.html>
+    .note_safe = a dangling pointer is safe, but dereferencing one is undefined behavior
+    .note_more_info = for more information, see <https://doc.rust-lang.org/reference/destructors.html>
+
+lint_dangling_pointers_from_temporaries = this creates a dangling pointer because temporary `{$ty}` is dropped at end of statement
+    .label_ptr = pointer created here
+    .label_temporary = this `{$ty}` is dropped at end of statement
+    .help_bind = bind the `{$ty}` to a variable such that it outlives the pointer returned by `{$callee}`
+    .note_safe = a dangling pointer is safe, but dereferencing one is undefined behavior
+    .note_return = returning a pointer to a local variable will always result in a dangling pointer
+    .note_more_info = for more information, see <https://doc.rust-lang.org/reference/destructors.html>
+
 
 lint_default_hash_types = prefer `{$preferred}` over `{$used}`, it has better performance
     .note = a `use rustc_data_structures::fx::{$preferred}` may be necessary

compiler/rustc_lint/src/lints.rs

@@ -1138,10 +1138,10 @@ pub(crate) struct IgnoredUnlessCrateSpecified<'a> {
 // dangling.rs
 #[derive(LintDiagnostic)]
 #[diag(lint_dangling_pointers_from_temporaries)]
-#[note]
 #[help(lint_help_bind)]
-#[help(lint_help_returned)]
-#[help(lint_help_visit)]
+#[note(lint_note_safe)]
+#[note(lint_note_return)]
+#[note(lint_note_more_info)]
 // FIXME: put #[primary_span] on `ptr_span` once it does not cause conflicts
 pub(crate) struct DanglingPointersFromTemporaries<'tcx> {
     pub callee: Ident,
@@ -1154,7 +1154,8 @@ pub(crate) struct DanglingPointersFromTemporaries<'tcx> {
 
 #[derive(LintDiagnostic)]
 #[diag(lint_dangling_pointers_from_locals)]
-#[note]
+#[note(lint_note_safe)]
+#[note(lint_note_more_info)]
 pub(crate) struct DanglingPointersFromLocals<'tcx> {
     pub ret_ty: Ty<'tcx>,
     #[label(lint_ret_ty)]

tests/ui/lint/dangling-pointers-from-locals.stderr

@@ -9,6 +9,7 @@ LL |     &x
    |     ^^
    |
    = note: a dangling pointer is safe, but dereferencing one is undefined behavior
+   = note: for more information, see <https://doc.rust-lang.org/reference/destructors.html>
    = note: `#[warn(dangling_pointers_from_locals)]` on by default
 
 warning: function returns a dangling pointer to dropped local variable `x`
@@ -24,6 +25,7 @@ LL |     x
    |     ^
    |
    = note: a dangling pointer is safe, but dereferencing one is undefined behavior
+   = note: for more information, see <https://doc.rust-lang.org/reference/destructors.html>
 
 warning: function returns a dangling pointer to dropped local variable `x`
   --> $DIR/dangling-pointers-from-locals.rs:24:12
@@ -38,6 +40,7 @@ LL |     return y;
    |            ^
    |
    = note: a dangling pointer is safe, but dereferencing one is undefined behavior
+   = note: for more information, see <https://doc.rust-lang.org/reference/destructors.html>
 
 warning: function returns a dangling pointer to dropped local variable `x`
   --> $DIR/dangling-pointers-from-locals.rs:30:5
@@ -52,6 +55,7 @@ LL |     &x as *const u8
    |     dangling pointer created here
    |
    = note: a dangling pointer is safe, but dereferencing one is undefined behavior
+   = note: for more information, see <https://doc.rust-lang.org/reference/destructors.html>
 
 warning: function returns a dangling pointer to dropped local variable `x`
   --> $DIR/dangling-pointers-from-locals.rs:37:5
@@ -66,6 +70,7 @@ LL |     x as *const u8
    |     ^^^^^^^^^^^^^^
    |
    = note: a dangling pointer is safe, but dereferencing one is undefined behavior
+   = note: for more information, see <https://doc.rust-lang.org/reference/destructors.html>
 
 warning: function returns a dangling pointer to dropped local variable `x`
   --> $DIR/dangling-pointers-from-locals.rs:43:12
@@ -80,6 +85,7 @@ LL |     return &mut x as *mut u8 as *const u8 as *mut u8;
    |            dangling pointer created here
    |
    = note: a dangling pointer is safe, but dereferencing one is undefined behavior
+   = note: for more information, see <https://doc.rust-lang.org/reference/destructors.html>
 
 warning: function returns a dangling pointer to dropped local variable `x`
   --> $DIR/dangling-pointers-from-locals.rs:49:5
@@ -92,6 +98,7 @@ LL |     &{ x }
    |     ^^^^^^
    |
    = note: a dangling pointer is safe, but dereferencing one is undefined behavior
+   = note: for more information, see <https://doc.rust-lang.org/reference/destructors.html>
 
 warning: function returns a dangling pointer to dropped local variable `x`
   --> $DIR/dangling-pointers-from-locals.rs:57:13
@@ -108,6 +115,7 @@ LL | |             }
    | |_____________^
    |
    = note: a dangling pointer is safe, but dereferencing one is undefined behavior
+   = note: for more information, see <https://doc.rust-lang.org/reference/destructors.html>
 
 warning: function returns a dangling pointer to dropped local variable `x`
   --> $DIR/dangling-pointers-from-locals.rs:67:12
@@ -120,6 +128,7 @@ LL |     return &x;
    |            ^^
    |
    = note: a dangling pointer is safe, but dereferencing one is undefined behavior
+   = note: for more information, see <https://doc.rust-lang.org/reference/destructors.html>
 
 warning: function returns a dangling pointer to dropped local variable `x`
   --> $DIR/dangling-pointers-from-locals.rs:73:12
@@ -132,6 +141,7 @@ LL |     return &mut x;
    |            ^^^^^^
    |
    = note: a dangling pointer is safe, but dereferencing one is undefined behavior
+   = note: for more information, see <https://doc.rust-lang.org/reference/destructors.html>
 
 warning: function returns a dangling pointer to dropped local variable `x`
   --> $DIR/dangling-pointers-from-locals.rs:80:16
@@ -145,6 +155,7 @@ LL |         return &x;
    |                ^^
    |
    = note: a dangling pointer is safe, but dereferencing one is undefined behavior
+   = note: for more information, see <https://doc.rust-lang.org/reference/destructors.html>
 
 warning: function returns a dangling pointer to dropped local variable `x`
   --> $DIR/dangling-pointers-from-locals.rs:88:5
@@ -157,6 +168,7 @@ LL |     &x
    |     ^^
    |
    = note: a dangling pointer is safe, but dereferencing one is undefined behavior
+   = note: for more information, see <https://doc.rust-lang.org/reference/destructors.html>
 
 warning: function returns a dangling pointer to dropped local variable `x`
   --> $DIR/dangling-pointers-from-locals.rs:94:12
@@ -169,6 +181,7 @@ LL |     return &x;
    |            ^^
    |
    = note: a dangling pointer is safe, but dereferencing one is undefined behavior
+   = note: for more information, see <https://doc.rust-lang.org/reference/destructors.html>
 
 warning: closure returns a dangling pointer to dropped local variable `x`
   --> $DIR/dangling-pointers-from-locals.rs:101:16
@@ -181,6 +194,7 @@ LL |         return &x;
    |                ^^
    |
    = note: a dangling pointer is safe, but dereferencing one is undefined behavior
+   = note: for more information, see <https://doc.rust-lang.org/reference/destructors.html>
 
 warning: function returns a dangling pointer to dropped local variable `x`
   --> $DIR/dangling-pointers-from-locals.rs:113:5
@@ -194,6 +208,7 @@ LL |     &x
    |     ^^
    |
    = note: a dangling pointer is safe, but dereferencing one is undefined behavior
+   = note: for more information, see <https://doc.rust-lang.org/reference/destructors.html>
 
 warning: function returns a dangling pointer to dropped local variable `a`
   --> $DIR/dangling-pointers-from-locals.rs:118:5
@@ -206,6 +221,7 @@ LL |     &a
    |     ^^
    |
    = note: a dangling pointer is safe, but dereferencing one is undefined behavior
+   = note: for more information, see <https://doc.rust-lang.org/reference/destructors.html>
 
 warning: function returns a dangling pointer to dropped local variable `a`
   --> $DIR/dangling-pointers-from-locals.rs:123:5
@@ -218,6 +234,7 @@ LL |     &a
    |     ^^
    |
    = note: a dangling pointer is safe, but dereferencing one is undefined behavior
+   = note: for more information, see <https://doc.rust-lang.org/reference/destructors.html>
 
 warning: function returns a dangling pointer to dropped local variable `a`
   --> $DIR/dangling-pointers-from-locals.rs:128:5
@@ -230,6 +247,7 @@ LL |     &a
    |     ^^
    |
    = note: a dangling pointer is safe, but dereferencing one is undefined behavior
+   = note: for more information, see <https://doc.rust-lang.org/reference/destructors.html>
 
 warning: function returns a dangling pointer to dropped local variable `a`
   --> $DIR/dangling-pointers-from-locals.rs:133:5
@@ -242,6 +260,7 @@ LL |     &a
    |     ^^
    |
    = note: a dangling pointer is safe, but dereferencing one is undefined behavior
+   = note: for more information, see <https://doc.rust-lang.org/reference/destructors.html>
 
 warning: 19 warnings emitted
 

tests/ui/lint/dangling-pointers-from-temporaries/allow.rs

@@ -7,7 +7,7 @@ fn main() {
     #[deny(dangling_pointers_from_temporaries)]
     {
         dbg!(String::new().as_ptr());
-        //~^ ERROR a dangling pointer will be produced because the temporary `String` will be dropped
+        //~^ ERROR dangling pointer
     }
     S.foo()
 }
@@ -18,6 +18,6 @@ impl S {
     #[warn(dangling_pointers_from_temporaries)]
     fn foo(self) {
         dbg!(String::new().as_ptr());
-        //~^ WARNING a dangling pointer will be produced because the temporary `String` will be dropped
+        //~^ WARNING dangling pointer
     }
 }

tests/ui/lint/dangling-pointers-from-temporaries/allow.stderr

@@ -1,33 +1,33 @@
-error: a dangling pointer will be produced because the temporary `String` will be dropped
+error: this creates a dangling pointer because temporary `String` is dropped at end of statement
   --> $DIR/allow.rs:9:28
    |
 LL |         dbg!(String::new().as_ptr());
-   |              ------------- ^^^^^^ this pointer will immediately be invalid
+   |              ------------- ^^^^^^ pointer created here
    |              |
-   |              this `String` is deallocated at the end of the statement, bind it to a variable to extend its lifetime
+   |              this `String` is dropped at end of statement
    |
-   = note: pointers do not have a lifetime; when calling `as_ptr` the `String` will be deallocated at the end of the statement because nothing is referencing it as far as the type system is concerned
-   = help: you must make sure that the variable you bind the `String` to lives at least as long as the pointer returned by the call to `as_ptr`
-   = help: in particular, if this pointer is returned from the current function, binding the `String` inside the function will not suffice
-   = help: for more information, see <https://doc.rust-lang.org/reference/destructors.html>
+   = help: bind the `String` to a variable such that it outlives the pointer returned by `as_ptr`
+   = note: a dangling pointer is safe, but dereferencing one is undefined behavior
+   = note: returning a pointer to a local variable will always result in a dangling pointer
+   = note: for more information, see <https://doc.rust-lang.org/reference/destructors.html>
 note: the lint level is defined here
   --> $DIR/allow.rs:7:12
    |
 LL |     #[deny(dangling_pointers_from_temporaries)]
    |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-warning: a dangling pointer will be produced because the temporary `String` will be dropped
+warning: this creates a dangling pointer because temporary `String` is dropped at end of statement
   --> $DIR/allow.rs:20:28
    |
 LL |         dbg!(String::new().as_ptr());
-   |              ------------- ^^^^^^ this pointer will immediately be invalid
+   |              ------------- ^^^^^^ pointer created here
    |              |
-   |              this `String` is deallocated at the end of the statement, bind it to a variable to extend its lifetime
+   |              this `String` is dropped at end of statement
    |
-   = note: pointers do not have a lifetime; when calling `as_ptr` the `String` will be deallocated at the end of the statement because nothing is referencing it as far as the type system is concerned
-   = help: you must make sure that the variable you bind the `String` to lives at least as long as the pointer returned by the call to `as_ptr`
-   = help: in particular, if this pointer is returned from the current function, binding the `String` inside the function will not suffice
-   = help: for more information, see <https://doc.rust-lang.org/reference/destructors.html>
+   = help: bind the `String` to a variable such that it outlives the pointer returned by `as_ptr`
+   = note: a dangling pointer is safe, but dereferencing one is undefined behavior
+   = note: returning a pointer to a local variable will always result in a dangling pointer
+   = note: for more information, see <https://doc.rust-lang.org/reference/destructors.html>
 note: the lint level is defined here
   --> $DIR/allow.rs:18:12
    |

tests/ui/lint/dangling-pointers-from-temporaries/calls.rs

@@ -25,12 +25,12 @@ fn ok() {
 fn not_ok() {
     {
         let ptr = cstring().as_ptr();
-        //~^ ERROR a dangling pointer will be produced because the temporary `CString` will be dropped
+        //~^ ERROR dangling pointer
         consume(ptr);
     }
     consume({
         let ptr = cstring().as_ptr();
-        //~^ ERROR a dangling pointer will be produced because the temporary `CString` will be dropped
+        //~^ ERROR dangling pointer
         ptr
     });
     consume({
@@ -39,11 +39,11 @@ fn not_ok() {
         //^ FIXME: should error
     });
     let _ptr: *const u8 = cstring().as_ptr().cast();
-    //~^ ERROR a dangling pointer will be produced because the temporary `CString` will be dropped
+    //~^ ERROR dangling pointer
     let _ptr: *const u8 = { cstring() }.as_ptr().cast();
-    //~^ ERROR a dangling pointer will be produced because the temporary `CString` will be dropped
+    //~^ ERROR dangling pointer
     let _ptr: *const u8 = { cstring().as_ptr() }.cast();
-    //~^ ERROR a dangling pointer will be produced because the temporary `CString` will be dropped
+    //~^ ERROR dangling pointer
 }
 
 fn main() {