Update libstd patches for latest nightly and macOS

2 files changed, 84 insertions, 23 deletions

diff --git a/0007-Fix-libstd-building.patch b/0007-Fix-libstd-building.patch
index be930ae3022..bbbbaab9ff1 100644
--- a/0007-Fix-libstd-building.patch
+++ b/0007-Fix-libstd-building.patch
@@ -1,20 +1,21 @@
-From 40c86527fe92b608a65cc1187901035ebc56b281 Mon Sep 17 00:00:00 2001
+From d8bb60cc115960702f73f83866cde65dcdcf1cb4 Mon Sep 17 00:00:00 2001
 From: bjorn3 <bjorn3@users.noreply.github.com>
-Date: Sat, 6 Oct 2018 13:21:15 +0200
+Date: Sat, 17 Nov 2018 11:08:10 +0100
 Subject: [PATCH] Fix libstd building
 
 ---
  src/libstd/lib.rs            |  6 ------
  src/libstd/net/ip.rs         | 20 --------------------
  src/libstd/num.rs            |  2 +-
+ src/libstd/panic.rs          |  6 ------
  src/libstd/primitive_docs.rs | 16 ----------------
- 4 files changed, 1 insertion(+), 43 deletions(-)
+ 5 files changed, 1 insertion(+), 49 deletions(-)
 
 diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
-index 4768e8b..c89f99a 100644
+index 6110b05..8b0c897 100644
 --- a/src/libstd/lib.rs
 +++ b/src/libstd/lib.rs
-@@ -257,7 +257,6 @@
+@@ -255,7 +255,6 @@
  #![feature(const_cstr_unchecked)]
  #![feature(core_intrinsics)]
  #![feature(dropck_eyepatch)]
@@ -22,7 +23,7 @@ index 4768e8b..c89f99a 100644
  #![feature(exact_size_is_empty)]
  #![feature(external_doc)]
  #![feature(fixed_size_array)]
-@@ -287,7 +286,6 @@
+@@ -286,7 +285,6 @@
  #![feature(rustc_attrs)]
  #![feature(rustc_const_unstable)]
  #![feature(std_internals)]
@@ -30,7 +31,7 @@ index 4768e8b..c89f99a 100644
  #![feature(shrink_to)]
  #![feature(slice_concat_ext)]
  #![feature(slice_internals)]
-@@ -410,8 +408,6 @@ pub use core::i16;
+@@ -402,8 +400,6 @@ pub use core::i16;
  pub use core::i32;
  #[stable(feature = "rust1", since = "1.0.0")]
  pub use core::i64;
@@ -39,7 +40,7 @@ index 4768e8b..c89f99a 100644
  #[stable(feature = "rust1", since = "1.0.0")]
  pub use core::usize;
  #[stable(feature = "rust1", since = "1.0.0")]
-@@ -444,8 +440,6 @@ pub use alloc_crate::string;
+@@ -436,8 +432,6 @@ pub use alloc_crate::string;
  pub use alloc_crate::vec;
  #[stable(feature = "rust1", since = "1.0.0")]
  pub use core::char;
@@ -49,10 +50,10 @@ index 4768e8b..c89f99a 100644
  pub use core::hint;
  
 diff --git a/src/libstd/net/ip.rs b/src/libstd/net/ip.rs
-index d45a66e..b25b862 100644
+index 8685cb7..c4bf4d2 100644
 --- a/src/libstd/net/ip.rs
 +++ b/src/libstd/net/ip.rs
-@@ -1393,26 +1393,6 @@ impl FromInner<c::in6_addr> for Ipv6Addr {
+@@ -1392,26 +1392,6 @@ impl FromInner<c::in6_addr> for Ipv6Addr {
      }
  }
  
@@ -92,8 +93,32 @@ index 3f90c1f..85aab83 100644
  
  #[cfg(test)] use fmt;
  #[cfg(test)] use ops::{Add, Sub, Mul, Div, Rem};
