diff options
| author | jD91mZM2 <me@krake.one> | 2018-10-18 16:53:26 +0200 |
|---|---|---|
| committer | jD91mZM2 <me@krake.one> | 2018-10-18 16:54:43 +0200 |
| commit | 91c1b7a9291ca4ea91f928b1abfe8fc8fe9a0111 (patch) | |
| tree | b10cbef9da680a8ff4b7ee0b2ae6b04bcae8235d /src/libstd | |
| parent | 9d42b1bf04a807c18da0671ecadb8f4fa2044077 (diff) | |
| download | rust-91c1b7a9291ca4ea91f928b1abfe8fc8fe9a0111.tar.gz rust-91c1b7a9291ca4ea91f928b1abfe8fc8fe9a0111.zip | |
Revert liblibc submodule url
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/sys/redox/process.rs | 9 |
1 files changed, 2 insertions, 7 deletions
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; |