Merge commit '9f9a822509e5ad3e560cbbe830d1013f936fca28' into clippy-subtree-update

1 files changed, 9 insertions, 6 deletions

diff --git a/src/tools/clippy/tests/ui/cmp_null.rs b/src/tools/clippy/tests/ui/cmp_null.rs
index 257f7ba2662..16ed17765da 100644
--- a/src/tools/clippy/tests/ui/cmp_null.rs
+++ b/src/tools/clippy/tests/ui/cmp_null.rs
@@ -7,26 +7,29 @@ fn main() {
     let x = 0;
     let p: *const usize = &x;
     if p == ptr::null() {
-        //~^ ERROR: comparing with null is better expressed by the `.is_null()` method
-        //~| NOTE: `-D clippy::cmp-null` implied by `-D warnings`
+        //~^ cmp_null
+
         println!("This is surprising!");
     }
     if ptr::null() == p {
-        //~^ ERROR: comparing with null is better expressed by the `.is_null()` method
+        //~^ cmp_null
+
         println!("This is surprising!");
     }
 
     let mut y = 0;
     let mut m: *mut usize = &mut y;
     if m == ptr::null_mut() {
-        //~^ ERROR: comparing with null is better expressed by the `.is_null()` method
+        //~^ cmp_null
+
         println!("This is surprising, too!");
     }
     if ptr::null_mut() == m {
-        //~^ ERROR: comparing with null is better expressed by the `.is_null()` method
+        //~^ cmp_null
+
         println!("This is surprising, too!");
     }
 
     let _ = x as *const () == ptr::null();
-    //~^ ERROR: comparing with null is better expressed by the `.is_null()` method
+    //~^ cmp_null
 }