+diff --git a/src/libstd/panic.rs b/src/libstd/panic.rs
+index 4bc18a5..5c87035 100644
+--- a/src/libstd/panic.rs
++++ b/src/libstd/panic.rs
+@@ -264,9 +264,6 @@ impl RefUnwindSafe for atomic::AtomicI32 {}
+ #[cfg(target_has_atomic = "64")]
+ #[unstable(feature = "integer_atomics", issue = "32976")]
+ impl RefUnwindSafe for atomic::AtomicI64 {}
+-#[cfg(all(not(stage0), target_has_atomic = "128"))]
+-#[unstable(feature = "integer_atomics", issue = "32976")]
+-impl RefUnwindSafe for atomic::AtomicI128 {}
+ 
+ #[cfg(target_has_atomic = "ptr")]
+ #[stable(feature = "unwind_safe_atomic_refs", since = "1.14.0")]
+@@ -283,9 +280,6 @@ impl RefUnwindSafe for atomic::AtomicU32 {}
+ #[cfg(target_has_atomic = "64")]
+ #[unstable(feature = "integer_atomics", issue = "32976")]
+ impl RefUnwindSafe for atomic::AtomicU64 {}
+-#[cfg(all(not(stage0), target_has_atomic = "128"))]
+-#[unstable(feature = "integer_atomics", issue = "32976")]
+-impl RefUnwindSafe for atomic::AtomicU128 {}
+ 
+ #[cfg(target_has_atomic = "8")]
+ #[stable(feature = "unwind_safe_atomic_refs", since = "1.14.0")]
 diff --git a/src/libstd/primitive_docs.rs b/src/libstd/primitive_docs.rs
-index 8d54728..c36893c 100644
+index c2a1612..99824c5 100644
 --- a/src/libstd/primitive_docs.rs
 +++ b/src/libstd/primitive_docs.rs
 @@ -809,14 +809,6 @@ mod prim_i32 { }
@@ -127,5 +152,5 @@ index 8d54728..c36893c 100644
  //
  /// The pointer-sized signed integer type.
 -- 
-2.17.1 (Apple Git-112)
+2.17.2 (Apple Git-113)
 
diff --git a/0008-Replace-some-variadic-function-calls-with-unimplemen.patch b/0008-Replace-some-variadic-function-calls-with-unimplemen.patch
index a46bf1dd60a..44edafcfcc3 100644
--- a/0008-Replace-some-variadic-function-calls-with-unimplemen.patch
+++ b/0008-Replace-some-variadic-function-calls-with-unimplemen.patch
@@ -1,18 +1,18 @@
-From 96aefe8fdd28704d903d585f5be6a667d2485582 Mon Sep 17 00:00:00 2001
+From d1d5c0e5272a8c3f78e9c4eb97c38d8f5d5a6d87 Mon Sep 17 00:00:00 2001
 From: bjorn3 <bjorn3@users.noreply.github.com>
-Date: Thu, 15 Nov 2018 11:41:06 +0100
+Date: Sat, 17 Nov 2018 11:13:19 +0100
 Subject: [PATCH] Replace some variadic function calls with unimplemented!()
 
 ---
  src/libstd/sys/unix/fd.rs     | 18 ++++++++++++++++++
- src/libstd/sys/unix/fs.rs     |  9 +++++++++
+ src/libstd/sys/unix/fs.rs     | 17 ++++++++++++++++-
  src/libstd/sys/unix/net.rs    |  3 +++
  src/libstd/sys/unix/rand.rs   |  3 +++
  src/libstd/sys/unix/thread.rs |  3 +++
- 5 files changed, 36 insertions(+)
+ 5 files changed, 43 insertions(+), 1 deletion(-)
 
 diff --git a/src/libstd/sys/unix/fd.rs b/src/libstd/sys/unix/fd.rs
-index af33d26..2433ae4 100644
+index 5a81d6d..919f9d1 100644
 --- a/src/libstd/sys/unix/fd.rs
 +++ b/src/libstd/sys/unix/fd.rs
 @@ -156,9 +156,12 @@ impl FileDesc {
@@ -99,7 +99,7 @@ index af33d26..2433ae4 100644
  }
  
 diff --git a/src/libstd/sys/unix/fs.rs b/src/libstd/sys/unix/fs.rs
