From 25e1a4a0084a56807d7a1e4ca676e078c085b3aa Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Thu, 10 Nov 2016 20:13:14 -0700
Subject: Use target_os = redox for cfg

---
 src/libstd/sys_common/mod.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/libstd/sys_common')

diff --git a/src/libstd/sys_common/mod.rs b/src/libstd/sys_common/mod.rs
index bbd2f679bca..5f5ea09c78d 100644
--- a/src/libstd/sys_common/mod.rs
+++ b/src/libstd/sys_common/mod.rs
@@ -43,10 +43,10 @@ pub mod thread_local;
 pub mod util;
 pub mod wtf8;
 
-#[cfg(redox)]
+#[cfg(target_os = "redox")]
 pub use sys::net;
 
-#[cfg(not(redox))]
+#[cfg(not(target_os = "redox"))]
 pub mod net;
 
 #[cfg(any(not(cargobuild), feature = "backtrace"))]
-- 
cgit 1.4.1-3-g733a5


From 214a6c61666202ab073fceaeab13885027c8c3f2 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Tue, 20 Dec 2016 12:18:55 -0800
Subject: Fix compile errors and such

---
 src/librustc_resolve/lib.rs    | 2 +-
 src/libstd/os/macos/raw.rs     | 2 +-
 src/libstd/os/mod.rs           | 2 +-
 src/libstd/sys/mod.rs          | 2 ++
 src/libstd/sys/unix/ext/net.rs | 7 +++----
 src/libstd/sys_common/mod.rs   | 1 +
 6 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'src/libstd/sys_common')

diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs
index 18d7499e751..f73227681c5 100644
--- a/src/librustc_resolve/lib.rs
+++ b/src/librustc_resolve/lib.rs
@@ -1358,7 +1358,7 @@ impl<'a> Resolver<'a> {
                     span: span, name: ident.name, lexical: false, b1: b1, b2: b2, legacy: legacy,
                 });
                 if legacy {
-                    self.record_use(name, ns, b1, span);
+                    self.record_use(ident, ns, b1, span);
                 }
                 !legacy
             }
diff --git a/src/libstd/os/macos/raw.rs b/src/libstd/os/macos/raw.rs
index 0b96295f9e6..8f9b29462c4 100644
--- a/src/libstd/os/macos/raw.rs
+++ b/src/libstd/os/macos/raw.rs
@@ -33,7 +33,7 @@ use os::raw::c_long;
 pub type pthread_t = usize;
 
 #[repr(C)]
-#[derive(Clone, Debug)]
+#[derive(Clone)]
 #[stable(feature = "raw_ext", since = "1.1.0")]
 pub struct stat {
     #[stable(feature = "raw_ext", since = "1.1.0")]
diff --git a/src/libstd/os/mod.rs b/src/libstd/os/mod.rs
index 58f1604de1c..e45af867055 100644
--- a/src/libstd/os/mod.rs
+++ b/src/libstd/os/mod.rs
@@ -11,7 +11,7 @@
 //! OS-specific functionality.
 
 #![stable(feature = "os", since = "1.0.0")]
-#![allow(missing_docs, bad_style)]
+#![allow(missing_docs, bad_style, missing_debug_implementations)]
 
 #[cfg(any(target_os = "redox", unix))]
 #[stable(feature = "rust1", since = "1.0.0")]
diff --git a/src/libstd/sys/mod.rs b/src/libstd/sys/mod.rs
index e4b0d980c92..14da376efa9 100644
--- a/src/libstd/sys/mod.rs
+++ b/src/libstd/sys/mod.rs
@@ -30,6 +30,8 @@
 //! inter-dependencies within `std` that will be a challenging goal to
 //! achieve.
 
+#![allow(missing_debug_implementations)]
+
 pub use self::imp::*;
 
 #[cfg(target_os = "redox")]
diff --git a/src/libstd/sys/unix/ext/net.rs b/src/libstd/sys/unix/ext/net.rs
index e822488c018..1ba4a104e51 100644
--- a/src/libstd/sys/unix/ext/net.rs
+++ b/src/libstd/sys/unix/ext/net.rs
@@ -141,7 +141,7 @@ impl SocketAddr {
     ///
     /// A named address:
     ///
-    /// ```
+    /// ```no_run
     /// use std::os::unix::net::UnixListener;
     ///
     /// let socket = UnixListener::bind("/tmp/sock").unwrap();
@@ -173,7 +173,7 @@ impl SocketAddr {
     ///
     /// With a pathname:
     ///
-    /// ```
+    /// ```no_run
     /// use std::os::unix::net::UnixListener;
     /// use std::path::Path;
     ///
@@ -186,7 +186,6 @@ impl SocketAddr {
     ///
     /// ```
     /// use std::os::unix::net::UnixDatagram;
-    /// use std::path::Path;
     ///
     /// let socket = UnixDatagram::unbound().unwrap();
     /// let addr = socket.local_addr().expect("Couldn't get local address");
@@ -624,7 +623,7 @@ impl UnixListener {
     ///
     /// # Examples
     ///
-    /// ```
+    /// ```no_run
     /// use std::os::unix::net::UnixListener;
     ///
     /// let listener = match UnixListener::bind("/path/to/the/socket") {
diff --git a/src/libstd/sys_common/mod.rs b/src/libstd/sys_common/mod.rs
index 5c07e36508c..634d6258885 100644
--- a/src/libstd/sys_common/mod.rs
+++ b/src/libstd/sys_common/mod.rs
@@ -23,6 +23,7 @@
 //! `std::sys` from the standard library.
 
 #![allow(missing_docs)]
+#![allow(missing_debug_implementations)]
 
 use sync::Once;
 use sys;
-- 
cgit 1.4.1-3-g733a5