Revert liblibc submodule url

rust-lang · Oct 18, 2018 · 91c1b7a · 91c1b7a
1 parent 9d42b1b
commit 91c1b7a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git 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
diff --git 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;