diff options
| author | bors <bors@rust-lang.org> | 2016-03-13 07:30:14 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-03-13 07:30:14 -0700 |
| commit | 1c8b245928c3f2463b45fbddd862a0a70882d087 (patch) | |
| tree | 5cd83be65b2dd53bd0b7331720912a4d4086e138 /src/libsyntax | |
| parent | c21644ad162c69da7c883812be3e473c4e64c257 (diff) | |
| parent | 2e21ff1a9d8d85d47461837eb2f12edb92a1b422 (diff) | |
Auto merge of #32229 - Manishearth:rollup, r=Manishearth
Rollup of 4 pull requests - Successful merges: #32164, #32179, #32212, #32218 - Failed merges:
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ast.rs | 6 | ||||
| -rw-r--r-- | src/libsyntax/print/pp.rs | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs index a8bea2da833..f7621b0131a 100644 --- a/src/libsyntax/ast.rs +++ b/src/libsyntax/ast.rs @@ -927,7 +927,7 @@ pub enum ExprKind { Binary(BinOp, P<Expr>, P<Expr>), /// A unary operation (For example: `!x`, `*x`) Unary(UnOp, P<Expr>), - /// A literal (For example: `1u8`, `"foo"`) + /// A literal (For example: `1`, `"foo"`) Lit(P<Lit>), /// A cast (`foo as f64`) Cast(P<Expr>, P<Ty>), @@ -1016,7 +1016,7 @@ pub enum ExprKind { /// An array literal constructed from one repeated element. /// - /// For example, `[1u8; 5]`. The first expression is the element + /// For example, `[1; 5]`. The first expression is the element /// to be repeated; the second is the number of times to repeat it. Repeat(P<Expr>, P<Expr>), @@ -1288,7 +1288,7 @@ pub enum LitKind { Byte(u8), /// A character literal (`'a'`) Char(char), - /// An integer literal (`1u8`) + /// An integer literal (`1`) Int(u64, LitIntType), /// A float literal (`1f64` or `1E10f64`) Float(InternedString, FloatTy), diff --git a/src/libsyntax/print/pp.rs b/src/libsyntax/print/pp.rs index cbbd5289a5a..c1d922ea665 100644 --- a/src/libsyntax/print/pp.rs +++ b/src/libsyntax/print/pp.rs @@ -168,8 +168,8 @@ pub fn mk_printer<'a>(out: Box<io::Write+'a>, linewidth: usize) -> Printer<'a> { let n: usize = 3 * linewidth; debug!("mk_printer {}", linewidth); let token = vec![Token::Eof; n]; - let size = vec![0_isize; n]; - let scan_stack = vec![0_usize; n]; + let size = vec![0; n]; + let scan_stack = vec![0; n]; Printer { out: out, buf_len: n, |
