Skip to content

Commit 31f620a

Browse files
committed
---
yaml --- r: 82446 b: refs/heads/auto c: 4904bc3 h: refs/heads/master v: v3
1 parent 6529cdb commit 31f620a

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1313
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1414
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1515
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
16-
refs/heads/auto: a7cf7b7b0b3392bc3219e2bea44a0a18283aae50
16+
refs/heads/auto: 4904bc33cc20044709286794d3998d7464277ab4
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/libstd/borrow.rs

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ pub fn to_uint<T>(thing: &T) -> uint {
2222
/// Determine if two borrowed pointers point to the same thing.
2323
#[inline]
2424
pub fn ref_eq<'a, 'b, T>(thing: &'a T, other: &'b T) -> bool {
25-
to_uint(thing) == to_uint(other)
25+
(thing as *T) == (other as *T)
2626
}
2727

2828
// Equality for region pointers
@@ -70,3 +70,17 @@ impl<'self, T: TotalEq> TotalEq for &'self T {
7070
#[inline]
7171
fn equals(&self, other: & &'self T) -> bool { (**self).equals(*other) }
7272
}
73+
74+
#[cfg(test)]
75+
mod tests {
76+
use super::ref_eq;
77+
78+
#[test]
79+
fn test_ref_eq() {
80+
let x = 1;
81+
let y = 1;
82+
83+
assert!(ref_eq(&x, &x));
84+
assert!(!ref_eq(&x, &y));
85+
}
86+
}

0 commit comments

Comments
 (0)