about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorSteve Klabnik <steve@steveklabnik.com>2016-07-06 19:13:07 -0400
committerGitHub <noreply@github.com>2016-07-06 19:13:07 -0400
commit1b7bebf84d7b0c428dddfdada1789ebde7871509 (patch)
tree06c7050de8a3b27b63df6694dddd8826632f2566 /src
parent80e5672f7ed4980726e1b917ba5bfdd229b08fc5 (diff)
parent3fcb64927750b8c4bccd866ec137500de2e7aea3 (diff)
downloadrust-1b7bebf84d7b0c428dddfdada1789ebde7871509.tar.gz
rust-1b7bebf84d7b0c428dddfdada1789ebde7871509.zip
Rollup merge of #34626 - sylvestre:master, r=Manishearth
Fix typos
Diffstat (limited to 'src')
-rw-r--r--src/doc/book/closures.md4
-rw-r--r--src/doc/book/testing.md2
-rw-r--r--src/librustdoc/html/highlight.rs2
-rw-r--r--src/librustdoc/html/render.rs2
-rw-r--r--src/libstd/memchr.rs2
5 files changed, 6 insertions, 6 deletions
diff --git a/src/doc/book/closures.md b/src/doc/book/closures.md
index a6b4e949218..e8c88b7db06 100644
--- a/src/doc/book/closures.md
+++ b/src/doc/book/closures.md
@@ -339,7 +339,7 @@ fn call_with_ref<'a, F>(some_closure:F) -> i32
     where F: Fn(&'a 32) -> i32 {
 ```
 
-However this presents a problem with in our case. When you specify the explict
+However this presents a problem with in our case. When you specify the explicit
 lifetime on a function it binds that lifetime to the *entire* scope of the function
 instead of just the invocation scope of our closure. This means that the borrow checker
 will see a mutable reference in the same lifetime as our immutable reference and fail
@@ -354,7 +354,7 @@ fn call_with_ref<F>(some_closure:F) -> i32
 ```
 
 This lets the Rust compiler find the minimum lifetime to invoke our closure and
-satisfy the borrow checker's rules. Our function then compiles and excutes as we
+satisfy the borrow checker's rules. Our function then compiles and executes as we
 expect.
 
 ```rust
diff --git a/src/doc/book/testing.md b/src/doc/book/testing.md
index 7954085472e..86729147ed0 100644
--- a/src/doc/book/testing.md
+++ b/src/doc/book/testing.md
@@ -431,7 +431,7 @@ one.
 
 Cargo will ignore files in subdirectories of the `tests/` directory.
 Therefore shared modules in integrations tests are possible.
-For example `tests/common/mod.rs` is not seperatly compiled by cargo but can 
+For example `tests/common/mod.rs` is not separately compiled by cargo but can
 be imported in every test with `mod common;`
 
 That's all there is to the `tests` directory. The `tests` module isn't needed
diff --git a/src/librustdoc/html/highlight.rs b/src/librustdoc/html/highlight.rs
index 84e98a67391..096e1ecc9ff 100644
--- a/src/librustdoc/html/highlight.rs
+++ b/src/librustdoc/html/highlight.rs
@@ -107,7 +107,7 @@ pub enum Class {
 ///
 /// The classifier will call into the `Writer` implementation as it finds spans
 /// of text to highlight. Exactly how that text should be highlighted is up to
-/// the implemention.
+/// the implementation.
 pub trait Writer {
     /// Called when we start processing a span of text that should be highlighted.
     /// The `Class` argument specifies how it should be highlighted.
diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs
index 6ab2bcc7685..c263bcb04e9 100644
--- a/src/librustdoc/html/render.rs
+++ b/src/librustdoc/html/render.rs
@@ -2716,7 +2716,7 @@ impl<'a> fmt::Display for Sidebar<'a> {
         let parentlen = cx.current.len() - if it.is_mod() {1} else {0};
 
         // the sidebar is designed to display sibling functions, modules and
-        // other miscellaneous informations. since there are lots of sibling
+        // other miscellaneous information. since there are lots of sibling
         // items (and that causes quadratic growth in large modules),
         // we refactor common parts into a shared JavaScript file per module.
         // still, we don't move everything into JS because we want to preserve
diff --git a/src/libstd/memchr.rs b/src/libstd/memchr.rs
index 1d97611eabb..a408b4378e1 100644
--- a/src/libstd/memchr.rs
+++ b/src/libstd/memchr.rs
@@ -239,7 +239,7 @@ mod fallback {
         text[..offset].iter().rposition(|elt| *elt == x)
     }
 
-    // test fallback implementations on all plattforms
+    // test fallback implementations on all platforms
     #[test]
     fn matches_one() {
         assert_eq!(Some(0), memchr(b'a', b"a"));