diff --git a/src/message.rs b/src/message.rs index 3d1cf4750..2a4c206b2 100644 --- a/src/message.rs +++ b/src/message.rs @@ -107,8 +107,7 @@ mod tests { let result: *const Object = unsafe { msg_send![obj, self] }; - let obj_ptr: *const Object = &*obj; - assert!(result == obj_ptr); + assert!(result == &*obj); } #[test] @@ -146,9 +145,12 @@ mod tests { let superclass = test_utils::custom_class(); unsafe { let _: () = msg_send![obj, setFoo:4u32]; - assert!(msg_send![super(obj, superclass), foo] == 4u32); + let foo: u32 = msg_send![super(obj, superclass), foo]; + assert!(foo == 4); + // The subclass is overriden to return foo + 2 - assert!(msg_send![obj, foo] == 6u32); + let foo: u32 = msg_send![obj, foo]; + assert!(foo == 6); } } } diff --git a/src/runtime.rs b/src/runtime.rs index 7cf7c3d15..4c773d408 100644 --- a/src/runtime.rs +++ b/src/runtime.rs @@ -470,8 +470,7 @@ mod tests { let cls = Class::get("NSObject").unwrap(); let obj = test_utils::sample_object(); assert!(obj.class() == cls); - let isa = unsafe { *obj.get_ivar("isa") }; - let cls_ptr: *const Class = cls; - assert!(isa == cls_ptr); + let isa: *const Class = unsafe { *obj.get_ivar("isa") }; + assert!(isa == cls); } } diff --git a/src/test_utils.rs b/src/test_utils.rs index b7900343b..bfa0e12bc 100644 --- a/src/test_utils.rs +++ b/src/test_utils.rs @@ -118,7 +118,7 @@ pub fn custom_subclass() -> &'static Class { let mut decl = ClassDecl::new(superclass, "CustomSubclassObject").unwrap(); extern fn custom_subclass_get_foo(this: &Object, _cmd: Sel) -> u32 { - let foo = unsafe { + let foo: u32 = unsafe { msg_send![super(this, custom_class()), foo] }; foo + 2