diff options
| -rw-r--r-- | .gitmodules | 2 | ||||
| m--------- | src/liblibc | 0 | ||||
| -rw-r--r-- | src/libstd/sys/redox/process.rs | 9 |
3 files changed, 3 insertions, 8 deletions
diff --git a/.gitmodules b/.gitmodules index b5f60e6b677..038237aa179 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,7 +10,7 @@ url = https://github.com/rust-lang/rust-installer.git [submodule "src/liblibc"] path = src/liblibc - url = https://gitlab.redox-os.org/redox-os/liblibc.git + url = https://github.com/rust-lang/libc.git [submodule "src/doc/nomicon"] path = src/doc/nomicon url = https://github.com/rust-lang-nursery/nomicon.git diff --git a/src/liblibc b/src/liblibc -Subproject 1844a772b60771d0124a157019f627d60fea4e7 +Subproject c75ca6465a139704e00295be355b1f067af2f53 diff --git a/src/libstd/sys/redox/process.rs b/src/libstd/sys/redox/process.rs index 3b2cb7c5e13..e7a87e3ff88 100644 --- a/src/libstd/sys/redox/process.rs +++ b/src/libstd/sys/redox/process.rs @@ -10,16 +10,11 @@ use env::{split_paths}; use ffi::{CStr, OsStr}; -use fs::File; -use os::unix::ffi::OsStrExt; use fmt; -<<<<<<< HEAD -use io::{self, Error, ErrorKind}; -use iter; -======= +use fs::File; use io::{self, prelude::*, BufReader, Error, ErrorKind, SeekFrom}; ->>>>>>> b7b1d416a1... Interpret shebangs on redox use libc::{EXIT_SUCCESS, EXIT_FAILURE}; +use os::unix::ffi::OsStrExt; use path::{Path, PathBuf}; use ptr; use sys::ext::fs::MetadataExt; |