Rollup merge of #40457 - frewsxcv:frewsxcv-macos, r=steveklabnik

Update usages of 'OSX' (and other old names) to 'macOS'.

As of last year with version 'Sierra', the Mac operating system is now
called 'macOS'.

diff --combined src/bootstrap/lib.rs
index 2d2be531e628c5b075fb15a71479f8ba50c08d6b,75a8b780248464df066cd93c0c5ea06d38473842..270cb8490d9a78cc8b825191b25923e90ae925b4
--- 1/src/bootstrap/lib.rs
--- 2/src/bootstrap/lib.rs
+++ b/src/bootstrap/lib.rs
@@@ -232,7 -232,7 +232,7 @@@ impl Build 
              None => false,
          };
          let rust_info = channel::GitInfo::new(&src);
 -        let cargo_info = channel::GitInfo::new(&src.join("src/tools/cargo"));
 +        let cargo_info = channel::GitInfo::new(&src.join("cargo"));
  
          Build {
              flags: flags,
@@@ -524,7 -524,7 +524,7 @@@
                   .env(format!("CFLAGS_{}", target), self.cflags(target).join(" "));
          }
  
 -        if self.config.channel == "nightly" && compiler.is_final_stage(self) {
 +        if self.config.rust_save_analysis && compiler.is_final_stage(self) {
              cargo.env("RUSTC_SAVE_ANALYSIS", "api".to_string());
          }
  
@@@ -846,7 -846,7 +846,7 @@@
                             .filter(|s| !s.starts_with("-O") && !s.starts_with("/O"))
                             .collect::<Vec<_>>();
  
-         // If we're compiling on OSX then we add a few unconditional flags
+         // If we're compiling on macOS then we add a few unconditional flags
          // indicating that we want libc++ (more filled out than libstdc++) and
          // we want to compile for 10.7. This way we can ensure that
          // LLVM/jemalloc/etc are all properly compiled.

diff --combined src/libstd/sys/unix/ext/net.rs
index d5933d316c4bd3ab0a7df621690aa613ab9f9b3b,8a15f7ec68232b72dd5ad19c3c05206610464202..55118829eee9f950ef900cb1a5ca62c068c63eb9
--- 1/src/libstd/sys/unix/ext/net.rs
--- 2/src/libstd/sys/unix/ext/net.rs
+++ b/src/libstd/sys/unix/ext/net.rs
@@@ -204,7 -204,7 +204,7 @@@ impl SocketAddr 
          let len = self.len as usize - sun_path_offset();
          let path = unsafe { mem::transmute::<&[libc::c_char], &[u8]>(&self.addr.sun_path) };
  
-         // OSX seems to return a len of 16 and a zeroed sun_path for unnamed addresses
+         // macOS seems to return a len of 16 and a zeroed sun_path for unnamed addresses
          if len == 0 || (cfg!(not(target_os = "linux")) && self.addr.sun_path[0] == 0) {
              AddressKind::Unnamed
          } else if self.addr.sun_path[0] == 0 {
@@@ -375,12 -375,12 +375,12 @@@ impl UnixStream 
  
      /// Sets the read timeout for the socket.
      ///
 -    /// If the provided value is [`None`], then [`read()`] calls will block
 +    /// If the provided value is [`None`], then [`read`] calls will block
      /// indefinitely. It is an error to pass the zero [`Duration`] to this
      /// method.
      ///
      /// [`None`]: ../../../../std/option/enum.Option.html#variant.None
 -    /// [`read()`]: ../../../../std/io/trait.Read.html#tymethod.read
 +    /// [`read`]: ../../../../std/io/trait.Read.html#tymethod.read
      /// [`Duration`]: ../../../../std/time/struct.Duration.html
      ///
      /// # Examples
@@@ -399,12 -399,12 +399,12 @@@
  
      /// Sets the write timeout for the socket.
      ///
 -    /// If the provided value is [`None`], then [`write()`] calls will block
 +    /// If the provided value is [`None`], then [`write`] calls will block
      /// indefinitely. It is an error to pass the zero [`Duration`] to this
      /// method.
      ///
      /// [`None`]: ../../../../std/option/enum.Option.html#variant.None
 -    /// [`read()`]: ../../../../std/io/trait.Write.html#tymethod.write
 +    /// [`read`]: ../../../../std/io/trait.Write.html#tymethod.write
      /// [`Duration`]: ../../../../std/time/struct.Duration.html
      ///
      /// # Examples
@@@ -974,12 -974,12 +974,12 @@@ impl UnixDatagram 
  
      /// Connects the socket to the specified address.
      ///
 -    /// The [`send()`] method may be used to send data to the specified address.
 -    /// [`recv()`] and [`recv_from()`] will only receive data from that address.
 +    /// The [`send`] method may be used to send data to the specified address.
 +    /// [`recv`] and [`recv_from`] will only receive data from that address.
      ///
 -    /// [`send()`]: #method.send
 -    /// [`recv()`]: #method.recv
 -    /// [`recv_from()`]: #method.recv_from
 +    /// [`send`]: #method.send
 +    /// [`recv`]: #method.recv
 +    /// [`recv_from`]: #method.recv_from
      ///
      /// # Examples
      ///
@@@ -1047,9 -1047,9 +1047,9 @@@
  
      /// Returns the address of this socket's peer.
      ///
 -    /// The [`connect()`] method will connect the socket to a peer.
 +    /// The [`connect`] method will connect the socket to a peer.
      ///
 -    /// [`connect()`]: #method.connect
 +    /// [`connect`]: #method.connect
      ///
      /// # Examples
      ///
@@@ -1178,13 -1178,13 +1178,13 @@@
  
      /// Sets the read timeout for the socket.
      ///
 -    /// If the provided value is [`None`], then [`recv()`] and [`recv_from()`] calls will
 +    /// If the provided value is [`None`], then [`recv`] and [`recv_from`] calls will
      /// block indefinitely. It is an error to pass the zero [`Duration`] to this
      /// method.
      ///
      /// [`None`]: ../../../../std/option/enum.Option.html#variant.None
 -    /// [`recv()`]: #method.recv
 -    /// [`recv_from()`]: #method.recv_from
 +    /// [`recv`]: #method.recv
 +    /// [`recv_from`]: #method.recv_from
      /// [`Duration`]: ../../../../std/time/struct.Duration.html
      ///
      /// # Examples
@@@ -1203,13 -1203,13 +1203,13 @@@
  
      /// Sets the write timeout for the socket.
      ///
 -    /// If the provided value is [`None`], then [`send()`] and [`send_to()`] calls will
 +    /// If the provided value is [`None`], then [`send`] and [`send_to`] calls will
      /// block indefinitely. It is an error to pass the zero [`Duration`] to this
      /// method.
      ///
      /// [`None`]: ../../../../std/option/enum.Option.html#variant.None
 -    /// [`send()`]: #method.send
 -    /// [`send_to()`]: #method.send_to
 +    /// [`send`]: #method.send
 +    /// [`send_to`]: #method.send_to
      /// [`Duration`]: ../../../../std/time/struct.Duration.html
      ///
      /// # Examples