From 7024a9d5298a6ead78cfead653b3697a40a1b8b7 Mon Sep 17 00:00:00 2001 From: blake2-ppc Date: Wed, 18 Sep 2013 06:03:22 +0200 Subject: [PATCH] std::borrow: Use raw pointer comparison for `ref_eq` Compare as `*T` in `ref_eq` instead of casting to uint, to match what std::ptr does. --- src/libstd/borrow.rs | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/libstd/borrow.rs b/src/libstd/borrow.rs index 6c3d4c5f1fb..0626b3fc618 100644 --- a/src/libstd/borrow.rs +++ b/src/libstd/borrow.rs @@ -22,7 +22,7 @@ pub fn to_uint(thing: &T) -> uint { /// Determine if two borrowed pointers point to the same thing. #[inline] pub fn ref_eq<'a, 'b, T>(thing: &'a T, other: &'b T) -> bool { - to_uint(thing) == to_uint(other) + (thing as *T) == (other as *T) } // Equality for region pointers @@ -70,3 +70,17 @@ impl<'self, T: TotalEq> TotalEq for &'self T { #[inline] fn equals(&self, other: & &'self T) -> bool { (**self).equals(*other) } } + +#[cfg(test)] +mod tests { + use super::ref_eq; + + #[test] + fn test_ref_eq() { + let x = 1; + let y = 1; + + assert!(ref_eq(&x, &x)); + assert!(!ref_eq(&x, &y)); + } +}