浏览代码

Make tests compile

Ian Douglas Scott 7 年之前
父节点
当前提交
cda52ae5b8
共有 3 个文件被更改,包括 9 次插入9 次删除
  1. 2 2
      src/block.rs
  2. 1 1
      src/brk.rs
  3. 6 6
      src/ptr.rs

+ 2 - 2
src/block.rs

@@ -323,7 +323,7 @@ mod test {
         assert!(!rest.is_empty());
         assert!(lorem.align(2).unwrap().1.aligned_to(2));
         assert!(rest.align(15).unwrap().1.aligned_to(15));
-        assert_eq!(*Pointer::from(lorem) as usize + 5, *Pointer::from(rest) as usize);
+        assert_eq!(Pointer::from(lorem).get() as usize + 5, Pointer::from(rest).get() as usize);
     }
 
     #[test]
@@ -376,7 +376,7 @@ mod test {
 
         assert!(block.empty_left().is_empty());
         assert!(block.empty_right().is_empty());
-        assert_eq!(*Pointer::from(block.empty_left()) as *const u8, arr.as_ptr());
+        assert_eq!(Pointer::from(block.empty_left()).get() as *const u8, arr.as_ptr());
         assert_eq!(block.empty_right(), block.split(arr.len()).1);
     }
 }

+ 1 - 1
src/brk.rs

@@ -210,7 +210,7 @@ mod test {
             let brk1 = lock().sbrk(5).unwrap();
             let brk2 = lock().sbrk(100).unwrap();
 
-            assert!(*brk1 < *brk2);
+            assert!(brk1.get() < brk2.get());
         }
     }
 }

+ 6 - 6
src/ptr.rs

@@ -103,22 +103,22 @@ mod test {
 
         unsafe {
             let ptr = Pointer::new(&mut x[0] as *mut u8);
-            assert_eq!(**ptr, b'a');
-            assert_eq!(**ptr.clone().cast::<[u8; 1]>(), [b'a']);
-            assert_eq!(**ptr.offset(1), b'b');
+            assert_eq!(*ptr.get(), b'a');
+            assert_eq!(*ptr.clone().cast::<[u8; 1]>().get(), [b'a']);
+            assert_eq!(*ptr.offset(1).get(), b'b');
         }
 
         let mut y = ['a', 'b'];
 
         unsafe {
             let ptr = Pointer::new(&mut y[0] as *mut char);
-            assert_eq!(**ptr.clone().cast::<[char; 1]>(), ['a']);
-            assert_eq!(**ptr.offset(1), 'b');
+            assert_eq!(*ptr.clone().cast::<[char; 1]>().get(), ['a']);
+            assert_eq!(*ptr.offset(1).get(), 'b');
         }
     }
 
     #[test]
     fn test_empty() {
-        assert_eq!(*Pointer::<u8>::empty() as usize, 1);
+        assert_eq!(Pointer::<u8>::empty().get() as usize, 1);
     }
 }