about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2023-06-19 19:26:26 +0200
committerGitHub <noreply@github.com>2023-06-19 19:26:26 +0200
commit7d072fa8fb409de16ddaf791af1bdcee20c059ba (patch)
tree1eb383c420267da29bf88fd5d8d31de35a89e257
parentaf348a81a073646741feff64f5082080aa0e6fd0 (diff)
parent09707ee12a29856453782f7dc41cfef49749e9de (diff)
downloadrust-7d072fa8fb409de16ddaf791af1bdcee20c059ba.tar.gz
rust-7d072fa8fb409de16ddaf791af1bdcee20c059ba.zip
Rollup merge of #112757 - Danvil:patch-1, r=Mark-Simulacrum
Use BorrowFlag instead of explicit isize

The integer type tracking borrow count has a typedef called `BorrowFlag`. This type should be used instead of explicit `isize`.
-rw-r--r--library/core/src/cell.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/library/core/src/cell.rs b/library/core/src/cell.rs
index c1cc892eb86..909b32547e7 100644
--- a/library/core/src/cell.rs
+++ b/library/core/src/cell.rs
@@ -1374,7 +1374,7 @@ impl Clone for BorrowRef<'_> {
         debug_assert!(is_reading(borrow));
         // Prevent the borrow counter from overflowing into
         // a writing borrow.
-        assert!(borrow != isize::MAX);
+        assert!(borrow != BorrowFlag::MAX);
         self.borrow.set(borrow + 1);
         BorrowRef { borrow: self.borrow }
     }
@@ -1756,7 +1756,7 @@ impl<'b> BorrowRefMut<'b> {
         let borrow = self.borrow.get();
         debug_assert!(is_writing(borrow));
         // Prevent the borrow counter from underflowing.
-        assert!(borrow != isize::MIN);
+        assert!(borrow != BorrowFlag::MIN);
         self.borrow.set(borrow - 1);
         BorrowRefMut { borrow: self.borrow }
     }