Take sys/vxworks/memchar from sys/unix instead.

2 files changed, 1 insertions, 21 deletions

diff --git a/library/std/src/sys/vxworks/memchr.rs b/library/std/src/sys/vxworks/memchr.rs
deleted file mode 100644
index 928100c92ff..00000000000
--- a/library/std/src/sys/vxworks/memchr.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Original implementation taken from rust-memchr.
-// Copyright 2015 Andrew Gallant, bluss and Nicolas Koch
-
-pub fn memchr(needle: u8, haystack: &[u8]) -> Option<usize> {
-    let p = unsafe {
-        libc::memchr(
-            haystack.as_ptr() as *const libc::c_void,
-            needle as libc::c_int,
-            haystack.len(),
-        )
-    };
-    if p.is_null() { None } else { Some(p as usize - (haystack.as_ptr() as usize)) }
-}
-
-pub fn memrchr(needle: u8, haystack: &[u8]) -> Option<usize> {
-    fn memrchr_specific(needle: u8, haystack: &[u8]) -> Option<usize> {
-        core::slice::memchr::memrchr(needle, haystack)
-    }
-
-    memrchr_specific(needle, haystack)
-}
diff --git a/library/std/src/sys/vxworks/mod.rs b/library/std/src/sys/vxworks/mod.rs
index 27e53fa9854..9853eb3bf3d 100644
--- a/library/std/src/sys/vxworks/mod.rs
+++ b/library/std/src/sys/vxworks/mod.rs
@@ -23,6 +23,7 @@ pub mod ext;
 pub mod fd;
 pub mod fs;
 pub mod io;
+#[path = "../unix/memchr.rs"]
 pub mod memchr;
 #[path = "../unix/mutex.rs"]
 pub mod mutex;