Skip to content

Commit

Permalink
Fix two typos
Browse files Browse the repository at this point in the history
  • Loading branch information
mo committed Sep 15, 2014
1 parent 382fc45 commit 7caf2ab
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/doc/rust.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion src/librustc/middle/save/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down

9 comments on commit 7caf2ab

@bors
Copy link
Contributor

@bors bors commented on 7caf2ab Sep 16, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on 7caf2ab Sep 16, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging mo/rust/fix_typos = 7caf2ab into auto

@bors
Copy link
Contributor

@bors bors commented on 7caf2ab Sep 16, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mo/rust/fix_typos = 7caf2ab merged ok, testing candidate = 98b61509

@bors
Copy link
Contributor

@bors bors commented on 7caf2ab Sep 16, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on 7caf2ab Sep 16, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on 7caf2ab Sep 16, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging mo/rust/fix_typos = 7caf2ab into auto

@bors
Copy link
Contributor

@bors bors commented on 7caf2ab Sep 16, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mo/rust/fix_typos = 7caf2ab merged ok, testing candidate = ceb9bbf

@bors
Copy link
Contributor

@bors bors commented on 7caf2ab Sep 16, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on 7caf2ab Sep 16, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = ceb9bbf

Please sign in to comment.