Skip to content

Commit 4419c9d

Browse files
ndmitchellfacebook-github-bot
authored andcommitted
Fix UB in test_ref_as_expected
Summary: From facebookincubator/gazebo#13. Fix up some UB in a test. Reviewed By: dtolnay Differential Revision: D54718707 fbshipit-source-id: 52169c051bc5efd399d0e92f1438e97e7a3d2833
1 parent a16cc26 commit 4419c9d

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

gazebo/gazebo/src/cell.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,6 @@ mod tests {
212212
use std::mem;
213213

214214
use super::*;
215-
use crate::cast;
216215

217216
#[test]
218217
fn test_from_ref_docs() {
@@ -276,11 +275,11 @@ mod tests {
276275
let orig = RefCell::new("test".to_owned());
277276
let p = orig.borrow();
278277
let p2 = Ref::clone(&p);
279-
let (pointer, cell): (usize, usize) = unsafe { mem::transmute(p) };
278+
let (pointer, cell): (*const String, *const ()) = unsafe { mem::transmute(p) };
280279
// We expect the first to be a pointer to the underlying string
281-
assert_eq!(pointer, cast::ptr_to_usize(Ref::deref(&p2)));
280+
assert_eq!(pointer, Ref::deref(&p2) as *const String);
282281
// We want to make sure the second is never zero
283-
assert_ne!(cell, 0);
282+
assert!(!cell.is_null());
284283

285284
// Put it back as it was, to make sure our test doesn't leak memory
286285
let _ignore: Ref<String> = unsafe { mem::transmute((pointer, cell)) };

0 commit comments

Comments
 (0)