diff options
| author | Taiki Endo <te316e89@gmail.com> | 2019-02-11 04:23:21 +0900 |
|---|---|---|
| committer | Taiki Endo <te316e89@gmail.com> | 2019-02-28 04:06:15 +0900 |
| commit | 93b6d9e086c6910118a57e4332c9448ab550931f (patch) | |
| tree | 26b124bf1caa9fb65c7af0c2d115e9317572c37f /src/libstd/sys/unix/memchr.rs | |
| parent | 7e001e5c6c7c090b41416a57d4be412ed3ccd937 (diff) | |
| download | rust-93b6d9e086c6910118a57e4332c9448ab550931f.tar.gz rust-93b6d9e086c6910118a57e4332c9448ab550931f.zip | |
libstd => 2018
Diffstat (limited to 'src/libstd/sys/unix/memchr.rs')
| -rw-r--r-- | src/libstd/sys/unix/memchr.rs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/libstd/sys/unix/memchr.rs b/src/libstd/sys/unix/memchr.rs index ec04a22a0d2..1984678bdde 100644 --- a/src/libstd/sys/unix/memchr.rs +++ b/src/libstd/sys/unix/memchr.rs @@ -2,8 +2,6 @@ // Copyright 2015 Andrew Gallant, bluss and Nicolas Koch pub fn memchr(needle: u8, haystack: &[u8]) -> Option<usize> { - use libc; - let p = unsafe { libc::memchr( haystack.as_ptr() as *const libc::c_void, @@ -21,8 +19,6 @@ pub fn memrchr(needle: u8, haystack: &[u8]) -> Option<usize> { #[cfg(target_os = "linux")] fn memrchr_specific(needle: u8, haystack: &[u8]) -> Option<usize> { - use libc; - // GNU's memrchr() will - unlike memchr() - error if haystack is empty. if haystack.is_empty() {return None} let p = unsafe { @@ -40,7 +36,7 @@ pub fn memrchr(needle: u8, haystack: &[u8]) -> Option<usize> { #[cfg(not(target_os = "linux"))] fn memrchr_specific(needle: u8, haystack: &[u8]) -> Option<usize> { - ::core::slice::memchr::memrchr(needle, haystack) + core::slice::memchr::memrchr(needle, haystack) } memrchr_specific(needle, haystack) |