diff options
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ext/base.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/ext/deriving/cmp/ord.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/ext/deriving/generic/mod.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/ext/tt/transcribe.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/parse/attr.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/print/pp.rs | 4 | ||||
| -rw-r--r-- | src/libsyntax/visit.rs | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/src/libsyntax/ext/base.rs b/src/libsyntax/ext/base.rs index e81421cff04..b656b0c06a0 100644 --- a/src/libsyntax/ext/base.rs +++ b/src/libsyntax/ext/base.rs @@ -195,7 +195,7 @@ impl DummyResult { /// Create a default MacResult that can only be an expression. /// /// Use this for macros that must expand to an expression, so even - /// if an error is encountered internally, the user will recieve + /// if an error is encountered internally, the user will receive /// an error that they also used it in the wrong place. pub fn expr(sp: Span) -> Box<MacResult> { box DummyResult { expr_only: true, span: sp } as Box<MacResult> diff --git a/src/libsyntax/ext/deriving/cmp/ord.rs b/src/libsyntax/ext/deriving/cmp/ord.rs index abe504b8885..24cc286b190 100644 --- a/src/libsyntax/ext/deriving/cmp/ord.rs +++ b/src/libsyntax/ext/deriving/cmp/ord.rs @@ -77,7 +77,7 @@ fn cs_op(less: bool, equal: bool, cx: &mut ExtCtxt, span: Span, substr: &Substru ``` The optimiser should remove the redundancy. We explicitly - get use the binops to avoid auto-deref derefencing too many + get use the binops to avoid auto-deref dereferencing too many layers of pointers, if the type includes pointers. */ let other_f = match other_fs { diff --git a/src/libsyntax/ext/deriving/generic/mod.rs b/src/libsyntax/ext/deriving/generic/mod.rs index 228f5f02bee..bf0da94e3e3 100644 --- a/src/libsyntax/ext/deriving/generic/mod.rs +++ b/src/libsyntax/ext/deriving/generic/mod.rs @@ -723,7 +723,7 @@ impl<'a> MethodDef<'a> { &Struct(fields)); // make a series of nested matches, to destructure the - // structs. This is actually right-to-left, but it shoudn't + // structs. This is actually right-to-left, but it shouldn't // matter. for (&arg_expr, &pat) in self_args.iter().zip(patterns.iter()) { body = cx.expr_match(trait_.span, arg_expr, diff --git a/src/libsyntax/ext/tt/transcribe.rs b/src/libsyntax/ext/tt/transcribe.rs index 748ba6b19da..c0c066fe466 100644 --- a/src/libsyntax/ext/tt/transcribe.rs +++ b/src/libsyntax/ext/tt/transcribe.rs @@ -58,7 +58,7 @@ pub fn new_tt_reader<'a>(sp_diag: &'a SpanHandler, dotdotdoted: false, sep: None, }), - interpolations: match interp { /* just a convienience */ + interpolations: match interp { /* just a convenience */ None => HashMap::new(), Some(x) => x, }, diff --git a/src/libsyntax/parse/attr.rs b/src/libsyntax/parse/attr.rs index 9dcc0877fa4..52e3693c31f 100644 --- a/src/libsyntax/parse/attr.rs +++ b/src/libsyntax/parse/attr.rs @@ -112,7 +112,7 @@ impl<'a> ParserAttr for Parser<'a> { } // Parse attributes that appear after the opening of an item. These should - // be preceded by an exclaimation mark, but we accept and warn about one + // be preceded by an exclamation mark, but we accept and warn about one // terminated by a semicolon. In addition to a vector of inner attributes, // this function also returns a vector that may contain the first outer // attribute of the next item (since we can't know whether the attribute diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 360b8daa948..de5f533a96e 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -2582,7 +2582,7 @@ impl<'a> Parser<'a> { self.mk_expr(lo, hi, ExprLoop(body, opt_ident)) } - // For distingishing between struct literals and blocks + // For distinguishing between struct literals and blocks fn looking_at_struct_literal(&mut self) -> bool { self.token == token::LBRACE && ((self.look_ahead(1, |t| token::is_plain_ident(t)) && diff --git a/src/libsyntax/print/pp.rs b/src/libsyntax/print/pp.rs index ec9ca655064..4fefa1f1d3d 100644 --- a/src/libsyntax/print/pp.rs +++ b/src/libsyntax/print/pp.rs @@ -233,7 +233,7 @@ pub fn mk_printer(out: Box<io::Writer>, linewidth: uint) -> Printer { * * 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 @@ -434,7 +434,7 @@ impl Printer { assert!((self.right != self.left)); } pub fn advance_left(&mut self, x: Token, l: int) -> io::IoResult<()> { - debug!("advnce_left ~[{},{}], sizeof({})={}", self.left, self.right, + debug!("advance_left ~[{},{}], sizeof({})={}", self.left, self.right, self.left, l); if l >= 0 { let ret = self.print(x.clone(), l); diff --git a/src/libsyntax/visit.rs b/src/libsyntax/visit.rs index b5ae8a3dea0..a306ebba96a 100644 --- a/src/libsyntax/visit.rs +++ b/src/libsyntax/visit.rs @@ -62,7 +62,7 @@ pub fn generics_of_fn(fk: &FnKind) -> Generics { } /// Each method of the Visitor trait is a hook to be potentially -/// overriden. Each method's default implementation recursively visits +/// overridden. Each method's default implementation recursively visits /// the substructure of the input via the corresponding `walk` method; /// e.g. the `visit_mod` method by default calls `visit::walk_mod`. /// |
