Auto merge of #137752 - flip1995:clippy-subtree-update, r=Manishearth

Clippy subtree update

? `@Manishearth`

Cargo.lock change because of Clippy version bump and rustc_tool_utils new release.

Fixes #137640

Would be nice, if we could this merged before nightly is being build, so that this ICE is fixed tomorrow.

1 files changed, 8 insertions, 7 deletions

diff --git a/src/tools/clippy/tests/ui/unit_cmp.rs b/src/tools/clippy/tests/ui/unit_cmp.rs
index cea89026da6..93f5b87c3d2 100644
--- a/src/tools/clippy/tests/ui/unit_cmp.rs
+++ b/src/tools/clippy/tests/ui/unit_cmp.rs
@@ -15,22 +15,23 @@ fn main() {
 
     // this warns
     if {
-        //~^ ERROR: ==-comparison of unit values detected. This will always be true
-        //~| NOTE: `-D clippy::unit-cmp` implied by `-D warnings`
+        //~^ unit_cmp
+
         true;
     } == {
         false;
     } {}
 
     if {
-        //~^ ERROR: >-comparison of unit values detected. This will always be false
+        //~^ unit_cmp
+
         true;
     } > {
         false;
     } {}
 
     assert_eq!(
-        //~^ ERROR: `assert_eq` of unit values detected. This will always succeed
+        //~^ unit_cmp
         {
             true;
         },
@@ -39,7 +40,7 @@ fn main() {
         }
     );
     debug_assert_eq!(
-        //~^ ERROR: `debug_assert_eq` of unit values detected. This will always succeed
+        //~^ unit_cmp
         {
             true;
         },
@@ -49,7 +50,7 @@ fn main() {
     );
 
     assert_ne!(
-        //~^ ERROR: `assert_ne` of unit values detected. This will always fail
+        //~^ unit_cmp
         {
             true;
         },
@@ -58,7 +59,7 @@ fn main() {
         }
     );
     debug_assert_ne!(
-        //~^ ERROR: `debug_assert_ne` of unit values detected. This will always fail
+        //~^ unit_cmp
         {
             true;
         },