diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2017-12-13 01:02:19 -0600 |
|---|---|---|
| committer | Manish Goregaokar <manishsmail@gmail.com> | 2017-12-13 01:15:18 -0600 |
| commit | 2bf0df777b7712d1b719cd5ac7cce63176b7384c (patch) | |
| tree | 476d3bba1e8abfe11152ac18c0ccb763e810ea72 /src/libstd/sys | |
| parent | 707d0708158dabd9b0a12af21a4b51bf1713cb9e (diff) | |
| download | rust-2bf0df777b7712d1b719cd5ac7cce63176b7384c.tar.gz rust-2bf0df777b7712d1b719cd5ac7cce63176b7384c.zip | |
Move rust memchr impl to libcore
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/redox/memchr.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sys/unix/memchr.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sys/wasm/memchr.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sys/windows/memchr.rs | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/libstd/sys/redox/memchr.rs b/src/libstd/sys/redox/memchr.rs index 4c314b7a472..873b3353502 100644 --- a/src/libstd/sys/redox/memchr.rs +++ b/src/libstd/sys/redox/memchr.rs @@ -11,4 +11,4 @@ // Original implementation taken from rust-memchr // Copyright 2015 Andrew Gallant, bluss and Nicolas Koch -pub use sys_common::memchr::fallback::{memchr, memrchr}; +pub use core::slice::memchr::{memchr, memrchr}; diff --git a/src/libstd/sys/unix/memchr.rs b/src/libstd/sys/unix/memchr.rs index aed04703ea1..f49adc24163 100644 --- a/src/libstd/sys/unix/memchr.rs +++ b/src/libstd/sys/unix/memchr.rs @@ -50,7 +50,7 @@ pub fn memrchr(needle: u8, haystack: &[u8]) -> Option<usize> { #[cfg(not(target_os = "linux"))] fn memrchr_specific(needle: u8, haystack: &[u8]) -> Option<usize> { - ::sys_common::memchr::fallback::memrchr(needle, haystack) + ::core::slice::memchr::memrchr(needle, haystack) } memrchr_specific(needle, haystack) diff --git a/src/libstd/sys/wasm/memchr.rs b/src/libstd/sys/wasm/memchr.rs index e611d94af30..964e3599413 100644 --- a/src/libstd/sys/wasm/memchr.rs +++ b/src/libstd/sys/wasm/memchr.rs @@ -8,4 +8,4 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -pub use sys_common::memchr::fallback::{memchr, memrchr}; +pub use core::slice::memchr::{memchr, memrchr}; diff --git a/src/libstd/sys/windows/memchr.rs b/src/libstd/sys/windows/memchr.rs index 5a5386acaa5..fa7c816fd02 100644 --- a/src/libstd/sys/windows/memchr.rs +++ b/src/libstd/sys/windows/memchr.rs @@ -12,4 +12,4 @@ // Copyright 2015 Andrew Gallant, bluss and Nicolas Koch // Fallback memchr is fastest on windows -pub use sys_common::memchr::fallback::{memchr, memrchr}; +pub use core::slice::memchr::{memchr, memrchr}; |