Revert liblibc submodule url

diff --git a/.gitmodules b/.gitmodules
index b5f60e6b6770fcbdebace62373a2dbd125b9c57f..038237aa179a9b421aab40eb989f03d1679a073f 100644 (file)
--- 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
index 1844a772b60771d0124a157019f627d60fea4e73..c75ca6465a139704e00295be355b1f067af2f535 160000 (submodule)
--- a/src/liblibc
+++ b/src/liblibc
@@ -1 +1 @@
-Subproject commit 1844a772b60771d0124a157019f627d60fea4e73
+Subproject commit c75ca6465a139704e00295be355b1f067af2f535

diff --git a/src/libstd/sys/redox/process.rs b/src/libstd/sys/redox/process.rs
index 3b2cb7c5e1363f3de76959d6cf0f3b26f8ba8d5f..e7a87e3ff885548ed8d2c93334693d5d22ca9ee9 100644 (file)
--- 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;