From 3078830934ba5596e7eac86825636b49451e40e3 Mon Sep 17 00:00:00 2001 From: Patrick Walton Date: Fri, 7 Sep 2012 16:09:38 -0700 Subject: [PATCH] libcore: Make str_eq not break with coretest --- src/libcore/str.rs | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/libcore/str.rs b/src/libcore/str.rs index 003f2a888c1..ca96090ebd4 100644 --- a/src/libcore/str.rs +++ b/src/libcore/str.rs @@ -713,6 +713,7 @@ Section: Comparing strings */ /// Bytewise slice equality +#[cfg(notest)] #[lang="str_eq"] pure fn eq_slice(a: &str, b: &str) -> bool { do as_buf(a) |ap, alen| { @@ -729,6 +730,22 @@ pure fn eq_slice(a: &str, b: &str) -> bool { } } +#[cfg(test)] +pure fn eq_slice(a: &str, b: &str) -> bool { + do as_buf(a) |ap, alen| { + do as_buf(b) |bp, blen| { + if (alen != blen) { false } + else { + unsafe { + libc::memcmp(ap as *libc::c_void, + bp as *libc::c_void, + (alen - 1) as libc::size_t) == 0 + } + } + } + } +} + /// Bytewise string equality pure fn eq(a: &~str, b: &~str) -> bool { eq_slice(*a, *b)