about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorMs2ger <ms2ger@gmail.com>2015-03-25 18:02:11 +0100
committerMs2ger <ms2ger@gmail.com>2015-04-15 13:37:55 +0200
commit9a5a47eddc0df36d2d3321552eed7fbb8b05bb3e (patch)
treebfa1fc532f3978aa48b9029abf9279688fe5ce68 /src
parenta691f1eefea586f154700be6ee1b991158f82b7f (diff)
downloadrust-9a5a47eddc0df36d2d3321552eed7fbb8b05bb3e.tar.gz
rust-9a5a47eddc0df36d2d3321552eed7fbb8b05bb3e.zip
Fix some typos.
Diffstat (limited to 'src')
-rw-r--r--src/liballoc/arc.rs2
-rw-r--r--src/libstd/ffi/c_str.rs2
-rw-r--r--src/libstd/fs.rs4
-rw-r--r--src/libstd/io/mod.rs2
-rw-r--r--src/libstd/net/tcp.rs2
-rw-r--r--src/test/run-pass/method-two-trait-defer-resolution-2.rs2
6 files changed, 7 insertions, 7 deletions
diff --git a/src/liballoc/arc.rs b/src/liballoc/arc.rs
index ff176d81591..0cfdcd2413f 100644
--- a/src/liballoc/arc.rs
+++ b/src/liballoc/arc.rs
@@ -274,7 +274,7 @@ pub fn get_mut<T>(this: &mut Arc<T>) -> Option<&mut T> {
         // reference to the inner data.
         let inner = unsafe { &mut **this._ptr };
         Some(&mut inner.data)
-    }else {
+    } else {
         None
     }
 }
diff --git a/src/libstd/ffi/c_str.rs b/src/libstd/ffi/c_str.rs
index c1c05da4ee4..04513e9d048 100644
--- a/src/libstd/ffi/c_str.rs
+++ b/src/libstd/ffi/c_str.rs
@@ -172,7 +172,7 @@ impl CString {
     ///
     /// This method is equivalent to `new` except that no runtime assertion
     /// is made that `v` contains no 0 bytes, and it requires an actual
-    /// byte vector, not anyhting that can be converted to one with Into.
+    /// byte vector, not anything that can be converted to one with Into.
     #[stable(feature = "rust1", since = "1.0.0")]
     pub unsafe fn from_vec_unchecked(mut v: Vec<u8>) -> CString {
         v.push(0);
diff --git a/src/libstd/fs.rs b/src/libstd/fs.rs
index 6e902a47396..d30d44a04d3 100644
--- a/src/libstd/fs.rs
+++ b/src/libstd/fs.rs
@@ -1099,8 +1099,8 @@ impl PathExt for Path {
 /// Changes the timestamps for a file's last modification and access time.
 ///
 /// The file at the path specified will have its last access time set to
-/// `atime` and its modification time set to `mtime`. The times specified should
-/// be in milliseconds.
+/// `accessed` and its modification time set to `modified`. The times specified
+/// should be in milliseconds.
 #[unstable(feature = "fs_time",
            reason = "the argument type of u64 is not quite appropriate for \
                      this function and may change if the standard library \
diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs
index f3ba5cd7854..93c6deac6e5 100644
--- a/src/libstd/io/mod.rs
+++ b/src/libstd/io/mod.rs
@@ -148,7 +148,7 @@ pub trait Read {
     ///
     /// If the return value of this method is `Ok(n)`, then it must be
     /// guaranteed that `0 <= n <= buf.len()`. A nonzero `n` value indicates
-    /// that the buffer `buf` has ben filled in with `n` bytes of data from this
+    /// that the buffer `buf` has been filled in with `n` bytes of data from this
     /// source. If `n` is `0`, then it can indicate one of two scenarios:
     ///
     /// 1. This reader has reached its "end of file" and will likely no longer
diff --git a/src/libstd/net/tcp.rs b/src/libstd/net/tcp.rs
index 209a0032fb4..e48d0e6008b 100644
--- a/src/libstd/net/tcp.rs
+++ b/src/libstd/net/tcp.rs
@@ -213,7 +213,7 @@ impl TcpListener {
     /// Returns an iterator over the connections being received on this
     /// listener.
     ///
-    /// The returned iterator will never returned `None` and will also not yield
+    /// The returned iterator will never return `None` and will also not yield
     /// the peer's `SocketAddr` structure.
     #[stable(feature = "rust1", since = "1.0.0")]
     pub fn incoming(&self) -> Incoming {
diff --git a/src/test/run-pass/method-two-trait-defer-resolution-2.rs b/src/test/run-pass/method-two-trait-defer-resolution-2.rs
index e1b64f250d8..cf9bc9bb56a 100644
--- a/src/test/run-pass/method-two-trait-defer-resolution-2.rs
+++ b/src/test/run-pass/method-two-trait-defer-resolution-2.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// Test that when we write `x.foo()`, we do nothave to know the
+// Test that when we write `x.foo()`, we do not have to know the
 // complete type of `x` in order to type-check the method call. In
 // this case, we know that `x: Vec<_1>`, but we don't know what type
 // `_1` is (because the call to `push` comes later). To pick between