more fixes

Author: ShrigmaDev

library/std/src/sync/poison/rwlock.rs

@@ -1,5 +1,3 @@
-use std::sync::PoisonError;
-
 use crate::cell::UnsafeCell;
 use crate::fmt;
 use crate::marker::PhantomData;
@@ -929,8 +927,8 @@ impl<'a, T: ?Sized> RwLockReadGuard<'a, T> {
 
         // SAFETY: We have ownership of the read guard, so it must be in read mode already
         match unsafe { read_lock.try_upgrade() } {
-            true => RwLockWriteGuard::new(read_lock).unwrap_or_else(PoisonError::into_inner),
-            false => RwLockReadGuard::new(read_lock).unwrap_or_else(PoisonError::into_inner),
+            true => Ok(RwLockWriteGuard::new(read_lock).unwrap_or_else(PoisonError::into_inner)),
+            false => Err(RwLockReadGuard::new(read_lock).unwrap_or_else(PoisonError::into_inner)),
         }
     }
 }

library/std/src/sys/sync/rwlock/futex.rs

@@ -216,7 +216,7 @@ impl RwLock {
     /// in at least 2 threads will deadlock.
     #[inline]
     pub unsafe fn try_upgrade(&self) -> bool {
-        debug_assert!(
+        debg_assert!(
             is_read_locked(self.state),
             "RwLock must be read locked to call `try_upgrade`"
         );