about summary refs log tree commit diff
path: root/src/libnative
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-08-02 21:51:10 +0000
committerbors <bors@rust-lang.org>2014-08-02 21:51:10 +0000
commit756b7b23c43cff52b1e2a89fae341c0a7389ee09 (patch)
tree47aa392a3889484b574a73224b2c8bc57e652bbe /src/libnative
parent147d117cff53198f17989a34b92513c33e059544 (diff)
parentad06dfe496e4e1abbc65268a58275ca2b483def5 (diff)
downloadrust-756b7b23c43cff52b1e2a89fae341c0a7389ee09.tar.gz
rust-756b7b23c43cff52b1e2a89fae341c0a7389ee09.zip
auto merge of #16180 : jbcrail/rust/fix-comments, r=steveklabnik
Diffstat (limited to 'src/libnative')
-rw-r--r--src/libnative/io/net.rs2
-rw-r--r--src/libnative/io/pipe_win32.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libnative/io/net.rs b/src/libnative/io/net.rs
index 7a90ede8ca8..cf2d6e7fb45 100644
--- a/src/libnative/io/net.rs
+++ b/src/libnative/io/net.rs
@@ -769,7 +769,7 @@ impl rtio::RtioUdpSocket for UdpSocket {
 // It turns out that there's this nifty MSG_DONTWAIT flag which can be passed to
 // send/recv, but the niftiness wears off once you realize it only works well on
 // linux [1] [2]. This means that it's pretty easy to get a nonblocking
-// operation on linux (no flag fidding, no affecting other objects), but not on
+// operation on linux (no flag fiddling, no affecting other objects), but not on
 // other platforms.
 //
 // To work around this constraint on other platforms, we end up using the
diff --git a/src/libnative/io/pipe_win32.rs b/src/libnative/io/pipe_win32.rs
index 79ca23abed2..d5b22b4b018 100644
--- a/src/libnative/io/pipe_win32.rs
+++ b/src/libnative/io/pipe_win32.rs
@@ -311,7 +311,7 @@ impl UnixStream {
                     }
                 }
 
-                // An example I found on microsoft's website used 20
+                // An example I found on Microsoft's website used 20
                 // seconds, libuv uses 30 seconds, hence we make the
                 // obvious choice of waiting for 25 seconds.
                 None => {