about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorLinus Färnstrand <faern@faern.net>2020-04-06 23:07:38 +0200
committerLinus Färnstrand <faern@faern.net>2020-04-06 23:07:38 +0200
commite4fc04b6df93785e935ec776705803e6b50e2c23 (patch)
tree39736d450dcf4ea17d0a9a14f7d4417fc39e5ece /src/liballoc
parent09b5d666a075e381a2d8f99e5b7a6695ab9b6259 (diff)
downloadrust-e4fc04b6df93785e935ec776705803e6b50e2c23.tar.gz
rust-e4fc04b6df93785e935ec776705803e6b50e2c23.zip
Use usize::MAX as assoc const in liballoc
Diffstat (limited to 'src/liballoc')
-rw-r--r--src/liballoc/raw_vec.rs2
-rw-r--r--src/liballoc/tests/btree/map.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/liballoc/raw_vec.rs b/src/liballoc/raw_vec.rs
index 7ac67870eb7..0780b33e53a 100644
--- a/src/liballoc/raw_vec.rs
+++ b/src/liballoc/raw_vec.rs
@@ -608,7 +608,7 @@ unsafe impl<#[may_dangle] T, A: AllocRef> Drop for RawVec<T, A> {
 
 #[inline]
 fn alloc_guard(alloc_size: usize) -> Result<(), TryReserveError> {
-    if mem::size_of::<usize>() < 8 && alloc_size > core::isize::MAX as usize {
+    if mem::size_of::<usize>() < 8 && alloc_size > isize::MAX as usize {
         Err(CapacityOverflow)
     } else {
         Ok(())
diff --git a/src/liballoc/tests/btree/map.rs b/src/liballoc/tests/btree/map.rs
index 14f12ca2d77..96b6c32a1fa 100644
--- a/src/liballoc/tests/btree/map.rs
+++ b/src/liballoc/tests/btree/map.rs
@@ -475,7 +475,7 @@ fn test_range_large() {
 
 #[test]
 fn test_range_inclusive_max_value() {
-    let max = std::usize::MAX;
+    let max = usize::MAX;
     let map: BTreeMap<_, _> = vec![(max, 0)].into_iter().collect();
 
     assert_eq!(map.range(max..=max).collect::<Vec<_>>(), &[(&max, &0)]);