Skip to content

Commit 90b8f55

Browse files
committed
---
yaml --- r: 32457 b: refs/heads/dist-snap c: 3078830 h: refs/heads/master i: 32455: e5b246d v: v3
1 parent 04e1859 commit 90b8f55

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-1
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: 1fcfee674a569b296d0da391af113a3776c749a1
10+
refs/heads/dist-snap: 3078830934ba5596e7eac86825636b49451e40e3
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -713,6 +713,7 @@ Section: Comparing strings
713713
*/
714714

715715
/// Bytewise slice equality
716+
#[cfg(notest)]
716717
#[lang="str_eq"]
717718
pure fn eq_slice(a: &str, b: &str) -> bool {
718719
do as_buf(a) |ap, alen| {
@@ -729,6 +730,22 @@ pure fn eq_slice(a: &str, b: &str) -> bool {
729730
}
730731
}
731732

733+
#[cfg(test)]
734+
pure fn eq_slice(a: &str, b: &str) -> bool {
735+
do as_buf(a) |ap, alen| {
736+
do as_buf(b) |bp, blen| {
737+
if (alen != blen) { false }
738+
else {
739+
unsafe {
740+
libc::memcmp(ap as *libc::c_void,
741+
bp as *libc::c_void,
742+
(alen - 1) as libc::size_t) == 0
743+
}
744+
}
745+
}
746+
}
747+
}
748+
732749
/// Bytewise string equality
733750
pure fn eq(a: &~str, b: &~str) -> bool {
734751
eq_slice(*a, *b)

0 commit comments

Comments
 (0)