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

This commit is contained in:
bors 2014-09-16 21:36:08 +00:00
commit ceb9bbfbf5
2 changed files with 3 additions and 2 deletions

View file

@ -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

View file

@ -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();