about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-01-31 20:51:02 +0000
committerbors <bors@rust-lang.org>2018-01-31 20:51:02 +0000
commit8ccab7eed5f4fc93500fbf242e575073ca70d7cb (patch)
treef0bd6d1dd0033e29407991b9bbe13c7c7a764abf /src/libstd
parent560a2f4faf4828ba5f48fe2bd7709265c2f5354d (diff)
parentaf95302d3cb2f5cd59eb38b88eab6a054d965e9f (diff)
downloadrust-8ccab7eed5f4fc93500fbf242e575073ca70d7cb.tar.gz
rust-8ccab7eed5f4fc93500fbf242e575073ca70d7cb.zip
Auto merge of #47900 - kennytm:rollup, r=kennytm
Rollup of 16 pull requests

- Successful merges: #47838, #47840, #47844, #47874, #47875, #47876, #47884, #47886, #47889, #47890, #47891, #47795, #47677, #47893, #47895, #47552
- Failed merges:
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/io/error.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libstd/io/error.rs b/src/libstd/io/error.rs
index f0b41f30251..bdd675e6e2b 100644
--- a/src/libstd/io/error.rs
+++ b/src/libstd/io/error.rs
@@ -292,8 +292,8 @@ impl Error {
     /// # if cfg!(target_os = "linux") {
     /// use std::io;
     ///
-    /// let error = io::Error::from_raw_os_error(98);
-    /// assert_eq!(error.kind(), io::ErrorKind::AddrInUse);
+    /// let error = io::Error::from_raw_os_error(22);
+    /// assert_eq!(error.kind(), io::ErrorKind::InvalidInput);
     /// # }
     /// ```
     ///
@@ -303,8 +303,8 @@ impl Error {
     /// # if cfg!(windows) {
     /// use std::io;
     ///
-    /// let error = io::Error::from_raw_os_error(10048);
-    /// assert_eq!(error.kind(), io::ErrorKind::AddrInUse);
+    /// let error = io::Error::from_raw_os_error(10022);
+    /// assert_eq!(error.kind(), io::ErrorKind::InvalidInput);
     /// # }
     /// ```
     #[stable(feature = "rust1", since = "1.0.0")]