From 67b03fbc3d44c88df160ba4ba6922b01f4c7675e Mon Sep 17 00:00:00 2001 From: Nick Cameron Date: Mon, 23 Feb 2015 16:07:38 +1300 Subject: int audit - libcore::fmt --- src/libsyntax/ext/build.rs | 4 ++++ src/libsyntax/ext/format.rs | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'src/libsyntax/ext') diff --git a/src/libsyntax/ext/build.rs b/src/libsyntax/ext/build.rs index 8923290d655..656d507ed69 100644 --- a/src/libsyntax/ext/build.rs +++ b/src/libsyntax/ext/build.rs @@ -148,6 +148,7 @@ pub trait AstBuilder { fn expr_usize(&self, span: Span, i: usize) -> P; fn expr_int(&self, sp: Span, i: isize) -> P; fn expr_u8(&self, sp: Span, u: u8) -> P; + fn expr_u32(&self, sp: Span, u: u32) -> P; fn expr_bool(&self, sp: Span, value: bool) -> P; fn expr_vec(&self, sp: Span, exprs: Vec>) -> P; @@ -701,6 +702,9 @@ impl<'a> AstBuilder for ExtCtxt<'a> { self.expr_lit(sp, ast::LitInt(i as u64, ast::SignedIntLit(ast::TyIs(false), ast::Sign::new(i)))) } + fn expr_u32(&self, sp: Span, u: u32) -> P { + self.expr_lit(sp, ast::LitInt(u as u64, ast::UnsignedIntLit(ast::TyU32))) + } fn expr_u8(&self, sp: Span, u: u8) -> P { self.expr_lit(sp, ast::LitInt(u as u64, ast::UnsignedIntLit(ast::TyU8))) } diff --git a/src/libsyntax/ext/format.rs b/src/libsyntax/ext/format.rs index 1c2374e31f1..91262556abd 100644 --- a/src/libsyntax/ext/format.rs +++ b/src/libsyntax/ext/format.rs @@ -417,7 +417,7 @@ impl<'a, 'b> Context<'a, 'b> { parse::AlignUnknown => align("Unknown"), }; let align = self.ecx.expr_path(align); - let flags = self.ecx.expr_usize(sp, arg.format.flags); + let flags = self.ecx.expr_u32(sp, arg.format.flags); let prec = self.trans_count(arg.format.precision); let width = self.trans_count(arg.format.width); let path = self.ecx.path_global(sp, Context::rtpath(self.ecx, "FormatSpec")); @@ -610,7 +610,7 @@ impl<'a, 'b> Context<'a, 'b> { ecx.ident_of_std("core"), ecx.ident_of("fmt"), ecx.ident_of("ArgumentV1"), - ecx.ident_of("from_uint")], vec![arg]) + ecx.ident_of("from_usize")], vec![arg]) } }; -- cgit 1.4.1-3-g733a5 From e711ac7e759b7668932b3d6a612ba7b1600e5234 Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Tue, 24 Feb 2015 07:39:55 +0530 Subject: Remove double expr_u32 (fixup #22700) --- src/libsyntax/ext/build.rs | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/libsyntax/ext') diff --git a/src/libsyntax/ext/build.rs b/src/libsyntax/ext/build.rs index 5d9eeeeda1b..656d507ed69 100644 --- a/src/libsyntax/ext/build.rs +++ b/src/libsyntax/ext/build.rs @@ -708,9 +708,6 @@ impl<'a> AstBuilder for ExtCtxt<'a> { fn expr_u8(&self, sp: Span, u: u8) -> P { self.expr_lit(sp, ast::LitInt(u as u64, ast::UnsignedIntLit(ast::TyU8))) } - fn expr_u32(&self, sp: Span, u: u32) -> P { - self.expr_lit(sp, ast::LitInt(u as u64, ast::UnsignedIntLit(ast::TyU32))) - } fn expr_bool(&self, sp: Span, value: bool) -> P { self.expr_lit(sp, ast::LitBool(value)) } -- cgit 1.4.1-3-g733a5