Skip to content

Commit d3abdde

Browse files
committed
---
yaml --- r: 184132 b: refs/heads/beta c: 1f4ee20 h: refs/heads/master v: v3
1 parent 808f26b commit d3abdde

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
3131
refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
3232
refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
3333
refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
34-
refs/heads/beta: 01615b04c6e79fa2e99281b94e6518fb2b505486
34+
refs/heads/beta: 1f4ee20ddae447f155b0d2b25e630e9c4e0cc1aa
3535
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
3636
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
3737
refs/heads/tmp: c65fb1a81e5dc58cf171cc47f65de9e6e2119247

branches/beta/src/libsyntax/ast_util.rs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -141,10 +141,7 @@ pub fn is_path(e: P<Expr>) -> bool {
141141
/// We want to avoid "45int" and "-3int" in favor of "45" and "-3"
142142
pub fn int_ty_to_string(t: IntTy, val: Option<i64>) -> String {
143143
let s = match t {
144-
TyIs(true) if val.is_some() => "i",
145-
TyIs(true) => "int",
146-
TyIs(false) if val.is_some() => "is",
147-
TyIs(false) => "isize",
144+
TyIs(_) => "isize",
148145
TyI8 => "i8",
149146
TyI16 => "i16",
150147
TyI32 => "i32",
@@ -173,10 +170,7 @@ pub fn int_ty_max(t: IntTy) -> u64 {
173170
/// We want to avoid "42u" in favor of "42us". "42uint" is right out.
174171
pub fn uint_ty_to_string(t: UintTy, val: Option<u64>) -> String {
175172
let s = match t {
176-
TyUs(true) if val.is_some() => "u",
177-
TyUs(true) => "uint",
178-
TyUs(false) if val.is_some() => "us",
179-
TyUs(false) => "usize",
173+
TyUs(_) => "usize",
180174
TyU8 => "u8",
181175
TyU16 => "u16",
182176
TyU32 => "u32",

0 commit comments

Comments
 (0)