Skip to content

Commit a988f17

Browse files
committed
---
yaml --- r: 32261 b: refs/heads/dist-snap c: 54a8d69 h: refs/heads/master i: 32259: 049fa18 v: v3
1 parent f4ad4c9 commit a988f17

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
99
refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
10-
refs/heads/dist-snap: 7fec8419f38bbcd662b24cc7b4a77a902150e3db
10+
refs/heads/dist-snap: 54a8d69c4feb878e0367cc55772c04ee2d59c8a5
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/libcore/str.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -671,18 +671,18 @@ Section: Comparing strings
671671

672672
/// Bytewise slice equality
673673
pure fn eq_slice(a: &str, b: &str) -> bool {
674-
let a_len = a.len();
675-
let b_len = b.len();
676-
if a_len != b_len { return false; }
677-
let mut end = uint::min(&a_len, &b_len);
678-
679-
let mut i = 0u;
680-
while i < end {
681-
if a[i] != b[i] { return false; }
682-
i += 1u;
674+
do as_buf(a) |ap, alen| {
675+
do as_buf(b) |bp, blen| {
676+
if (alen != blen) { false }
677+
else {
678+
unsafe {
679+
libc::memcmp(ap as *libc::c_void,
680+
bp as *libc::c_void,
681+
alen as libc::size_t) == 0
682+
}
683+
}
684+
}
683685
}
684-
685-
return true;
686686
}
687687

688688
/// Bytewise string equality

0 commit comments

Comments
 (0)