diff options
| author | bors <bors@rust-lang.org> | 2014-09-16 21:36:08 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-09-16 21:36:08 +0000 |
| commit | ceb9bbfbf5933f9df238fecdd14e75304439c4f4 (patch) | |
| tree | e2674215f29897b18321bb12b36c981012a442ee | |
| parent | 828e075abd8ee2f8c16f6cb1b93c0d99307e704d (diff) | |
| parent | 7caf2ab802d7cf62662b6dd63ffe81672d45f1ad (diff) | |
| download | rust-ceb9bbfbf5933f9df238fecdd14e75304439c4f4.tar.gz rust-ceb9bbfbf5933f9df238fecdd14e75304439c4f4.zip | |
auto merge of #17213 : mo/rust/fix_typos, r=aturon
| -rw-r--r-- | src/doc/rust.md | 2 | ||||
| -rw-r--r-- | src/librustc/middle/save/mod.rs | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/doc/rust.md b/src/doc/rust.md index 0d1331e6077..345b7615168 100644 --- 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 index 5859e5ceeee..fe066c732dd 100644 --- 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(); |