fix all tidy lints

Author: yoshuawuyts

library/core/src/mem/drop_guard.rs

@@ -127,40 +127,12 @@ where
     F: FnOnce(T),
 {
     fn drop(&mut self) {
-        // SAFETY: we're taking the values out of the `ManuallyDrop` with
-        // the express intent of dropping them.
+        // SAFETY: `DropGuard` is in the process of being dropped.
         let inner = unsafe { ManuallyDrop::take(&mut self.inner) };
-        let f = unsafe { ManuallyDrop::take(&mut self.f) };
-        f(inner);
-    }
-}
 
-// tests copied from https://docs.rs/scopeguard/latest/src/scopeguard/lib.rs.html#1-595
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::cell::Cell;
-
-    #[test]
-    fn test_only_dropped_by_closure_when_run() {
-        let value_drops = Cell::new(0);
-        let value = DropGuard::new((), |()| value_drops.set(1 + value_drops.get()));
-        let closure_drops = Cell::new(0);
-        let guard = DropGuard::new(value, |_| closure_drops.set(1 + closure_drops.get()));
-        assert_eq!(value_drops.get(), 0);
-        assert_eq!(closure_drops.get(), 0);
-        drop(guard);
-        assert_eq!(value_drops.get(), 1);
-        assert_eq!(closure_drops.get(), 1);
-    }
+        // SAFETY: `DropGuard` is in the process of being dropped.
+        let f = unsafe { ManuallyDrop::take(&mut self.f) };
 
-    #[test]
-    fn test_into_inner() {
-        let dropped = Cell::new(false);
-        let value = DropGuard::new(42, |_| dropped.set(true));
-        let guard = DropGuard::new(value, |_| dropped.set(true));
-        let inner = DropGuard::into_inner(guard);
-        assert_eq!(dropped.get(), false);
-        assert_eq!(*inner, 42);
+        f(inner);
     }
 }

library/coretests/tests/mem.rs

@@ -2,6 +2,7 @@ use core::mem::*;
 use core::{array, ptr};
 #[cfg(panic = "unwind")]
 use std::rc::Rc;
+use std::cell::Cell;
 
 #[test]
 fn size_of_basic() {
@@ -795,3 +796,26 @@ fn const_maybe_uninit_zeroed() {
 
     assert_eq!(unsafe { (*UNINIT.0.cast::<[[u8; SIZE]; 1]>())[0] }, [0u8; SIZE]);
 }
+
+#[test]
+fn drop_guards_only_dropped_by_closure_when_run() {
+    let value_drops = Cell::new(0);
+    let value = DropGuard::new((), |()| value_drops.set(1 + value_drops.get()));
+    let closure_drops = Cell::new(0);
+    let guard = DropGuard::new(value, |_| closure_drops.set(1 + closure_drops.get()));
+    assert_eq!(value_drops.get(), 0);
+    assert_eq!(closure_drops.get(), 0);
+    drop(guard);
+    assert_eq!(value_drops.get(), 1);
+    assert_eq!(closure_drops.get(), 1);
+}
+
+#[test]
+fn drop_guard_into_inner() {
+    let dropped = Cell::new(false);
+    let value = DropGuard::new(42, |_| dropped.set(true));
+    let guard = DropGuard::new(value, |_| dropped.set(true));
+    let inner = DropGuard::into_inner(guard);
+    assert_eq!(dropped.get(), false);
+    assert_eq!(*inner, 42);
+}