From ba483c51dfc1d17c75dc4502397ad92c78a53e77 Mon Sep 17 00:00:00 2001
From: Mara Bos <m-ou.se@m-ou.se>
Date: Wed, 7 Oct 2020 20:38:25 +0200
Subject: [PATCH] Take sys/vxworks/args from sys/unix instead.

---
 library/std/src/sys/unix/args.rs    |  3 +-
 library/std/src/sys/vxworks/args.rs | 95 -----------------------------
 library/std/src/sys/vxworks/mod.rs  |  1 +
 3 files changed, 3 insertions(+), 96 deletions(-)
 delete mode 100644 library/std/src/sys/vxworks/args.rs

diff --git a/library/std/src/sys/unix/args.rs b/library/std/src/sys/unix/args.rs
index f7c3f163718..69676472493 100644
--- a/library/std/src/sys/unix/args.rs
+++ b/library/std/src/sys/unix/args.rs
@@ -70,7 +70,8 @@ impl DoubleEndedIterator for Args {
     target_os = "haiku",
     target_os = "l4re",
     target_os = "fuchsia",
-    target_os = "redox"
+    target_os = "redox",
+    target_os = "vxworks"
 ))]
 mod imp {
     use super::Args;
diff --git a/library/std/src/sys/vxworks/args.rs b/library/std/src/sys/vxworks/args.rs
deleted file mode 100644
index 30cf7a707c7..00000000000
--- a/library/std/src/sys/vxworks/args.rs
+++ /dev/null
@@ -1,95 +0,0 @@
-#![allow(dead_code)] // runtime init functions not used during testing
-use crate::ffi::OsString;
-use crate::marker::PhantomData;
-use crate::vec;
-
-/// One-time global initialization.
-pub unsafe fn init(argc: isize, argv: *const *const u8) {
-    imp::init(argc, argv)
-}
-
-/// One-time global cleanup.
-pub unsafe fn cleanup() {
-    imp::cleanup()
-}
-
-/// Returns the command line arguments
-pub fn args() -> Args {
-    imp::args()
-}
-
-pub struct Args {
-    iter: vec::IntoIter<OsString>,
-    _dont_send_or_sync_me: PhantomData<*mut ()>,
-}
-
-impl Args {
-    pub fn inner_debug(&self) -> &[OsString] {
-        self.iter.as_slice()
-    }
-}
-
-impl Iterator for Args {
-    type Item = OsString;
-    fn next(&mut self) -> Option<OsString> {
-        self.iter.next()
-    }
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        self.iter.size_hint()
-    }
-}
-
-impl ExactSizeIterator for Args {
-    fn len(&self) -> usize {
-        self.iter.len()
-    }
-}
-
-impl DoubleEndedIterator for Args {
-    fn next_back(&mut self) -> Option<OsString> {
-        self.iter.next_back()
-    }
-}
-
-mod imp {
-    use super::Args;
-    use crate::ffi::{CStr, OsString};
-    use crate::marker::PhantomData;
-    use crate::ptr;
-
-    use crate::sys_common::mutex::StaticMutex;
-
-    static mut ARGC: isize = 0;
-    static mut ARGV: *const *const u8 = ptr::null();
-    static LOCK: StaticMutex = StaticMutex::new();
-
-    pub unsafe fn init(argc: isize, argv: *const *const u8) {
-        let _guard = LOCK.lock();
-        ARGC = argc;
-        ARGV = argv;
-    }
-
-    pub unsafe fn cleanup() {
-        let _guard = LOCK.lock();
-        ARGC = 0;
-        ARGV = ptr::null();
-    }
-
-    pub fn args() -> Args {
-        Args { iter: clone().into_iter(), _dont_send_or_sync_me: PhantomData }
-    }
-
-    fn clone() -> Vec<OsString> {
-        unsafe {
-            let _guard = LOCK.lock();
-            let ret = (0..ARGC)
-                .map(|i| {
-                    let cstr = CStr::from_ptr(*ARGV.offset(i) as *const libc::c_char);
-                    use crate::sys::vxworks::ext::ffi::OsStringExt;
-                    OsStringExt::from_vec(cstr.to_bytes().to_vec())
-                })
-                .collect();
-            return ret;
-        }
-    }
-}
diff --git a/library/std/src/sys/vxworks/mod.rs b/library/std/src/sys/vxworks/mod.rs
index 9853eb3bf3d..f4a811074ca 100644
--- a/library/std/src/sys/vxworks/mod.rs
+++ b/library/std/src/sys/vxworks/mod.rs
@@ -13,6 +13,7 @@ pub mod weak;
 
 #[path = "../unix/alloc.rs"]
 pub mod alloc;
+#[path = "../unix/args.rs"]
 pub mod args;
 pub mod cmath;
 #[path = "../unix/condvar.rs"]