auto merge of #16180 : jbcrail/rust/fix-comments, r=steveklabnik

4 files changed, 6 insertions, 6 deletions

diff --git a/src/libsyntax/attr.rs b/src/libsyntax/attr.rs
index e8b9ec9628f..21252619d11 100644
--- a/src/libsyntax/attr.rs
+++ b/src/libsyntax/attr.rs
@@ -426,7 +426,7 @@ pub fn require_unique_names(diagnostic: &SpanHandler, metas: &[Gc<MetaItem>]) {
 /// not allowed on univariant or zero-variant enums, which have no discriminant.
 ///
 /// If a discriminant type is so specified, then the discriminant will be
-/// present (before fields, if any) with that type; reprensentation
+/// present (before fields, if any) with that type; representation
 /// optimizations which would remove it will not be done.
 pub fn find_repr_attr(diagnostic: &SpanHandler, attr: &Attribute, acc: ReprAttr)
     -> ReprAttr {
diff --git a/src/libsyntax/ext/deriving/encodable.rs b/src/libsyntax/ext/deriving/encodable.rs
index 7e289e7676a..02a748eed8e 100644
--- a/src/libsyntax/ext/deriving/encodable.rs
+++ b/src/libsyntax/ext/deriving/encodable.rs
@@ -41,7 +41,7 @@
 //! }
 //! ```
 //!
-//! Other interesting scenarios are whe the item has type parameters or
+//! Other interesting scenarios are when the item has type parameters or
 //! references other non-built-in types.  A type definition like:
 //!
 //! ```ignore
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index 945a643d2b4..de3be4f8f38 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -4356,7 +4356,7 @@ impl<'a> Parser<'a> {
         return self.parse_single_struct_field(Inherited, attrs);
     }
 
-    /// Parse visiility: PUB, PRIV, or nothing
+    /// Parse visibility: PUB, PRIV, or nothing
     fn parse_visibility(&mut self) -> Visibility {
         if self.eat_keyword(keywords::Pub) { Public }
         else { Inherited }
diff --git a/src/libsyntax/print/pp.rs b/src/libsyntax/print/pp.rs
index fe84eeff4f8..f28e6829b00 100644
--- a/src/libsyntax/print/pp.rs
+++ b/src/libsyntax/print/pp.rs
@@ -225,12 +225,12 @@ pub fn mk_printer(out: Box<io::Writer>, linewidth: uint) -> Printer {
 /// 'right' indices denote the active portion of the ring buffer as well as
 /// describing hypothetical points-in-the-infinite-stream at most 3N tokens
 /// apart (i.e. "not wrapped to ring-buffer boundaries"). The paper will switch
-/// between using 'left' and 'right' terms to denote the wrapepd-to-ring-buffer
+/// between using 'left' and 'right' terms to denote the wrapped-to-ring-buffer
 /// and point-in-infinite-stream senses freely.
 ///
 /// There is a parallel ring buffer, 'size', that holds the calculated size of
 /// each token. Why calculated? Because for Begin/End pairs, the "size"
-/// includes everything betwen the pair. That is, the "size" of Begin is
+/// includes everything between the pair. That is, the "size" of Begin is
 /// actually the sum of the sizes of everything between Begin and the paired
 /// End that follows. Since that is arbitrarily far in the future, 'size' is
 /// being rewritten regularly while the printer runs; in fact most of the
@@ -270,7 +270,7 @@ pub struct Printer {
     left: uint,
     /// Index of right side of input stream
     right: uint,
-    /// Ring-buffr stream goes through
+    /// Ring-buffer stream goes through
     token: Vec<Token> ,
     /// Ring-buffer of calculated sizes
     size: Vec<int> ,