From de3e843d2467dff3ccb83efbae9260dc1b2a40bf Mon Sep 17 00:00:00 2001
From: Florian Hahn <flo@fhahn.com>
Date: Tue, 15 Dec 2015 00:03:42 +0100
Subject: Use memchr in libstd where possible, closes #30076

---
 src/libstd/ffi/c_str.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/libstd/ffi')

diff --git a/src/libstd/ffi/c_str.rs b/src/libstd/ffi/c_str.rs
index 318ff410cba..3f3913471b8 100644
--- a/src/libstd/ffi/c_str.rs
+++ b/src/libstd/ffi/c_str.rs
@@ -19,6 +19,7 @@ use io;
 use iter::Iterator;
 use libc;
 use mem;
+use memchr;
 use ops::Deref;
 use option::Option::{self, Some, None};
 use os::raw::c_char;
@@ -188,7 +189,7 @@ impl CString {
     }
 
     fn _new(bytes: Vec<u8>) -> Result<CString, NulError> {
-        match bytes.iter().position(|x| *x == 0) {
+        match memchr::memchr(0, &bytes) {
             Some(i) => Err(NulError(i, bytes)),
             None => Ok(unsafe { CString::from_vec_unchecked(bytes) }),
         }
-- 
cgit 1.4.1-3-g733a5