Merge pull request #393 from Amanieu/fix-with_upgraded

lock_api/src/rwlock.rs

@@ -2025,7 +2025,7 @@ impl<'a, R: RawRwLockUpgradeDowngrade + 'a, T: ?Sized + 'a> RwLockUpgradableRead
 
         // Safety: We just upgraded the lock, so we have mutable access to the data.
         // This will restore the state the lock was in at the start of the function.
-        defer!(unsafe { self.rwlock.raw.downgrade_upgradable() });
+        defer!(unsafe { self.rwlock.raw.downgrade_to_upgradable() });
 
         // Safety: We upgraded the lock, so we have mutable access to the data.
         // When this function returns, whether by drop or panic,
@@ -2047,7 +2047,7 @@ impl<'a, R: RawRwLockUpgradeDowngrade + 'a, T: ?Sized + 'a> RwLockUpgradableRead
         if unsafe { self.rwlock.raw.try_upgrade() } {
             // Safety: We just upgraded the lock, so we have mutable access to the data.
             // This will restore the state the lock was in at the start of the function.
-            defer!(unsafe { self.rwlock.raw.downgrade_upgradable() });
+            defer!(unsafe { self.rwlock.raw.downgrade_to_upgradable() });
 
             // Safety: We upgraded the lock, so we have mutable access to the data.
             // When this function returns, whether by drop or panic,

tests/issue_392.rs

@@ -0,0 +1,15 @@
+use parking_lot::RwLock;
+
+struct Lock(RwLock<i32>);
+
+#[test]
+fn issue_392() {
+    let lock = Lock(RwLock::new(0));
+    let mut rl = lock.0.upgradable_read();
+    rl.with_upgraded(|_| {
+        println!("lock upgrade");
+    });
+    rl.with_upgraded(|_| {
+        println!("lock upgrade");
+    });
+}