diff options
| author | Michael McConville <mmcco@mykolab.com> | 2015-12-18 22:37:00 -0500 |
|---|---|---|
| committer | Michael McConville <mmcco@mykolab.com> | 2015-12-18 22:37:00 -0500 |
| commit | e8d2706cbac46eac7f4cd1554c41c748e00a4a00 (patch) | |
| tree | 556cad53a8d415b3b3a660d756d3bc20bf1609cb /src/libstd/ffi | |
| parent | 33113f86f4c4f191d1bf42642b1a7714c576e395 (diff) | |
| parent | 8ad12c3e251df6b8ed42b4d32709f4f55470a0be (diff) | |
| download | rust-e8d2706cbac46eac7f4cd1554c41c748e00a4a00.tar.gz rust-e8d2706cbac46eac7f4cd1554c41c748e00a4a00.zip | |
Merge branch 'master' of https://github.com/rust-lang/rust
Diffstat (limited to 'src/libstd/ffi')
| -rw-r--r-- | src/libstd/ffi/c_str.rs | 3 |
1 files changed, 2 insertions, 1 deletions
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) }), } |