about summary refs log tree commit diff
path: root/src/libstd/sys
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-12-07 19:46:23 +0000
committerbors <bors@rust-lang.org>2016-12-07 19:46:23 +0000
commit535b6d397f735ff72064462be38f733d2637cd6f (patch)
tree7169db4db2aa1107f831e2dcfeb2c7d6ae9c696b /src/libstd/sys
parent209308439a1099b285520459f57e380f18793c07 (diff)
parentef45ec0a244868f639106998515d2f92ee3df562 (diff)
downloadrust-535b6d397f735ff72064462be38f733d2637cd6f.tar.gz
rust-535b6d397f735ff72064462be38f733d2637cd6f.zip
Auto merge of #38214 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 9 pull requests

- Successful merges: #38085, #38123, #38151, #38153, #38158, #38163, #38186, #38189, #38208
- Failed merges:
Diffstat (limited to 'src/libstd/sys')
-rw-r--r--src/libstd/sys/unix/ext/io.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sys/unix/ext/io.rs b/src/libstd/sys/unix/ext/io.rs
index 4163ede46af..296235e173d 100644
--- a/src/libstd/sys/unix/ext/io.rs
+++ b/src/libstd/sys/unix/ext/io.rs
@@ -43,7 +43,7 @@ pub trait AsRawFd {
 /// descriptor.
 #[stable(feature = "from_raw_os", since = "1.1.0")]
 pub trait FromRawFd {
-    /// Constructs a new instances of `Self` from the given raw file
+    /// Constructs a new instance of `Self` from the given raw file
     /// descriptor.
     ///
     /// This function **consumes ownership** of the specified file