Auto merge of #8446 - servo:rustup_20151110, r=SimonSapin+Ms2ger+jdm+Manishearth

Rust upgrade to rustc 1.6.0-nightly (5b4986fa5 2015-11-08)

<s>DO NOT r+ or try+ this</s>

<s>It causes an OOM (https://github.com/rust-lang/rust/issues/29740) and can crash the OS. Probably will set our CI on fire. </s>

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8446)
<!-- Reviewable:end -->

1 files changed, 5 insertions, 5 deletions

diff --git a/components/servo/main.rs b/components/servo/main.rs
index 437df310832..3c17be5503d 100644
--- a/components/servo/main.rs
+++ b/components/servo/main.rs
@@ -229,7 +229,7 @@ mod android {
     use std::borrow::ToOwned;
 
     pub fn setup_logging() {
-        use self::libc::consts::os::posix88::{STDERR_FILENO, STDOUT_FILENO};
+        use self::libc::{STDERR_FILENO, STDOUT_FILENO};
         //use std::env;
 
         //env::set_var("RUST_LOG", "servo,gfx,msg,util,layers,js,std,rt,extra");
@@ -239,14 +239,14 @@ mod android {
         unsafe { super::app_dummy(); }
     }
 
-    struct FilePtr(*mut self::libc::types::common::c95::FILE);
+    struct FilePtr(*mut self::libc::FILE);
 
     unsafe impl Send for FilePtr {}
 
     fn redirect_output(file_no: c_int) {
-        use self::libc::funcs::c95::stdio::fgets;
-        use self::libc::funcs::posix88::stdio::fdopen;
-        use self::libc::funcs::posix88::unistd::{pipe, dup2};
+        use self::libc::fdopen;
+        use self::libc::fgets;
+        use self::libc::{pipe, dup2};
         use servo::util::task::spawn_named;
         use std::ffi::CStr;
         use std::ffi::CString;