auto merge of #17213 : mo/rust/fix_typos, r=aturon

rust-lang · Sep 16, 2014 · ceb9bbf · ceb9bbf
2 parents 828e075 + 7caf2ab
commit ceb9bbf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/doc/rust.md b/src/doc/rust.md
@@ -3698,7 +3698,7 @@ There are two varieties of pointer in Rust:
     they exist to support interoperability with foreign code,
     and writing performance-critical or low-level functions.
 
-The standard library contains addtional 'smart pointer' types beyond references
+The standard library contains additional 'smart pointer' types beyond references
 and raw pointers.
 
 ### Function types

diff --git a/src/librustc/middle/save/mod.rs b/src/librustc/middle/save/mod.rs
@@ -1406,7 +1406,8 @@ impl<'l, 'tcx, 'v> Visitor<'v> for DxrVisitor<'l, 'tcx> {
                                                             self.cur_scope),
                 // FIXME(nrc) what is this doing here?
                 def::DefStatic(_, _) => {}
-                _ => error!("unexpected defintion kind when processing collected paths: {:?}", *def)
+                _ => error!("unexpected definition kind when processing collected paths: {:?}",
+                            *def)
             }
         }
         self.collected_paths.clear();