-index add06ae..e0d3f84 100644
+index add06ae..1a392fc 100644
 --- a/src/libstd/sys/unix/fs.rs
 +++ b/src/libstd/sys/unix/fs.rs
 @@ -465,6 +465,7 @@ impl File {
@@ -119,7 +119,43 @@ index add06ae..e0d3f84 100644
      }
  
      pub fn file_attr(&self) -> io::Result<FileAttr> {
-@@ -667,6 +670,7 @@ impl fmt::Debug for File {
+@@ -535,6 +538,7 @@ impl File {
+     }
+ 
+     pub fn datasync(&self) -> io::Result<()> {
++        /*
+         cvt_r(|| unsafe { os_datasync(self.0.raw()) })?;
+         return Ok(());
+ 
+@@ -547,7 +551,9 @@ impl File {
+         #[cfg(not(any(target_os = "macos",
+                       target_os = "ios",
+                       target_os = "linux")))]
+-        unsafe fn os_datasync(fd: c_int) -> c_int { libc::fsync(fd) }
++        unsafe fn os_datasync(fd: c_int) -> c_int { libc::fsync(fd) }]
++        */
++        unimplemented!();
+     }
+ 
+     pub fn truncate(&self, size: u64) -> io::Result<()> {
+@@ -643,6 +649,7 @@ impl fmt::Debug for File {
+ 
+         #[cfg(target_os = "macos")]
+         fn get_path(fd: c_int) -> Option<PathBuf> {
++            /*
+             // FIXME: The use of PATH_MAX is generally not encouraged, but it
+             // is inevitable in this case because macOS defines `fcntl` with
+             // `F_GETPATH` in terms of `MAXPATHLEN`, and there are no
+@@ -657,6 +664,8 @@ impl fmt::Debug for File {
+             buf.truncate(l as usize);
+             buf.shrink_to_fit();
+             Some(PathBuf::from(OsString::from_vec(buf)))
++            */
++            unimplemented!();
+         }
+ 
+         #[cfg(not(any(target_os = "linux", target_os = "macos")))]
+@@ -667,6 +676,7 @@ impl fmt::Debug for File {
  
          #[cfg(any(target_os = "linux", target_os = "macos"))]
          fn get_mode(fd: c_int) -> Option<(bool, bool)> {
@@ -127,7 +163,7 @@ index add06ae..e0d3f84 100644
              let mode = unsafe { libc::fcntl(fd, libc::F_GETFL) };
              if mode == -1 {
                  return None;
-@@ -677,6 +681,8 @@ impl fmt::Debug for File {
+@@ -677,6 +687,8 @@ impl fmt::Debug for File {
                  libc::O_WRONLY => Some((false, true)),
                  _ => None
              }
@@ -136,7 +172,7 @@ index add06ae..e0d3f84 100644
          }
  
          #[cfg(not(any(target_os = "linux", target_os = "macos")))]
-@@ -868,6 +874,7 @@ pub fn copy(from: &Path, to: &Path) -> io::Result<u64> {
+@@ -868,6 +880,7 @@ pub fn copy(from: &Path, to: &Path) -> io::Result<u64> {
          len: libc::size_t,
          flags: libc::c_uint,
      ) -> libc::c_long {
@@ -144,7 +180,7 @@ index add06ae..e0d3f84 100644
          libc::syscall(
              libc::SYS_copy_file_range,
              fd_in,
-@@ -877,6 +884,8 @@ pub fn copy(from: &Path, to: &Path) -> io::Result<u64> {
+@@ -877,6 +890,8 @@ pub fn copy(from: &Path, to: &Path) -> io::Result<u64> {
              len,
              flags,
          )
@@ -207,5 +243,5 @@ index f3a45d2..1c2f0ce 100644
  
      #[cfg(any(target_os = "freebsd",
 -- 
-2.11.0
+2.17.2 (Apple Git-113)