From abcbe276954525bc7902a5a20762a580d5ed4ea2 Mon Sep 17 00:00:00 2001 From: Corey Richardson Date: Fri, 5 Dec 2014 18:11:46 -0800 Subject: [PATCH 1/2] syntax/rustc: implement isize/usize --- src/librustc/lint/builtin.rs | 22 +++++++++++----------- src/librustc/metadata/tydecode.rs | 4 ++-- src/librustc/metadata/tyencode.rs | 4 ++-- src/librustc/middle/const_eval.rs | 4 ++-- src/librustc/middle/ty.rs | 14 +++++++------- src/librustc_resolve/lib.rs | 10 ++++++---- src/librustc_trans/trans/base.rs | 4 ++-- src/librustc_trans/trans/debuginfo.rs | 8 ++++---- src/librustc_trans/trans/type_.rs | 4 ++-- src/librustc_trans/trans/type_of.rs | 2 +- src/librustc_typeck/check/mod.rs | 4 ++-- src/librustdoc/clean/mod.rs | 20 ++++++++++---------- src/libsyntax/ast.rs | 8 ++++---- src/libsyntax/ast_util.rs | 12 ++++++------ src/libsyntax/attr.rs | 8 +++++--- src/libsyntax/ext/build.rs | 4 ++-- src/libsyntax/ext/deriving/generic/mod.rs | 2 +- src/libsyntax/ext/quote.rs | 4 ++-- src/libsyntax/parse/mod.rs | 6 ++++-- src/test/run-fail/assert-as-macro.rs | 4 ++-- src/test/run-fail/panic.rs | 7 ++----- src/test/run-pass/tydesc-name.rs | 4 ++-- 22 files changed, 81 insertions(+), 78 deletions(-) diff --git a/src/librustc/lint/builtin.rs b/src/librustc/lint/builtin.rs index 425e34cd9f042..64ca49d76f3c8 100644 --- a/src/librustc/lint/builtin.rs +++ b/src/librustc/lint/builtin.rs @@ -46,7 +46,7 @@ use syntax::ast_util::is_shift_binop; use syntax::attr::{self, AttrMetaMethods}; use syntax::codemap::{Span, DUMMY_SP}; use syntax::parse::token; -use syntax::ast::{TyI, TyU, TyI8, TyU8, TyI16, TyU16, TyI32, TyU32, TyI64, TyU64}; +use syntax::ast::{TyIs, TyUs, TyI8, TyU8, TyI16, TyU16, TyI32, TyU32, TyI64, TyU64}; use syntax::ast_util; use syntax::ptr::P; use syntax::visit::{self, Visitor}; @@ -216,7 +216,7 @@ impl LintPass for TypeLimits { match lit.node { ast::LitInt(v, ast::SignedIntLit(_, ast::Plus)) | ast::LitInt(v, ast::UnsuffixedIntLit(ast::Plus)) => { - let int_type = if t == ast::TyI { + let int_type = if t == ast::TyIs { cx.sess().target.int_type } else { t }; let (min, max) = int_ty_range(int_type); @@ -233,7 +233,7 @@ impl LintPass for TypeLimits { }; }, ty::ty_uint(t) => { - let uint_type = if t == ast::TyU { + let uint_type = if t == ast::TyUs { cx.sess().target.uint_type } else { t }; let (min, max) = uint_ty_range(uint_type); @@ -296,7 +296,7 @@ impl LintPass for TypeLimits { // warnings are consistent between 32- and 64-bit platforms fn int_ty_range(int_ty: ast::IntTy) -> (i64, i64) { match int_ty { - ast::TyI => (i64::MIN, i64::MAX), + ast::TyIs=> (i64::MIN, i64::MAX), ast::TyI8 => (i8::MIN as i64, i8::MAX as i64), ast::TyI16 => (i16::MIN as i64, i16::MAX as i64), ast::TyI32 => (i32::MIN as i64, i32::MAX as i64), @@ -306,7 +306,7 @@ impl LintPass for TypeLimits { fn uint_ty_range(uint_ty: ast::UintTy) -> (u64, u64) { match uint_ty { - ast::TyU => (u64::MIN, u64::MAX), + ast::TyUs=> (u64::MIN, u64::MAX), ast::TyU8 => (u8::MIN as u64, u8::MAX as u64), ast::TyU16 => (u16::MIN as u64, u16::MAX as u64), ast::TyU32 => (u32::MIN as u64, u32::MAX as u64), @@ -323,7 +323,7 @@ impl LintPass for TypeLimits { fn int_ty_bits(int_ty: ast::IntTy, target_int_ty: ast::IntTy) -> u64 { match int_ty { - ast::TyI => int_ty_bits(target_int_ty, target_int_ty), + ast::TyIs=> int_ty_bits(target_int_ty, target_int_ty), ast::TyI8 => i8::BITS as u64, ast::TyI16 => i16::BITS as u64, ast::TyI32 => i32::BITS as u64, @@ -333,7 +333,7 @@ impl LintPass for TypeLimits { fn uint_ty_bits(uint_ty: ast::UintTy, target_uint_ty: ast::UintTy) -> u64 { match uint_ty { - ast::TyU => uint_ty_bits(target_uint_ty, target_uint_ty), + ast::TyUs=> uint_ty_bits(target_uint_ty, target_uint_ty), ast::TyU8 => u8::BITS as u64, ast::TyU16 => u16::BITS as u64, ast::TyU32 => u32::BITS as u64, @@ -404,14 +404,14 @@ struct ImproperCTypesVisitor<'a, 'tcx: 'a> { impl<'a, 'tcx> ImproperCTypesVisitor<'a, 'tcx> { fn check_def(&mut self, sp: Span, ty_id: ast::NodeId, path_id: ast::NodeId) { match self.cx.tcx.def_map.borrow()[path_id].clone() { - def::DefPrimTy(ast::TyInt(ast::TyI)) => { + def::DefPrimTy(ast::TyInt(ast::TyIs)) => { self.cx.span_lint(IMPROPER_CTYPES, sp, - "found rust type `int` in foreign module, while \ + "found rust type `isize` in foreign module, while \ libc::c_int or libc::c_long should be used"); } - def::DefPrimTy(ast::TyUint(ast::TyU)) => { + def::DefPrimTy(ast::TyUint(ast::TyUs)) => { self.cx.span_lint(IMPROPER_CTYPES, sp, - "found rust type `uint` in foreign module, while \ + "found rust type `usize` in foreign module, while \ libc::c_uint or libc::c_ulong should be used"); } def::DefTy(..) => { diff --git a/src/librustc/metadata/tydecode.rs b/src/librustc/metadata/tydecode.rs index 07dc13ff0d48f..a39126f085164 100644 --- a/src/librustc/metadata/tydecode.rs +++ b/src/librustc/metadata/tydecode.rs @@ -443,8 +443,8 @@ fn parse_ty_<'a, 'tcx, F>(st: &mut PState<'a, 'tcx>, conv: &mut F) -> Ty<'tcx> w let tcx = st.tcx; match next(st) { 'b' => return tcx.types.bool, - 'i' => return tcx.types.int, - 'u' => return tcx.types.uint, + 'i' => { /* eat the s of is */ next(st); return tcx.types.int }, + 'u' => { /* eat the s of us */ next(st); return tcx.types.uint }, 'M' => { match next(st) { 'b' => return tcx.types.u8, diff --git a/src/librustc/metadata/tyencode.rs b/src/librustc/metadata/tyencode.rs index 0042209aced6a..c019d129218b6 100644 --- a/src/librustc/metadata/tyencode.rs +++ b/src/librustc/metadata/tyencode.rs @@ -61,7 +61,7 @@ pub fn enc_ty<'a, 'tcx>(w: &mut SeekableMemWriter, cx: &ctxt<'a, 'tcx>, t: Ty<'t ty::ty_char => mywrite!(w, "c"), ty::ty_int(t) => { match t { - ast::TyI => mywrite!(w, "i"), + ast::TyIs => mywrite!(w, "is"), ast::TyI8 => mywrite!(w, "MB"), ast::TyI16 => mywrite!(w, "MW"), ast::TyI32 => mywrite!(w, "ML"), @@ -70,7 +70,7 @@ pub fn enc_ty<'a, 'tcx>(w: &mut SeekableMemWriter, cx: &ctxt<'a, 'tcx>, t: Ty<'t } ty::ty_uint(t) => { match t { - ast::TyU => mywrite!(w, "u"), + ast::TyUs => mywrite!(w, "us"), ast::TyU8 => mywrite!(w, "Mb"), ast::TyU16 => mywrite!(w, "Mw"), ast::TyU32 => mywrite!(w, "Ml"), diff --git a/src/librustc/middle/const_eval.rs b/src/librustc/middle/const_eval.rs index 32482fce4daa8..1aec7252a3c1d 100644 --- a/src/librustc/middle/const_eval.rs +++ b/src/librustc/middle/const_eval.rs @@ -528,12 +528,12 @@ pub fn eval_const_expr_partial(tcx: &ty::ctxt, e: &Expr) -> Result (int, const_int, i64), + ty::ty_int(ast::TyIs) => (int, const_int, i64), ty::ty_int(ast::TyI8) => (i8, const_int, i64), ty::ty_int(ast::TyI16) => (i16, const_int, i64), ty::ty_int(ast::TyI32) => (i32, const_int, i64), ty::ty_int(ast::TyI64) => (i64, const_int, i64), - ty::ty_uint(ast::TyU) => (uint, const_uint, u64), + ty::ty_uint(ast::TyUs) => (uint, const_uint, u64), ty::ty_uint(ast::TyU8) => (u8, const_uint, u64), ty::ty_uint(ast::TyU16) => (u16, const_uint, u64), ty::ty_uint(ast::TyU32) => (u32, const_uint, u64), diff --git a/src/librustc/middle/ty.rs b/src/librustc/middle/ty.rs index c359233eca173..62f1a2b49d444 100644 --- a/src/librustc/middle/ty.rs +++ b/src/librustc/middle/ty.rs @@ -2302,12 +2302,12 @@ impl<'tcx> CommonTypes<'tcx> { bool: intern_ty(arena, interner, ty_bool), char: intern_ty(arena, interner, ty_char), err: intern_ty(arena, interner, ty_err), - int: intern_ty(arena, interner, ty_int(ast::TyI)), + int: intern_ty(arena, interner, ty_int(ast::TyIs)), i8: intern_ty(arena, interner, ty_int(ast::TyI8)), i16: intern_ty(arena, interner, ty_int(ast::TyI16)), i32: intern_ty(arena, interner, ty_int(ast::TyI32)), i64: intern_ty(arena, interner, ty_int(ast::TyI64)), - uint: intern_ty(arena, interner, ty_uint(ast::TyU)), + uint: intern_ty(arena, interner, ty_uint(ast::TyUs)), u8: intern_ty(arena, interner, ty_uint(ast::TyU8)), u16: intern_ty(arena, interner, ty_uint(ast::TyU16)), u32: intern_ty(arena, interner, ty_uint(ast::TyU32)), @@ -2653,7 +2653,7 @@ impl FlagComputation { pub fn mk_mach_int<'tcx>(tcx: &ctxt<'tcx>, tm: ast::IntTy) -> Ty<'tcx> { match tm { - ast::TyI => tcx.types.int, + ast::TyIs => tcx.types.int, ast::TyI8 => tcx.types.i8, ast::TyI16 => tcx.types.i16, ast::TyI32 => tcx.types.i32, @@ -2663,7 +2663,7 @@ pub fn mk_mach_int<'tcx>(tcx: &ctxt<'tcx>, tm: ast::IntTy) -> Ty<'tcx> { pub fn mk_mach_uint<'tcx>(tcx: &ctxt<'tcx>, tm: ast::UintTy) -> Ty<'tcx> { match tm { - ast::TyU => tcx.types.uint, + ast::TyUs => tcx.types.uint, ast::TyU8 => tcx.types.u8, ast::TyU16 => tcx.types.u16, ast::TyU32 => tcx.types.u32, @@ -3324,7 +3324,7 @@ pub fn type_contents<'tcx>(cx: &ctxt<'tcx>, ty: Ty<'tcx>) -> TypeContents { let result = match ty.sty { // uint and int are ffi-unsafe - ty_uint(ast::TyU) | ty_int(ast::TyI) => { + ty_uint(ast::TyUs) | ty_int(ast::TyIs) => { TC::ReachesFfiUnsafe } @@ -3896,7 +3896,7 @@ pub fn type_is_fresh(ty: Ty) -> bool { pub fn type_is_uint(ty: Ty) -> bool { match ty.sty { - ty_infer(IntVar(_)) | ty_uint(ast::TyU) => true, + ty_infer(IntVar(_)) | ty_uint(ast::TyUs) => true, _ => false } } @@ -3942,7 +3942,7 @@ pub fn type_is_signed(ty: Ty) -> bool { pub fn type_is_machine(ty: Ty) -> bool { match ty.sty { - ty_int(ast::TyI) | ty_uint(ast::TyU) => false, + ty_int(ast::TyIs) | ty_uint(ast::TyUs) => false, ty_int(..) | ty_uint(..) | ty_float(..) => true, _ => false } diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs index 58102fe5629d9..cc9abecc20fc8 100644 --- a/src/librustc_resolve/lib.rs +++ b/src/librustc_resolve/lib.rs @@ -86,9 +86,9 @@ use syntax::ast::{PolyTraitRef, PrimTy, SelfExplicit}; use syntax::ast::{RegionTyParamBound, StructField}; use syntax::ast::{TraitRef, TraitTyParamBound}; use syntax::ast::{Ty, TyBool, TyChar, TyF32}; -use syntax::ast::{TyF64, TyFloat, TyI, TyI8, TyI16, TyI32, TyI64, TyInt, TyObjectSum}; +use syntax::ast::{TyF64, TyFloat, TyIs, TyI8, TyI16, TyI32, TyI64, TyInt, TyObjectSum}; use syntax::ast::{TyParam, TyParamBound, TyPath, TyPtr, TyPolyTraitRef, TyQPath}; -use syntax::ast::{TyRptr, TyStr, TyU, TyU8, TyU16, TyU32, TyU64, TyUint}; +use syntax::ast::{TyRptr, TyStr, TyUs, TyU8, TyU16, TyU32, TyU64, TyUint}; use syntax::ast::{TypeImplItem}; use syntax::ast; use syntax::ast_map; @@ -833,13 +833,15 @@ impl PrimitiveTypeTable { table.intern("char", TyChar); table.intern("f32", TyFloat(TyF32)); table.intern("f64", TyFloat(TyF64)); - table.intern("int", TyInt(TyI)); + table.intern("int", TyInt(TyIs)); + table.intern("isize", TyInt(TyIs)); table.intern("i8", TyInt(TyI8)); table.intern("i16", TyInt(TyI16)); table.intern("i32", TyInt(TyI32)); table.intern("i64", TyInt(TyI64)); table.intern("str", TyStr); - table.intern("uint", TyUint(TyU)); + table.intern("uint", TyUint(TyUs)); + table.intern("usize", TyUint(TyUs)); table.intern("u8", TyUint(TyU8)); table.intern("u16", TyUint(TyU16)); table.intern("u32", TyUint(TyU32)); diff --git a/src/librustc_trans/trans/base.rs b/src/librustc_trans/trans/base.rs index edcfaae0f802d..b889b52207885 100644 --- a/src/librustc_trans/trans/base.rs +++ b/src/librustc_trans/trans/base.rs @@ -903,8 +903,8 @@ pub fn fail_if_zero_or_overflows<'blk, 'tcx>( ty::ty_int(t) => { let llty = Type::int_from_ty(cx.ccx(), t); let min = match t { - ast::TyI if llty == Type::i32(cx.ccx()) => i32::MIN as u64, - ast::TyI => i64::MIN as u64, + ast::TyIs if llty == Type::i32(cx.ccx()) => i32::MIN as u64, + ast::TyIs => i64::MIN as u64, ast::TyI8 => i8::MIN as u64, ast::TyI16 => i16::MIN as u64, ast::TyI32 => i32::MIN as u64, diff --git a/src/librustc_trans/trans/debuginfo.rs b/src/librustc_trans/trans/debuginfo.rs index 3f0f7fd9bd303..c099c80f86334 100644 --- a/src/librustc_trans/trans/debuginfo.rs +++ b/src/librustc_trans/trans/debuginfo.rs @@ -1797,14 +1797,14 @@ fn basic_type_metadata<'a, 'tcx>(cx: &CrateContext<'a, 'tcx>, ty::ty_bool => ("bool".to_string(), DW_ATE_boolean), ty::ty_char => ("char".to_string(), DW_ATE_unsigned_char), ty::ty_int(int_ty) => match int_ty { - ast::TyI => ("int".to_string(), DW_ATE_signed), + ast::TyIs => ("isize".to_string(), DW_ATE_signed), ast::TyI8 => ("i8".to_string(), DW_ATE_signed), ast::TyI16 => ("i16".to_string(), DW_ATE_signed), ast::TyI32 => ("i32".to_string(), DW_ATE_signed), ast::TyI64 => ("i64".to_string(), DW_ATE_signed) }, ty::ty_uint(uint_ty) => match uint_ty { - ast::TyU => ("uint".to_string(), DW_ATE_unsigned), + ast::TyUs => ("usize".to_string(), DW_ATE_unsigned), ast::TyU8 => ("u8".to_string(), DW_ATE_unsigned), ast::TyU16 => ("u16".to_string(), DW_ATE_unsigned), ast::TyU32 => ("u32".to_string(), DW_ATE_unsigned), @@ -3729,12 +3729,12 @@ fn push_debuginfo_type_name<'a, 'tcx>(cx: &CrateContext<'a, 'tcx>, ty::ty_bool => output.push_str("bool"), ty::ty_char => output.push_str("char"), ty::ty_str => output.push_str("str"), - ty::ty_int(ast::TyI) => output.push_str("int"), + ty::ty_int(ast::TyIs) => output.push_str("isize"), ty::ty_int(ast::TyI8) => output.push_str("i8"), ty::ty_int(ast::TyI16) => output.push_str("i16"), ty::ty_int(ast::TyI32) => output.push_str("i32"), ty::ty_int(ast::TyI64) => output.push_str("i64"), - ty::ty_uint(ast::TyU) => output.push_str("uint"), + ty::ty_uint(ast::TyUs) => output.push_str("usize"), ty::ty_uint(ast::TyU8) => output.push_str("u8"), ty::ty_uint(ast::TyU16) => output.push_str("u16"), ty::ty_uint(ast::TyU32) => output.push_str("u32"), diff --git a/src/librustc_trans/trans/type_.rs b/src/librustc_trans/trans/type_.rs index 3785c2fb9bc54..88199f97b54ba 100644 --- a/src/librustc_trans/trans/type_.rs +++ b/src/librustc_trans/trans/type_.rs @@ -112,7 +112,7 @@ impl Type { pub fn int_from_ty(ccx: &CrateContext, t: ast::IntTy) -> Type { match t { - ast::TyI => ccx.int_type(), + ast::TyIs => ccx.int_type(), ast::TyI8 => Type::i8(ccx), ast::TyI16 => Type::i16(ccx), ast::TyI32 => Type::i32(ccx), @@ -122,7 +122,7 @@ impl Type { pub fn uint_from_ty(ccx: &CrateContext, t: ast::UintTy) -> Type { match t { - ast::TyU => ccx.int_type(), + ast::TyUs => ccx.int_type(), ast::TyU8 => Type::i8(ccx), ast::TyU16 => Type::i16(ccx), ast::TyU32 => Type::i32(ccx), diff --git a/src/librustc_trans/trans/type_of.rs b/src/librustc_trans/trans/type_of.rs index 3e499ea8498fb..d2f33c03ed549 100644 --- a/src/librustc_trans/trans/type_of.rs +++ b/src/librustc_trans/trans/type_of.rs @@ -264,7 +264,7 @@ pub fn type_of<'a, 'tcx>(cx: &CrateContext<'a, 'tcx>, t: Ty<'tcx>) -> Type { } match unsized_part_of_type(cx.tcx(), t).sty { - ty::ty_str | ty::ty_vec(..) => Type::uint_from_ty(cx, ast::TyU), + ty::ty_str | ty::ty_vec(..) => Type::uint_from_ty(cx, ast::TyUs), ty::ty_trait(_) => Type::vtable_ptr(cx), _ => panic!("Unexpected type returned from unsized_part_of_type : {}", t.repr(cx.tcx())) diff --git a/src/librustc_typeck/check/mod.rs b/src/librustc_typeck/check/mod.rs index 1b51434a58cc1..7be383f2a026d 100644 --- a/src/librustc_typeck/check/mod.rs +++ b/src/librustc_typeck/check/mod.rs @@ -4859,7 +4859,7 @@ pub fn check_enum_variants(ccx: &CrateCtxt, ast::TyU16 => disr as u16 as Disr == disr, ast::TyU32 => disr as u32 as Disr == disr, ast::TyU64 => disr as u64 as Disr == disr, - ast::TyU => uint_in_range(ccx, ccx.tcx.sess.target.uint_type, disr) + ast::TyUs => uint_in_range(ccx, ccx.tcx.sess.target.uint_type, disr) } } fn int_in_range(ccx: &CrateCtxt, ty: ast::IntTy, disr: ty::Disr) -> bool { @@ -4868,7 +4868,7 @@ pub fn check_enum_variants(ccx: &CrateCtxt, ast::TyI16 => disr as i16 as Disr == disr, ast::TyI32 => disr as i32 as Disr == disr, ast::TyI64 => disr as i64 as Disr == disr, - ast::TyI => int_in_range(ccx, ccx.tcx.sess.target.int_type, disr) + ast::TyIs => int_in_range(ccx, ccx.tcx.sess.target.int_type, disr) } } match ty { diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs index bb9a9ac430340..60faa09b964dd 100644 --- a/src/librustdoc/clean/mod.rs +++ b/src/librustdoc/clean/mod.rs @@ -1238,8 +1238,8 @@ pub enum Type { #[derive(Clone, RustcEncodable, RustcDecodable, PartialEq, Eq, Hash, Copy)] pub enum PrimitiveType { - Int, I8, I16, I32, I64, - Uint, U8, U16, U32, U64, + Isize, I8, I16, I32, I64, + Usize, U8, U16, U32, U64, F32, F64, Char, Bool, @@ -1264,12 +1264,12 @@ pub enum TypeKind { impl PrimitiveType { fn from_str(s: &str) -> Option { match s.as_slice() { - "int" => Some(Int), + "isize" | "int" => Some(Isize), "i8" => Some(I8), "i16" => Some(I16), "i32" => Some(I32), "i64" => Some(I64), - "uint" => Some(Uint), + "usize" | "uint" => Some(Usize), "u8" => Some(U8), "u16" => Some(U16), "u32" => Some(U32), @@ -1308,12 +1308,12 @@ impl PrimitiveType { pub fn to_string(&self) -> &'static str { match *self { - Int => "int", + Isize => "isize", I8 => "i8", I16 => "i16", I32 => "i32", I64 => "i64", - Uint => "uint", + Usize => "usize", U8 => "u8", U16 => "u16", U32 => "u32", @@ -1387,12 +1387,12 @@ impl<'tcx> Clean for ty::Ty<'tcx> { match self.sty { ty::ty_bool => Primitive(Bool), ty::ty_char => Primitive(Char), - ty::ty_int(ast::TyI) => Primitive(Int), + ty::ty_int(ast::TyIs) => Primitive(Isize), ty::ty_int(ast::TyI8) => Primitive(I8), ty::ty_int(ast::TyI16) => Primitive(I16), ty::ty_int(ast::TyI32) => Primitive(I32), ty::ty_int(ast::TyI64) => Primitive(I64), - ty::ty_uint(ast::TyU) => Primitive(Uint), + ty::ty_uint(ast::TyUs) => Primitive(Usize), ty::ty_uint(ast::TyU8) => Primitive(U8), ty::ty_uint(ast::TyU16) => Primitive(U16), ty::ty_uint(ast::TyU32) => Primitive(U32), @@ -2265,12 +2265,12 @@ fn resolve_type(cx: &DocContext, ast::TyStr => return Primitive(Str), ast::TyBool => return Primitive(Bool), ast::TyChar => return Primitive(Char), - ast::TyInt(ast::TyI) => return Primitive(Int), + ast::TyInt(ast::TyIs) => return Primitive(Isize), ast::TyInt(ast::TyI8) => return Primitive(I8), ast::TyInt(ast::TyI16) => return Primitive(I16), ast::TyInt(ast::TyI32) => return Primitive(I32), ast::TyInt(ast::TyI64) => return Primitive(I64), - ast::TyUint(ast::TyU) => return Primitive(Uint), + ast::TyUint(ast::TyUs) => return Primitive(Usize), ast::TyUint(ast::TyU8) => return Primitive(U8), ast::TyUint(ast::TyU16) => return Primitive(U16), ast::TyUint(ast::TyU32) => return Primitive(U32), diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs index 7aa7c4fcfb301..032ab05a418b2 100644 --- a/src/libsyntax/ast.rs +++ b/src/libsyntax/ast.rs @@ -1087,7 +1087,7 @@ pub struct Typedef { #[derive(Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, Copy)] pub enum IntTy { - TyI, + TyIs, TyI8, TyI16, TyI32, @@ -1103,7 +1103,7 @@ impl fmt::Show for IntTy { impl IntTy { pub fn suffix_len(&self) -> uint { match *self { - TyI => 1, + TyIs => 1, TyI8 => 2, TyI16 | TyI32 | TyI64 => 3, } @@ -1112,7 +1112,7 @@ impl IntTy { #[derive(Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, Copy)] pub enum UintTy { - TyU, + TyUs, TyU8, TyU16, TyU32, @@ -1122,7 +1122,7 @@ pub enum UintTy { impl UintTy { pub fn suffix_len(&self) -> uint { match *self { - TyU => 1, + TyUs => 1, TyU8 => 2, TyU16 | TyU32 | TyU64 => 3, } diff --git a/src/libsyntax/ast_util.rs b/src/libsyntax/ast_util.rs index 5e03afec16cf8..d6df9f46621a7 100644 --- a/src/libsyntax/ast_util.rs +++ b/src/libsyntax/ast_util.rs @@ -120,8 +120,8 @@ pub fn is_path(e: P) -> bool { /// We want to avoid "45int" and "-3int" in favor of "45" and "-3" pub fn int_ty_to_string(t: IntTy, val: Option) -> String { let s = match t { - TyI if val.is_some() => "i", - TyI => "int", + TyIs if val.is_some() => "is", + TyIs => "isize", TyI8 => "i8", TyI16 => "i16", TyI32 => "i32", @@ -141,7 +141,7 @@ pub fn int_ty_max(t: IntTy) -> u64 { match t { TyI8 => 0x80u64, TyI16 => 0x8000u64, - TyI | TyI32 => 0x80000000u64, // actually ni about TyI + TyIs | TyI32 => 0x80000000u64, // actually ni about TyIm TyI64 => 0x8000000000000000u64 } } @@ -150,8 +150,8 @@ pub fn int_ty_max(t: IntTy) -> u64 { /// We want to avoid "42uint" in favor of "42u" pub fn uint_ty_to_string(t: UintTy, val: Option) -> String { let s = match t { - TyU if val.is_some() => "u", - TyU => "uint", + TyUs if val.is_some() => "us", + TyUs => "usize", TyU8 => "u8", TyU16 => "u16", TyU32 => "u32", @@ -168,7 +168,7 @@ pub fn uint_ty_max(t: UintTy) -> u64 { match t { TyU8 => 0xffu64, TyU16 => 0xffffu64, - TyU | TyU32 => 0xffffffffu64, // actually ni about TyU + TyUs | TyU32 => 0xffffffffu64, // actually ni about TyUm TyU64 => 0xffffffffffffffffu64 } } diff --git a/src/libsyntax/attr.rs b/src/libsyntax/attr.rs index 43e23f26e930e..523477eef22c8 100644 --- a/src/libsyntax/attr.rs +++ b/src/libsyntax/attr.rs @@ -457,8 +457,10 @@ fn int_type_of_word(s: &str) -> Option { "u32" => Some(UnsignedInt(ast::TyU32)), "i64" => Some(SignedInt(ast::TyI64)), "u64" => Some(UnsignedInt(ast::TyU64)), - "int" => Some(SignedInt(ast::TyI)), - "uint" => Some(UnsignedInt(ast::TyU)), + "int" => Some(SignedInt(ast::TyIs)), + "uint" => Some(UnsignedInt(ast::TyUs)), + "isize" => Some(SignedInt(ast::TyIs)), + "usize" => Some(UnsignedInt(ast::TyUs)), _ => None } } @@ -502,7 +504,7 @@ impl IntType { SignedInt(ast::TyI16) | UnsignedInt(ast::TyU16) | SignedInt(ast::TyI32) | UnsignedInt(ast::TyU32) | SignedInt(ast::TyI64) | UnsignedInt(ast::TyU64) => true, - SignedInt(ast::TyI) | UnsignedInt(ast::TyU) => false + SignedInt(ast::TyIs) | UnsignedInt(ast::TyUs) => false } } } diff --git a/src/libsyntax/ext/build.rs b/src/libsyntax/ext/build.rs index ea345f3a458f4..843172cee19b1 100644 --- a/src/libsyntax/ext/build.rs +++ b/src/libsyntax/ext/build.rs @@ -642,10 +642,10 @@ impl<'a> AstBuilder for ExtCtxt<'a> { self.expr(sp, ast::ExprLit(P(respan(sp, lit)))) } fn expr_uint(&self, span: Span, i: uint) -> P { - self.expr_lit(span, ast::LitInt(i as u64, ast::UnsignedIntLit(ast::TyU))) + self.expr_lit(span, ast::LitInt(i as u64, ast::UnsignedIntLit(ast::TyUs))) } fn expr_int(&self, sp: Span, i: int) -> P { - self.expr_lit(sp, ast::LitInt(i as u64, ast::SignedIntLit(ast::TyI, ast::Sign::new(i)))) + self.expr_lit(sp, ast::LitInt(i as u64, ast::SignedIntLit(ast::TyIs, ast::Sign::new(i)))) } 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/deriving/generic/mod.rs b/src/libsyntax/ext/deriving/generic/mod.rs index 1aa430c4a0829..1112eaa789026 100644 --- a/src/libsyntax/ext/deriving/generic/mod.rs +++ b/src/libsyntax/ext/deriving/generic/mod.rs @@ -1031,7 +1031,7 @@ impl<'a> MethodDef<'a> { let arms: Vec = variants.iter().enumerate() .map(|(index, variant)| { let pat = variant_to_pat(cx, sp, type_ident, &**variant); - let lit = ast::LitInt(index as u64, ast::UnsignedIntLit(ast::TyU)); + let lit = ast::LitInt(index as u64, ast::UnsignedIntLit(ast::TyUs)); cx.arm(sp, vec![pat], cx.expr_lit(sp, lit)) }).collect(); diff --git a/src/libsyntax/ext/quote.rs b/src/libsyntax/ext/quote.rs index f1b52fa33c386..ccc15449834c1 100644 --- a/src/libsyntax/ext/quote.rs +++ b/src/libsyntax/ext/quote.rs @@ -273,13 +273,13 @@ pub mod rt { ); } - impl_to_source_int! { signed, int, TyI } + impl_to_source_int! { signed, int, TyIs } impl_to_source_int! { signed, i8, TyI8 } impl_to_source_int! { signed, i16, TyI16 } impl_to_source_int! { signed, i32, TyI32 } impl_to_source_int! { signed, i64, TyI64 } - impl_to_source_int! { unsigned, uint, TyU } + impl_to_source_int! { unsigned, uint, TyUs } impl_to_source_int! { unsigned, u8, TyU8 } impl_to_source_int! { unsigned, u16, TyU16 } impl_to_source_int! { unsigned, u32, TyU32 } diff --git a/src/libsyntax/parse/mod.rs b/src/libsyntax/parse/mod.rs index b0969a573e66b..c26613b4d6cb3 100644 --- a/src/libsyntax/parse/mod.rs +++ b/src/libsyntax/parse/mod.rs @@ -701,12 +701,14 @@ pub fn integer_lit(s: &str, suffix: Option<&str>, sd: &SpanHandler, sp: Span) -> if let Some(suf) = suffix { if suf.is_empty() { sd.span_bug(sp, "found empty literal suffix in Some")} ty = match suf { - "i" => ast::SignedIntLit(ast::TyI, ast::Plus), + "i" => ast::SignedIntLit(ast::TyIs, ast::Plus), + "is" => ast::SignedIntLit(ast::TyIs, ast::Plus), "i8" => ast::SignedIntLit(ast::TyI8, ast::Plus), "i16" => ast::SignedIntLit(ast::TyI16, ast::Plus), "i32" => ast::SignedIntLit(ast::TyI32, ast::Plus), "i64" => ast::SignedIntLit(ast::TyI64, ast::Plus), - "u" => ast::UnsignedIntLit(ast::TyU), + "u" => ast::UnsignedIntLit(ast::TyUs), + "us" => ast::UnsignedIntLit(ast::TyUs), "u8" => ast::UnsignedIntLit(ast::TyU8), "u16" => ast::UnsignedIntLit(ast::TyU16), "u32" => ast::UnsignedIntLit(ast::TyU32), diff --git a/src/test/run-fail/assert-as-macro.rs b/src/test/run-fail/assert-as-macro.rs index fb069e61bd2a1..59e79fe9266f0 100644 --- a/src/test/run-fail/assert-as-macro.rs +++ b/src/test/run-fail/assert-as-macro.rs @@ -8,8 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// error-pattern:assertion failed: 1i == 2 +// error-pattern:assertion failed: 1is == 2 fn main() { - assert!(1i == 2); + assert!(1is == 2); } diff --git a/src/test/run-fail/panic.rs b/src/test/run-fail/panic.rs index 54ccc98bcd924..dd4c58f176c84 100644 --- a/src/test/run-fail/panic.rs +++ b/src/test/run-fail/panic.rs @@ -8,8 +8,5 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. - - - -// error-pattern:1i == 2 -fn main() { assert!((1i == 2)); } +// error-pattern:1is == 2 +fn main() { assert!((1is == 2)); } diff --git a/src/test/run-pass/tydesc-name.rs b/src/test/run-pass/tydesc-name.rs index 4f473755cb6cf..e3b148ac92db6 100644 --- a/src/test/run-pass/tydesc-name.rs +++ b/src/test/run-pass/tydesc-name.rs @@ -17,7 +17,7 @@ struct Foo { pub fn main() { unsafe { - assert_eq!((*get_tydesc::()).name, "int"); - assert_eq!((*get_tydesc::>()).name, "Foo"); + assert_eq!((*get_tydesc::()).name, "isize"); + assert_eq!((*get_tydesc::>()).name, "Foo"); } } From 5a4ca319185a3f399986bc5e5a2d0a96fac583ae Mon Sep 17 00:00:00 2001 From: Corey Richardson Date: Fri, 5 Dec 2014 18:12:25 -0800 Subject: [PATCH 2/2] test fallout from isize/usize --- src/librustc_resolve/lib.rs | 4 +- src/libsyntax/ast_util.rs | 4 +- src/test/compile-fail/array-not-vector.rs | 6 +- .../compile-fail/associated-types-eq-3.rs | 4 +- ...ted-types-invalid-trait-ref-issue-18865.rs | 4 +- .../compile-fail/associated-types-path-2.rs | 14 ++-- src/test/compile-fail/autoderef-full-lval.rs | 10 +-- src/test/compile-fail/bad-const-type.rs | 4 +- src/test/compile-fail/binop-logic-int.rs | 4 +- src/test/compile-fail/coercion-slice.rs | 2 +- src/test/compile-fail/dst-bad-coerce1.rs | 8 +- src/test/compile-fail/dst-bad-coerce4.rs | 8 +- .../compile-fail/dst-sized-trait-param.rs | 8 +- src/test/compile-fail/fn-trait-formatting.rs | 16 ++-- .../fully-qualified-type-name1.rs | 4 +- .../fully-qualified-type-name4.rs | 4 +- .../generic-type-params-name-repr.rs | 20 ++--- src/test/compile-fail/hrtb-just-for-static.rs | 12 +-- .../compile-fail/hrtb-perfect-forwarding.rs | 24 +++--- src/test/compile-fail/hrtb-type-outlives.rs | 14 ++-- src/test/compile-fail/if-branch-types.rs | 4 +- src/test/compile-fail/issue-10176.rs | 4 +- src/test/compile-fail/issue-10991.rs | 2 +- src/test/compile-fail/issue-12997-2.rs | 4 +- src/test/compile-fail/issue-13058.rs | 10 +-- src/test/compile-fail/issue-13359.rs | 4 +- src/test/compile-fail/issue-13466.rs | 6 +- src/test/compile-fail/issue-14915.rs | 4 +- src/test/compile-fail/issue-16250.rs | 2 +- src/test/compile-fail/issue-17441.rs | 14 ++-- src/test/compile-fail/issue-17444.rs | 4 +- src/test/compile-fail/issue-17651.rs | 4 +- src/test/compile-fail/issue-17905.rs | 8 +- src/test/compile-fail/issue-18611.rs | 4 +- src/test/compile-fail/issue-4517.rs | 8 +- src/test/compile-fail/issue-4968.rs | 4 +- src/test/compile-fail/issue-5239-1.rs | 4 +- src/test/compile-fail/issue-7575.rs | 40 ++++----- src/test/compile-fail/issue-7867.rs | 6 +- src/test/compile-fail/issue-8761.rs | 4 +- src/test/compile-fail/issue-9575.rs | 4 +- src/test/compile-fail/map-types.rs | 8 +- src/test/compile-fail/method-self-arg-1.rs | 2 +- .../compile-fail/mut-pattern-mismatched.rs | 8 +- src/test/compile-fail/noexporttypeexe.rs | 2 +- src/test/compile-fail/pptypedef.rs | 8 +- .../regions-infer-paramd-indirect.rs | 5 +- src/test/compile-fail/repeat_count.rs | 8 +- .../structure-constructor-type-mismatch.rs | 32 +++---- .../trait-bounds-impl-comparison-1.rs | 10 +-- .../trait-coercion-generic-bad.rs | 4 +- src/test/compile-fail/trait-impl-1.rs | 4 +- src/test/compile-fail/tuple-arity-mismatch.rs | 4 +- .../compile-fail/tuple-index-out-of-bounds.rs | 6 +- .../tutorial-suffix-inference-test.rs | 6 +- .../compile-fail/type-mismatch-multiple.rs | 4 +- .../typeck_type_placeholder_mismatch.rs | 10 +-- src/test/compile-fail/variadic-ffi.rs | 16 ++-- .../compile-fail/warn-foreign-int-types.rs | 6 +- .../debuginfo/basic-types-globals-metadata.rs | 4 +- src/test/debuginfo/basic-types-metadata.rs | 8 +- src/test/debuginfo/option-like-enum.rs | 12 +-- src/test/debuginfo/type-names.rs | 82 +++++++++--------- src/test/pretty/issue-4264.pp | 31 +++---- src/test/pretty/issue-4264.rs | 18 ++-- .../graphviz-flowgraph/f01.dot-expected.dot | 6 +- .../graphviz-flowgraph/f03.dot-expected.dot | 8 +- .../graphviz-flowgraph/f04.dot-expected.dot | 6 +- .../graphviz-flowgraph/f05.dot-expected.dot | 10 +-- .../graphviz-flowgraph/f07.dot-expected.dot | 16 ++-- .../graphviz-flowgraph/f08.dot-expected.dot | 20 ++--- .../graphviz-flowgraph/f09.dot-expected.dot | 34 ++++---- src/test/run-make/graphviz-flowgraph/f09.rs | 8 +- .../graphviz-flowgraph/f10.dot-expected.dot | 20 ++--- .../graphviz-flowgraph/f11.dot-expected.dot | 18 ++-- .../graphviz-flowgraph/f12.dot-expected.dot | 24 +++--- .../graphviz-flowgraph/f14.dot-expected.dot | 12 +-- .../graphviz-flowgraph/f15.dot-expected.dot | 58 ++++++------- .../graphviz-flowgraph/f16.dot-expected.dot | 60 ++++++------- .../graphviz-flowgraph/f17.dot-expected.dot | 12 +-- .../graphviz-flowgraph/f20.dot-expected.dot | 18 ++-- .../graphviz-flowgraph/f21.dot-expected.dot | 52 ++++++------ .../graphviz-flowgraph/f22.dot-expected.dot | 54 ++++++------ .../graphviz-flowgraph/f23.dot-expected.dot | 66 +++++++-------- .../graphviz-flowgraph/f24.dot-expected.dot | 84 +++++++++---------- .../graphviz-flowgraph/f25.dot-expected.dot | 84 +++++++++---------- 86 files changed, 644 insertions(+), 642 deletions(-) diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs index cc9abecc20fc8..d14105326ba9c 100644 --- a/src/librustc_resolve/lib.rs +++ b/src/librustc_resolve/lib.rs @@ -834,14 +834,14 @@ impl PrimitiveTypeTable { table.intern("f32", TyFloat(TyF32)); table.intern("f64", TyFloat(TyF64)); table.intern("int", TyInt(TyIs)); - table.intern("isize", TyInt(TyIs)); + table.intern("isize", TyInt(TyIs)); table.intern("i8", TyInt(TyI8)); table.intern("i16", TyInt(TyI16)); table.intern("i32", TyInt(TyI32)); table.intern("i64", TyInt(TyI64)); table.intern("str", TyStr); table.intern("uint", TyUint(TyUs)); - table.intern("usize", TyUint(TyUs)); + table.intern("usize", TyUint(TyUs)); table.intern("u8", TyUint(TyU8)); table.intern("u16", TyUint(TyU16)); table.intern("u32", TyUint(TyU32)); diff --git a/src/libsyntax/ast_util.rs b/src/libsyntax/ast_util.rs index d6df9f46621a7..b21233d71c806 100644 --- a/src/libsyntax/ast_util.rs +++ b/src/libsyntax/ast_util.rs @@ -141,7 +141,7 @@ pub fn int_ty_max(t: IntTy) -> u64 { match t { TyI8 => 0x80u64, TyI16 => 0x8000u64, - TyIs | TyI32 => 0x80000000u64, // actually ni about TyIm + TyIs | TyI32 => 0x80000000u64, // actually ni about TyIs TyI64 => 0x8000000000000000u64 } } @@ -168,7 +168,7 @@ pub fn uint_ty_max(t: UintTy) -> u64 { match t { TyU8 => 0xffu64, TyU16 => 0xffffu64, - TyUs | TyU32 => 0xffffffffu64, // actually ni about TyUm + TyUs | TyU32 => 0xffffffffu64, // actually ni about TyUs TyU64 => 0xffffffffffffffffu64 } } diff --git a/src/test/compile-fail/array-not-vector.rs b/src/test/compile-fail/array-not-vector.rs index 7edb4b8754a1f..6581019fdd520 100644 --- a/src/test/compile-fail/array-not-vector.rs +++ b/src/test/compile-fail/array-not-vector.rs @@ -9,8 +9,8 @@ // except according to those terms. fn main() { - let _x: int = [1i, 2, 3]; //~ ERROR expected int, found array of 3 elements + let _x: isize = [1is, 2, 3]; //~ ERROR expected isize, found array of 3 elements - let x: &[int] = &[1, 2, 3]; - let _y: &int = x; //~ ERROR expected int, found slice + let x: &[isize] = &[1, 2, 3]; + let _y: &isize = x; //~ ERROR expected isize, found slice } diff --git a/src/test/compile-fail/associated-types-eq-3.rs b/src/test/compile-fail/associated-types-eq-3.rs index 0f18a84cd1ae3..b56f971db7449 100644 --- a/src/test/compile-fail/associated-types-eq-3.rs +++ b/src/test/compile-fail/associated-types-eq-3.rs @@ -41,6 +41,6 @@ pub fn baz(x: &Foo) { pub fn main() { let a = 42i; - foo1(a); //~ERROR expected uint, found struct Bar - baz(&a); //~ERROR expected uint, found struct Bar + foo1(a); //~ERROR expected usize, found struct Bar + baz(&a); //~ERROR expected usize, found struct Bar } diff --git a/src/test/compile-fail/associated-types-invalid-trait-ref-issue-18865.rs b/src/test/compile-fail/associated-types-invalid-trait-ref-issue-18865.rs index b04b83e575bf4..13f6dcc9fdee4 100644 --- a/src/test/compile-fail/associated-types-invalid-trait-ref-issue-18865.rs +++ b/src/test/compile-fail/associated-types-invalid-trait-ref-issue-18865.rs @@ -17,8 +17,8 @@ trait Foo { } fn f>(t: &T) { - let u: >::Bar = t.get_bar(); - //~^ ERROR the trait `Foo` is not implemented for the type `T` + let u: >::Bar = t.get_bar(); + //~^ ERROR the trait `Foo` is not implemented for the type `T` } fn main() { } diff --git a/src/test/compile-fail/associated-types-path-2.rs b/src/test/compile-fail/associated-types-path-2.rs index ef85fc22fe7d4..9994a0c465f79 100644 --- a/src/test/compile-fail/associated-types-path-2.rs +++ b/src/test/compile-fail/associated-types-path-2.rs @@ -24,29 +24,29 @@ pub fn f2(a: T) -> T::A { } pub fn f1_int_int() { - f1(2i, 4i); - //~^ ERROR expected uint, found int + f1(2is, 4is); + //~^ ERROR expected usize, found isize } pub fn f1_int_uint() { - f1(2i, 4u); + f1(2is, 4us); } pub fn f1_uint_uint() { - f1(2u, 4u); + f1(2us, 4us); //~^ ERROR the trait `Foo` is not implemented //~| ERROR the trait `Foo` is not implemented } pub fn f1_uint_int() { - f1(2u, 4i); + f1(2us, 4is); //~^ ERROR the trait `Foo` is not implemented //~| ERROR the trait `Foo` is not implemented } pub fn f2_int() { - let _: int = f2(2i); - //~^ ERROR expected `int`, found `uint` + let _: int = f2(2is); + //~^ ERROR expected `isize`, found `usize` } pub fn main() { } diff --git a/src/test/compile-fail/autoderef-full-lval.rs b/src/test/compile-fail/autoderef-full-lval.rs index 7aa3b30ce4919..bbe5af1b51675 100644 --- a/src/test/compile-fail/autoderef-full-lval.rs +++ b/src/test/compile-fail/autoderef-full-lval.rs @@ -9,24 +9,24 @@ // except according to those terms. struct clam { - x: Box, - y: Box, + x: Box, + y: Box, } struct fish { - a: Box, + a: Box, } fn main() { let a: clam = clam{x: box 1, y: box 2}; let b: clam = clam{x: box 10, y: box 20}; - let z: int = a.x + b.y; //~ ERROR binary operation `+` cannot be applied to type `Box` + let z: isize = a.x + b.y; //~ ERROR binary operation `+` cannot be applied to type `Box` println!("{}", z); assert_eq!(z, 21); let forty: fish = fish{a: box 40}; let two: fish = fish{a: box 2}; let answer: int = forty.a + two.a; - //~^ ERROR binary operation `+` cannot be applied to type `Box` + //~^ ERROR binary operation `+` cannot be applied to type `Box` println!("{}", answer); assert_eq!(answer, 42); } diff --git a/src/test/compile-fail/bad-const-type.rs b/src/test/compile-fail/bad-const-type.rs index 13b19141c16cc..2450f22669a51 100644 --- a/src/test/compile-fail/bad-const-type.rs +++ b/src/test/compile-fail/bad-const-type.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// error-pattern:expected `collections::string::String`, found `int` +// error-pattern:expected `collections::string::String`, found `isize` -static i: String = 10i; +static i: String = 10is; fn main() { println!("{}", i); } diff --git a/src/test/compile-fail/binop-logic-int.rs b/src/test/compile-fail/binop-logic-int.rs index 0a53293d67696..0067121e6103a 100644 --- a/src/test/compile-fail/binop-logic-int.rs +++ b/src/test/compile-fail/binop-logic-int.rs @@ -8,6 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// error-pattern:`&&` cannot be applied to type `int` +// error-pattern:`&&` cannot be applied to type `isize` -fn main() { let x = 1i && 2i; } +fn main() { let x = 1is && 2is; } diff --git a/src/test/compile-fail/coercion-slice.rs b/src/test/compile-fail/coercion-slice.rs index b6b46fadb13da..8d48ede0e1543 100644 --- a/src/test/compile-fail/coercion-slice.rs +++ b/src/test/compile-fail/coercion-slice.rs @@ -11,5 +11,5 @@ // Tests that we forbid coercion from `[T; n]` to `&[T]` fn main() { - let _: &[int] = [0i]; //~ERROR: mismatched types: expected `&[int]`, found `[int; 1]` + let _: &[isize] = [0is]; //~ERROR: mismatched types: expected `&[isize]`, found `[isize; 1]` } diff --git a/src/test/compile-fail/dst-bad-coerce1.rs b/src/test/compile-fail/dst-bad-coerce1.rs index 75bd94331b11d..e70db87a39a41 100644 --- a/src/test/compile-fail/dst-bad-coerce1.rs +++ b/src/test/compile-fail/dst-bad-coerce1.rs @@ -18,11 +18,11 @@ struct Foo; trait Bar {} pub fn main() { - // With a vec of ints. + // With a vec of isize. let f1 = Fat { ptr: [1, 2, 3] }; - let f2: &Fat<[int; 3]> = &f1; - let f3: &Fat<[uint]> = f2; - //~^ ERROR mismatched types: expected `&Fat<[uint]>`, found `&Fat<[int; 3]>` + let f2: &Fat<[isize; 3]> = &f1; + let f3: &Fat<[usize]> = f2; + //~^ ERROR mismatched types: expected `&Fat<[usize]>`, found `&Fat<[isize; 3]>` // With a trait. let f1 = Fat { ptr: Foo }; diff --git a/src/test/compile-fail/dst-bad-coerce4.rs b/src/test/compile-fail/dst-bad-coerce4.rs index 53ce18c73a088..8e81eacae921e 100644 --- a/src/test/compile-fail/dst-bad-coerce4.rs +++ b/src/test/compile-fail/dst-bad-coerce4.rs @@ -15,8 +15,8 @@ struct Fat { } pub fn main() { - // With a vec of ints. - let f1: &Fat<[int]> = &Fat { ptr: [1, 2, 3] }; - let f2: &Fat<[int; 3]> = f1; - //~^ ERROR mismatched types: expected `&Fat<[int; 3]>`, found `&Fat<[int]>` + // With a vec of isizes. + let f1: &Fat<[isize]> = &Fat { ptr: [1, 2, 3] }; + let f2: &Fat<[isize; 3]> = f1; + //~^ ERROR mismatched types: expected `&Fat<[isize; 3]>`, found `&Fat<[isize]>` } diff --git a/src/test/compile-fail/dst-sized-trait-param.rs b/src/test/compile-fail/dst-sized-trait-param.rs index ea5becbf229c0..a65ca8b84f893 100644 --- a/src/test/compile-fail/dst-sized-trait-param.rs +++ b/src/test/compile-fail/dst-sized-trait-param.rs @@ -14,10 +14,10 @@ trait Foo : Sized { fn take(self, x: &T) { } } // Note: T is sized -impl Foo<[int]> for uint { } -//~^ ERROR the trait `core::kinds::Sized` is not implemented for the type `[int]` +impl Foo<[isize]> for uint { } +//~^ ERROR the trait `core::kinds::Sized` is not implemented for the type `[isize]` -impl Foo for [uint] { } -//~^ ERROR the trait `core::kinds::Sized` is not implemented for the type `[uint]` +impl Foo for [usize] { } +//~^ ERROR the trait `core::kinds::Sized` is not implemented for the type `[usize]` pub fn main() { } diff --git a/src/test/compile-fail/fn-trait-formatting.rs b/src/test/compile-fail/fn-trait-formatting.rs index 3eeb4c177cad6..06e8412ddaa23 100644 --- a/src/test/compile-fail/fn-trait-formatting.rs +++ b/src/test/compile-fail/fn-trait-formatting.rs @@ -10,15 +10,15 @@ #![feature(unboxed_closures)] -fn needs_fn(x: F) where F: Fn(int) -> int {} +fn needs_fn(x: F) where F: Fn(isize) -> isize {} fn main() { - let _: () = (box |:_: int| {}) as Box; //~ ERROR object-safe - //~^ ERROR Box - let _: () = (box |&:_: int, int| {}) as Box; - //~^ ERROR Box - let _: () = (box |&mut:| -> int unimplemented!()) as Box int>; - //~^ ERROR Box int> + let _: () = (box |:_: isize| {}) as Box; //~ ERROR object-safe + //~^ ERROR Box + let _: () = (box |&:_: isize, isize| {}) as Box; + //~^ ERROR Box + let _: () = (box |&mut:| -> isize unimplemented!()) as Box isize>; + //~^ ERROR Box isize> - needs_fn(1i); //~ ERROR `core::ops::Fn(int) -> int` + needs_fn(1i); //~ ERROR `core::ops::Fn(isize) -> isize` } diff --git a/src/test/compile-fail/fully-qualified-type-name1.rs b/src/test/compile-fail/fully-qualified-type-name1.rs index c5e7fc82cc994..5ab946a53e5cc 100644 --- a/src/test/compile-fail/fully-qualified-type-name1.rs +++ b/src/test/compile-fail/fully-qualified-type-name1.rs @@ -11,7 +11,7 @@ // Test that we use fully-qualified type names in error messages. fn main() { - let x: Option; + let x: Option; x = 5; - //~^ ERROR mismatched types: expected `core::option::Option` + //~^ ERROR mismatched types: expected `core::option::Option` } diff --git a/src/test/compile-fail/fully-qualified-type-name4.rs b/src/test/compile-fail/fully-qualified-type-name4.rs index 768ae6353d225..9250444c3e6cd 100644 --- a/src/test/compile-fail/fully-qualified-type-name4.rs +++ b/src/test/compile-fail/fully-qualified-type-name4.rs @@ -12,9 +12,9 @@ use std::option::Option; -fn bar(x: uint) -> Option { +fn bar(x: usize) -> Option { return x; - //~^ ERROR mismatched types: expected `core::option::Option` + //~^ ERROR mismatched types: expected `core::option::Option` } fn main() { diff --git a/src/test/compile-fail/generic-type-params-name-repr.rs b/src/test/compile-fail/generic-type-params-name-repr.rs index 5bdee543d738d..5769b9d7932c0 100644 --- a/src/test/compile-fail/generic-type-params-name-repr.rs +++ b/src/test/compile-fail/generic-type-params-name-repr.rs @@ -18,22 +18,22 @@ struct HashMap>; fn main() { // Ensure that the printed type doesn't include the default type params... - let _: Foo = (); - //~^ ERROR mismatched types: expected `Foo`, found `()` + let _: Foo = (); + //~^ ERROR mismatched types: expected `Foo`, found `()` // ...even when they're present, but the same types as the defaults. - let _: Foo = (); - //~^ ERROR mismatched types: expected `Foo`, found `()` + let _: Foo = (); + //~^ ERROR mismatched types: expected `Foo`, found `()` // Including cases where the default is using previous type params. - let _: HashMap = (); - //~^ ERROR mismatched types: expected `HashMap`, found `()` - let _: HashMap> = (); - //~^ ERROR mismatched types: expected `HashMap`, found `()` + let _: HashMap = (); + //~^ ERROR mismatched types: expected `HashMap`, found `()` + let _: HashMap> = (); + //~^ ERROR mismatched types: expected `HashMap`, found `()` // But not when there's a different type in between. - let _: Foo = (); - //~^ ERROR mismatched types: expected `Foo`, found `()` + let _: Foo = (); + //~^ ERROR mismatched types: expected `Foo`, found `()` // And don't print <> at all when there's just defaults. let _: Foo = (); diff --git a/src/test/compile-fail/hrtb-just-for-static.rs b/src/test/compile-fail/hrtb-just-for-static.rs index 36a45400eec1a..a1ec4a739e8ce 100644 --- a/src/test/compile-fail/hrtb-just-for-static.rs +++ b/src/test/compile-fail/hrtb-just-for-static.rs @@ -16,22 +16,22 @@ trait Foo { } fn want_hrtb() - where T : for<'a> Foo<&'a int> + where T : for<'a> Foo<&'a isize> { } -// AnyInt implements Foo<&'a int> for any 'a, so it is a match. +// AnyInt implements Foo<&'a isize> for any 'a, so it is a match. struct AnyInt; -impl<'a> Foo<&'a int> for AnyInt { } +impl<'a> Foo<&'a isize> for AnyInt { } fn give_any() { want_hrtb::() } -// StaticInt only implements Foo<&'static int>, so it is an error. +// StaticInt only implements Foo<&'static isize>, so it is an error. struct StaticInt; -impl Foo<&'static int> for StaticInt { } +impl Foo<&'static isize> for StaticInt { } fn give_static() { - want_hrtb::() //~ ERROR `for<'a> Foo<&'a int>` is not implemented + want_hrtb::() //~ ERROR `for<'a> Foo<&'a isize>` is not implemented } fn main() { } diff --git a/src/test/compile-fail/hrtb-perfect-forwarding.rs b/src/test/compile-fail/hrtb-perfect-forwarding.rs index a8ee2154fc396..e8ecc0608fc4a 100644 --- a/src/test/compile-fail/hrtb-perfect-forwarding.rs +++ b/src/test/compile-fail/hrtb-perfect-forwarding.rs @@ -30,36 +30,36 @@ impl<'a,X,F> Bar for &'a mut F } fn no_hrtb<'b,T>(mut t: T) - where T : Bar<&'b int> + where T : Bar<&'b isize> { - // OK -- `T : Bar<&'b int>`, and thus the impl above ensures that - // `&mut T : Bar<&'b int>`. + // OK -- `T : Bar<&'b isize>`, and thus the impl above ensures that + // `&mut T : Bar<&'b isize>`. no_hrtb(&mut t); } fn bar_hrtb(mut t: T) - where T : for<'b> Bar<&'b int> + where T : for<'b> Bar<&'b isize> { - // OK -- `T : for<'b> Bar<&'b int>`, and thus the impl above - // ensures that `&mut T : for<'b> Bar<&'b int>`. This is an + // OK -- `T : for<'b> Bar<&'b isize>`, and thus the impl above + // ensures that `&mut T : for<'b> Bar<&'b isize>`. This is an // example of a "perfect forwarding" impl. bar_hrtb(&mut t); } fn foo_hrtb_bar_not<'b,T>(mut t: T) - where T : for<'a> Foo<&'a int> + Bar<&'b int> + where T : for<'a> Foo<&'a isize> + Bar<&'b isize> { // Not OK -- The forwarding impl for `Foo` requires that `Bar` also // be implemented. Thus to satisfy `&mut T : for<'a> Foo<&'a - // int>`, we require `T : for<'a> Bar<&'a int>`, but the where - // clause only specifies `T : Bar<&'b int>`. - foo_hrtb_bar_not(&mut t); //~ ERROR `for<'a> Bar<&'a int>` is not implemented for the type `T` + // isize>`, we require `T : for<'a> Bar<&'a isize>`, but the where + // clause only specifies `T : Bar<&'b isize>`. + foo_hrtb_bar_not(&mut t); //~ ERROR `for<'a> Bar<&'a isize>` is not implemented for the type `T` } fn foo_hrtb_bar_hrtb(mut t: T) - where T : for<'a> Foo<&'a int> + for<'b> Bar<&'b int> + where T : for<'a> Foo<&'a isize> + for<'b> Bar<&'b isize> { - // OK -- now we have `T : for<'b> Bar&'b int>`. + // OK -- now we have `T : for<'b> Bar&'b isize>`. foo_hrtb_bar_hrtb(&mut t); } diff --git a/src/test/compile-fail/hrtb-type-outlives.rs b/src/test/compile-fail/hrtb-type-outlives.rs index 9fe8f9ab46ddc..7bb74d6b03a33 100644 --- a/src/test/compile-fail/hrtb-type-outlives.rs +++ b/src/test/compile-fail/hrtb-type-outlives.rs @@ -17,7 +17,7 @@ trait Foo { } fn want_foo() - where T : for<'a> Foo<&'a int> + where T : for<'a> Foo<&'a isize> { } @@ -28,7 +28,7 @@ struct SomeStruct { x: X } -impl<'a,X> Foo<&'a int> for SomeStruct +impl<'a,X> Foo<&'a isize> for SomeStruct where X : 'a { } @@ -36,8 +36,8 @@ impl<'a,X> Foo<&'a int> for SomeStruct fn one() { // In fact there is no good reason for this to be an error, but // whatever, I'm mostly concerned it doesn't ICE right now: - want_foo::>(); - //~^ ERROR requirement `for<'a> uint : 'a` is not satisfied + want_foo::>(); + //~^ ERROR requirement `for<'a> usize : 'a` is not satisfied } /////////////////////////////////////////////////////////////////////////// @@ -47,13 +47,13 @@ struct AnotherStruct { x: X } -impl<'a,X:'a> Foo<&'a int> for AnotherStruct +impl<'a,X:'a> Foo<&'a isize> for AnotherStruct { } fn two() { - want_foo::>(); - //~^ ERROR requirement `for<'a> uint : 'a` is not satisfied + want_foo::>(); + //~^ ERROR requirement `for<'a> usize : 'a` is not satisfied } fn main() { } diff --git a/src/test/compile-fail/if-branch-types.rs b/src/test/compile-fail/if-branch-types.rs index 4a8c72c3877c5..be54554a3c02f 100644 --- a/src/test/compile-fail/if-branch-types.rs +++ b/src/test/compile-fail/if-branch-types.rs @@ -9,6 +9,6 @@ // except according to those terms. fn main() { - let x = if true { 10i } else { 10u }; - //~^ ERROR if and else have incompatible types: expected `int`, found `uint` + let x = if true { 10is } else { 10us }; + //~^ ERROR if and else have incompatible types: expected `isize`, found `usize` } diff --git a/src/test/compile-fail/issue-10176.rs b/src/test/compile-fail/issue-10176.rs index f537d5cad9779..832cc57bd24df 100644 --- a/src/test/compile-fail/issue-10176.rs +++ b/src/test/compile-fail/issue-10176.rs @@ -8,9 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -fn f() -> int { +fn f() -> isize { (return 1, return 2) -//~^ ERROR mismatched types: expected `int`, found `(_, _)` (expected int, found tuple) +//~^ ERROR mismatched types: expected `isize`, found `(_, _)` (expected isize, found tuple) } fn main() {} diff --git a/src/test/compile-fail/issue-10991.rs b/src/test/compile-fail/issue-10991.rs index 8f7e6470f9095..2913ddf395fbb 100644 --- a/src/test/compile-fail/issue-10991.rs +++ b/src/test/compile-fail/issue-10991.rs @@ -10,5 +10,5 @@ fn main() { let nil = (); - let _t = nil as uint; //~ ERROR: cast from nil: `()` as `uint` + let _t = nil as usize; //~ ERROR: cast from nil: `()` as `usize` } diff --git a/src/test/compile-fail/issue-12997-2.rs b/src/test/compile-fail/issue-12997-2.rs index 83f6fb072329d..39957a242268f 100644 --- a/src/test/compile-fail/issue-12997-2.rs +++ b/src/test/compile-fail/issue-12997-2.rs @@ -12,6 +12,6 @@ //! Test that makes sure wrongly-typed bench functions are rejected -// error-pattern:expected &-ptr, found int +// error-pattern:expected &-ptr, found isize #[bench] -fn bar(x: int) { } +fn bar(x: isize) { } diff --git a/src/test/compile-fail/issue-13058.rs b/src/test/compile-fail/issue-13058.rs index 8dda54efc06af..8f50786405283 100644 --- a/src/test/compile-fail/issue-13058.rs +++ b/src/test/compile-fail/issue-13058.rs @@ -12,15 +12,15 @@ use std::iter::{Range,range}; trait Itble<'r, T, I: Iterator> { fn iter(&'r self) -> I; } -impl<'r> Itble<'r, uint, Range> for (uint, uint) { - fn iter(&'r self) -> Range { +impl<'r> Itble<'r, usize, Range> for (usize, usize) { + fn iter(&'r self) -> Range { let &(min, max) = self; range(min, max) } } -fn check<'r, I: Iterator, T: Itble<'r, uint, I>>(cont: &T) -> bool -//~^ HELP as shown: fn check<'r, I: Iterator, T: Itble<'r, uint, I>>(cont: &'r T) +fn check<'r, I: Iterator, T: Itble<'r, usize, I>>(cont: &T) -> bool +//~^ HELP as shown: fn check<'r, I: Iterator, T: Itble<'r, usize, I>>(cont: &'r T) { let cont_iter = cont.iter(); //~^ ERROR cannot infer an appropriate lifetime for autoref due to conflicting requirements @@ -35,5 +35,5 @@ fn check<'r, I: Iterator, T: Itble<'r, uint, I>>(cont: &T) -> bool fn main() { check((3u, 5u)); -//~^ ERROR mismatched types: expected `&_`, found `(uint, uint)` (expected &-ptr, found tuple) +//~^ ERROR mismatched types: expected `&_`, found `(usize, usize)` (expected &-ptr, found tuple) } diff --git a/src/test/compile-fail/issue-13359.rs b/src/test/compile-fail/issue-13359.rs index 5c72c7388a9ee..25e64e070f40b 100644 --- a/src/test/compile-fail/issue-13359.rs +++ b/src/test/compile-fail/issue-13359.rs @@ -14,8 +14,8 @@ fn bar(_s: u32) { } fn main() { foo(1*(1 as int)); - //~^ ERROR: mismatched types: expected `i16`, found `int` (expected i16, found int) + //~^ ERROR: mismatched types: expected `i16`, found `isize` (expected i16, found isize) bar(1*(1 as uint)); - //~^ ERROR: mismatched types: expected `u32`, found `uint` (expected u32, found uint) + //~^ ERROR: mismatched types: expected `u32`, found `usize` (expected u32, found usize) } diff --git a/src/test/compile-fail/issue-13466.rs b/src/test/compile-fail/issue-13466.rs index e150c1a0f2fc8..7d554545b5ed2 100644 --- a/src/test/compile-fail/issue-13466.rs +++ b/src/test/compile-fail/issue-13466.rs @@ -14,8 +14,8 @@ pub fn main() { // The expected arm type `Option` has one type parameter, while // the actual arm `Result` has two. typeck should not be // tricked into looking up a non-existing second type parameter. - let _x: uint = match Some(1u) { - Ok(u) => u, //~ ERROR mismatched types: expected `core::option::Option` - Err(e) => panic!(e) //~ ERROR mismatched types: expected `core::option::Option` + let _x: usize = match Some(1us) { + Ok(u) => u, //~ ERROR mismatched types: expected `core::option::Option` + Err(e) => panic!(e) //~ ERROR mismatched types: expected `core::option::Option` }; } diff --git a/src/test/compile-fail/issue-14915.rs b/src/test/compile-fail/issue-14915.rs index 8cbbfb7b83a55..142fecc31fec1 100644 --- a/src/test/compile-fail/issue-14915.rs +++ b/src/test/compile-fail/issue-14915.rs @@ -9,7 +9,7 @@ // except according to those terms. fn main() { - let x: Box = box 0; + let x: Box = box 0; - println!("{}", x + 1); //~ ERROR binary operation `+` cannot be applied to type `Box` + println!("{}", x + 1); //~ ERROR binary operation `+` cannot be applied to type `Box` } diff --git a/src/test/compile-fail/issue-16250.rs b/src/test/compile-fail/issue-16250.rs index 883e79d75e096..c886c97a63607 100644 --- a/src/test/compile-fail/issue-16250.rs +++ b/src/test/compile-fail/issue-16250.rs @@ -11,7 +11,7 @@ #![deny(warnings)] extern { - pub fn foo(x: (int)); //~ ERROR found rust type `int` in foreign module + pub fn foo(x: (isize)); //~ ERROR found rust type `isize` in foreign module } fn main() { diff --git a/src/test/compile-fail/issue-17441.rs b/src/test/compile-fail/issue-17441.rs index e5da5c5504ef3..6ae4fbca8b04c 100644 --- a/src/test/compile-fail/issue-17441.rs +++ b/src/test/compile-fail/issue-17441.rs @@ -9,16 +9,16 @@ // except according to those terms. fn main() { - let _foo = &[1u, 2] as [uint]; - //~^ ERROR cast to unsized type: `&[uint; 2]` as `[uint]` - //~^^ HELP consider using an implicit coercion to `&[uint]` instead + let _foo = &[1u, 2] as [usize]; + //~^ ERROR cast to unsized type: `&[usize; 2]` as `[usize]` + //~^^ HELP consider using an implicit coercion to `&[usize]` instead let _bar = box 1u as std::fmt::Show; - //~^ ERROR cast to unsized type: `Box` as `core::fmt::Show` + //~^ ERROR cast to unsized type: `Box` as `core::fmt::Show` //~^^ HELP did you mean `Box`? let _baz = 1u as std::fmt::Show; - //~^ ERROR cast to unsized type: `uint` as `core::fmt::Show` + //~^ ERROR cast to unsized type: `usize` as `core::fmt::Show` //~^^ HELP consider using a box or reference as appropriate - let _quux = [1u, 2] as [uint]; - //~^ ERROR cast to unsized type: `[uint; 2]` as `[uint]` + let _quux = [1u, 2] as [usize]; + //~^ ERROR cast to unsized type: `[usize; 2]` as `[usize]` //~^^ HELP consider using a box or reference as appropriate } diff --git a/src/test/compile-fail/issue-17444.rs b/src/test/compile-fail/issue-17444.rs index 55570e93a9721..011a9c1777638 100644 --- a/src/test/compile-fail/issue-17444.rs +++ b/src/test/compile-fail/issue-17444.rs @@ -13,6 +13,6 @@ enum Test { } fn main() { - let _x = Test::Foo as *const int; - //~^ ERROR illegal cast; cast through an integer first: `Test` as `*const int` + let _x = Test::Foo as *const isize; + //~^ ERROR illegal cast; cast through an integer first: `Test` as `*const isize` } diff --git a/src/test/compile-fail/issue-17651.rs b/src/test/compile-fail/issue-17651.rs index 970b14c7eb7cc..589f1cf44bf16 100644 --- a/src/test/compile-fail/issue-17651.rs +++ b/src/test/compile-fail/issue-17651.rs @@ -12,7 +12,7 @@ // and rejected. fn main() { - (|&:| box *[0u].as_slice())(); + (|&:| box *[0us].as_slice())(); //~^ ERROR cannot move out of dereference - //~^^ ERROR cannot move a value of type [uint] + //~^^ ERROR cannot move a value of type [usize] } diff --git a/src/test/compile-fail/issue-17905.rs b/src/test/compile-fail/issue-17905.rs index 2b5c0b7de2f9b..1418cdf403993 100644 --- a/src/test/compile-fail/issue-17905.rs +++ b/src/test/compile-fail/issue-17905.rs @@ -13,15 +13,15 @@ struct Pair (T, V); impl Pair< &str, //~ ERROR missing lifetime specifier - int + isize > { - fn say(self: &Pair<&str, int>) { -//~^ ERROR mismatched types: expected `Pair<&'static str, int>`, found `Pair<&str, int>` + fn say(self: &Pair<&str, isize>) { +//~^ ERROR mismatched types: expected `Pair<&'static str, isize>`, found `Pair<&str, isize>` println!("{}", self); } } fn main() { - let result = &Pair("shane", 1i); + let result = &Pair("shane", 1is); result.say(); } diff --git a/src/test/compile-fail/issue-18611.rs b/src/test/compile-fail/issue-18611.rs index 95782630efc82..a662e9ca98ee8 100644 --- a/src/test/compile-fail/issue-18611.rs +++ b/src/test/compile-fail/issue-18611.rs @@ -8,8 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -fn add_state(op: ::State) { -//~^ ERROR the trait `HasState` is not implemented for the type `int` +fn add_state(op: ::State) { +//~^ ERROR the trait `HasState` is not implemented for the type `isize` } trait HasState { diff --git a/src/test/compile-fail/issue-4517.rs b/src/test/compile-fail/issue-4517.rs index 1c5fd9be1bd4d..1943f1e5a1954 100644 --- a/src/test/compile-fail/issue-4517.rs +++ b/src/test/compile-fail/issue-4517.rs @@ -8,11 +8,11 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -fn bar(int_param: int) {} +fn bar(int_param: usize) {} fn main() { - let foo: [u8; 4] = [1u8; 4u]; + let foo: [u8; 4] = [1u8; 4us]; bar(foo); - //~^ ERROR mismatched types: expected `int`, found `[u8; 4]` - // (expected int, found vector) + //~^ ERROR mismatched types: expected `usize`, found `[u8; 4]` + // (expected usize, found vector) } diff --git a/src/test/compile-fail/issue-4968.rs b/src/test/compile-fail/issue-4968.rs index cf1f1f5908954..88933c0add929 100644 --- a/src/test/compile-fail/issue-4968.rs +++ b/src/test/compile-fail/issue-4968.rs @@ -10,9 +10,9 @@ // Regression test for issue #4968 -const A: (int,int) = (4,2); +const A: (isize,isize) = (4,2); fn main() { match 42 { A => () } - //~^ ERROR mismatched types: expected `_`, found `(int, int)` + //~^ ERROR mismatched types: expected `_`, found `(isize, isize)` // (expected integral variable, found tuple) } diff --git a/src/test/compile-fail/issue-5239-1.rs b/src/test/compile-fail/issue-5239-1.rs index 1691688fd8464..0eaa40efca22b 100644 --- a/src/test/compile-fail/issue-5239-1.rs +++ b/src/test/compile-fail/issue-5239-1.rs @@ -11,6 +11,6 @@ // Regression test for issue #5239 fn main() { - let x = |&: ref x: int| -> int { x += 1; }; - //~^ ERROR binary assignment operation `+=` cannot be applied to type `&int` + let x = |&: ref x: isize| -> isize { x += 1; }; + //~^ ERROR binary assignment operation `+=` cannot be applied to type `&isize` } diff --git a/src/test/compile-fail/issue-7575.rs b/src/test/compile-fail/issue-7575.rs index d5a1040d4b4d9..0d5156956e566 100644 --- a/src/test/compile-fail/issue-7575.rs +++ b/src/test/compile-fail/issue-7575.rs @@ -11,43 +11,43 @@ // Test the mechanism for warning about possible missing `self` declarations. trait CtxtFn { - fn f8(self, uint) -> uint; - fn f9(uint) -> uint; //~ NOTE candidate + fn f8(self, usize) -> usize; + fn f9(usize) -> usize; //~ NOTE candidate } trait OtherTrait { - fn f9(uint) -> uint; //~ NOTE candidate + fn f9(usize) -> usize; //~ NOTE candidate } // Note: this trait is not implemented, but we can't really tell // whether or not an impl would match anyhow without a self -// declaration to match against, so we wind up printing it as a +// declaration to match against, so we wind up prisizeing it as a // candidate. This seems not unreasonable -- perhaps the user meant to // implement it, after all. trait UnusedTrait { - fn f9(uint) -> uint; //~ NOTE candidate + fn f9(usize) -> usize; //~ NOTE candidate } -impl CtxtFn for uint { - fn f8(self, i: uint) -> uint { +impl CtxtFn for usize { + fn f8(self, i: usize) -> usize { i * 4u } - fn f9(i: uint) -> uint { + fn f9(i: usize) -> usize { i * 4u } } -impl OtherTrait for uint { - fn f9(i: uint) -> uint { +impl OtherTrait for usize { + fn f9(i: usize) -> usize { i * 8u } } -struct MyInt(int); +struct Myisize(isize); -impl MyInt { - fn fff(i: int) -> int { //~ NOTE candidate +impl Myisize { + fn fff(i: isize) -> isize { //~ NOTE candidate i } } @@ -64,17 +64,17 @@ impl ManyImplTrait for String { } } -impl ManyImplTrait for uint {} -impl ManyImplTrait for int {} +impl ManyImplTrait for usize {} +impl ManyImplTrait for isize {} impl ManyImplTrait for char {} -impl ManyImplTrait for MyInt {} +impl ManyImplTrait for Myisize {} -fn no_param_bound(u: uint, m: MyInt) -> uint { +fn no_param_bound(u: usize, m: Myisize) -> usize { u.f8(42) + u.f9(342) + m.fff(42) - //~^ ERROR type `uint` does not implement any method in scope named `f9` + //~^ ERROR type `usize` does not implement any method in scope named `f9` //~^^ NOTE found defined static methods, maybe a `self` is missing? - //~^^^ ERROR type `MyInt` does not implement any method in scope named `fff` - //~^^^^ NOTE found defined static methods, maybe a `self` is missing? + //~^^^ ERROR type `Myisize` does not implement any method in scope named `fff` + //~^^^^ NOTE found defined static methods, maybe a `self` is missing? } fn param_bound(t: T) -> bool { diff --git a/src/test/compile-fail/issue-7867.rs b/src/test/compile-fail/issue-7867.rs index f11d5972ee191..e459a243cc8a5 100644 --- a/src/test/compile-fail/issue-7867.rs +++ b/src/test/compile-fail/issue-7867.rs @@ -18,10 +18,10 @@ fn main() { _ => () } - match &Some(42i) { - Some(x) => (), //~ ERROR expected `&core::option::Option`, + match &Some(42is) { + Some(x) => (), //~ ERROR expected `&core::option::Option`, // found `core::option::Option<_>` - None => () //~ ERROR expected `&core::option::Option`, + None => () //~ ERROR expected `&core::option::Option`, // found `core::option::Option<_>` } } diff --git a/src/test/compile-fail/issue-8761.rs b/src/test/compile-fail/issue-8761.rs index 27369f77e883b..3f9e92afba2b1 100644 --- a/src/test/compile-fail/issue-8761.rs +++ b/src/test/compile-fail/issue-8761.rs @@ -10,9 +10,9 @@ enum Foo { A = 1i64, - //~^ ERROR mismatched types: expected `int`, found `i64` + //~^ ERROR mismatched types: expected `isize`, found `i64` B = 2u8 - //~^ ERROR mismatched types: expected `int`, found `u8` + //~^ ERROR mismatched types: expected `isize`, found `u8` } fn main() {} diff --git a/src/test/compile-fail/issue-9575.rs b/src/test/compile-fail/issue-9575.rs index 6e8f7ffb68da4..b7537f2a93251 100644 --- a/src/test/compile-fail/issue-9575.rs +++ b/src/test/compile-fail/issue-9575.rs @@ -9,7 +9,7 @@ // except according to those terms. #[start] -fn start(argc: int, argv: *const *const u8, crate_map: *const u8) -> int { +fn start(argc: isize, argv: *const *const u8, crate_map: *const u8) -> isize { //~^ ERROR incorrect number of function parameters - 0 + 0 } diff --git a/src/test/compile-fail/map-types.rs b/src/test/compile-fail/map-types.rs index b1116a4cca62b..7aafeced3a6f4 100644 --- a/src/test/compile-fail/map-types.rs +++ b/src/test/compile-fail/map-types.rs @@ -19,8 +19,8 @@ impl Map for HashMap {} // Test that trait types printed in error msgs include the type arguments. fn main() { - let x: Box> = box HashMap::new(); - let x: Box> = x; - let y: Box> = box x; - //~^ ERROR the trait `Map` is not implemented + let x: Box> = box HashMap::new(); + let x: Box> = x; + let y: Box> = box x; + //~^ ERROR the trait `Map` is not implemented } diff --git a/src/test/compile-fail/method-self-arg-1.rs b/src/test/compile-fail/method-self-arg-1.rs index 82d75b45394e3..178b73199766e 100644 --- a/src/test/compile-fail/method-self-arg-1.rs +++ b/src/test/compile-fail/method-self-arg-1.rs @@ -20,5 +20,5 @@ fn main() { let x = Foo; Foo::bar(x); //~ERROR mismatched types: expected `&Foo`, found `Foo` Foo::bar(&&x); //~ERROR mismatched types: expected `&Foo`, found `&&Foo` - Foo::bar(&42i); //~ERROR mismatched types: expected `&Foo`, found `&int` + Foo::bar(&42is); //~ERROR mismatched types: expected `&Foo`, found `&isize` } diff --git a/src/test/compile-fail/mut-pattern-mismatched.rs b/src/test/compile-fail/mut-pattern-mismatched.rs index 81985a3d6aa5b..6a574f07e9d94 100644 --- a/src/test/compile-fail/mut-pattern-mismatched.rs +++ b/src/test/compile-fail/mut-pattern-mismatched.rs @@ -9,18 +9,18 @@ // except according to those terms. fn main() { - let foo = &mut 1i; + let foo = &mut 1is; // (separate lines to ensure the spans are accurate) // SNAP b2085d9 uncomment this after the next snapshot // NOTE(stage0) just in case tidy doesn't check snap's in tests - // let &_ // ~ ERROR expected `&mut int`, found `&_` + // let &_ // ~ ERROR expected `&mut isize`, found `&_` // = foo; let &mut _ = foo; - let bar = &1i; + let bar = &1is; let &_ = bar; - let &mut _ //~ ERROR expected `&int`, found `&mut _` + let &mut _ //~ ERROR expected `&isize`, found `&mut _` = bar; } diff --git a/src/test/compile-fail/noexporttypeexe.rs b/src/test/compile-fail/noexporttypeexe.rs index 7e113d4a8c4cd..4081792b6544a 100644 --- a/src/test/compile-fail/noexporttypeexe.rs +++ b/src/test/compile-fail/noexporttypeexe.rs @@ -18,5 +18,5 @@ fn main() { // because the def_id associated with the type was // not convertible to a path. let x: int = noexporttypelib::foo(); - //~^ ERROR expected `int`, found `core::option::Option` + //~^ ERROR expected `isize`, found `core::option::Option` } diff --git a/src/test/compile-fail/pptypedef.rs b/src/test/compile-fail/pptypedef.rs index ebda4e9103d60..b33b89be35d82 100644 --- a/src/test/compile-fail/pptypedef.rs +++ b/src/test/compile-fail/pptypedef.rs @@ -11,9 +11,9 @@ fn let_in(x: T, f: F) where F: FnOnce(T) {} fn main() { - let_in(3u, |i| { assert!(i == 3i); }); - //~^ ERROR expected `uint`, found `int` + let_in(3u, |i| { assert!(i == 3is); }); + //~^ ERROR expected `usize`, found `isize` - let_in(3i, |i| { assert!(i == 3u); }); - //~^ ERROR expected `int`, found `uint` + let_in(3i, |i| { assert!(i == 3us); }); + //~^ ERROR expected `isize`, found `usize` } diff --git a/src/test/compile-fail/regions-infer-paramd-indirect.rs b/src/test/compile-fail/regions-infer-paramd-indirect.rs index f93907f5e5cb0..0d441380e8144 100644 --- a/src/test/compile-fail/regions-infer-paramd-indirect.rs +++ b/src/test/compile-fail/regions-infer-paramd-indirect.rs @@ -12,7 +12,7 @@ // Check that we correctly infer that b and c must be region // parameterized because they reference a which requires a region. -type a<'a> = &'a int; +type a<'a> = &'a isize; type b<'a> = Box>; struct c<'a> { @@ -30,7 +30,8 @@ impl<'a> set_f<'a> for c<'a> { } fn set_f_bad(&mut self, b: Box) { - self.f = b; //~ ERROR mismatched types: expected `Box>`, found `Box>` + self.f = b; + //~^ ERROR mismatched types: expected `Box>`, found `Box>` } } diff --git a/src/test/compile-fail/repeat_count.rs b/src/test/compile-fail/repeat_count.rs index 3b0ef0c293af7..f851a8244f61e 100644 --- a/src/test/compile-fail/repeat_count.rs +++ b/src/test/compile-fail/repeat_count.rs @@ -15,13 +15,13 @@ fn main() { let a = [0; n]; //~ ERROR expected constant integer for repeat count, found variable let b = [0; ()]; //~^ ERROR expected constant integer for repeat count, found non-constant expression -//~^^ ERROR: expected `uint`, found `()` +//~^^ ERROR: expected `usize`, found `()` let c = [0; true]; //~ ERROR expected positive integer for repeat count, found boolean - //~^ ERROR: expected `uint`, found `bool` + //~^ ERROR: expected `usize`, found `bool` let d = [0; 0.5]; //~ ERROR expected positive integer for repeat count, found float - //~^ ERROR: expected `uint`, found `_` + //~^ ERROR: expected `usize`, found `_` let e = [0; "foo"]; //~ ERROR expected positive integer for repeat count, found string - //~^ ERROR: expected `uint`, found `&'static str` + //~^ ERROR: expected `usize`, found `&'static str` let f = [0; -4]; //~^ ERROR expected positive integer for repeat count, found negative integer let f = [0u; -1]; diff --git a/src/test/compile-fail/structure-constructor-type-mismatch.rs b/src/test/compile-fail/structure-constructor-type-mismatch.rs index a0a481401bd21..fb84c1e2ebe9a 100644 --- a/src/test/compile-fail/structure-constructor-type-mismatch.rs +++ b/src/test/compile-fail/structure-constructor-type-mismatch.rs @@ -24,33 +24,33 @@ type PairF = Pair; fn main() { let pt = PointF { - //~^ ERROR expected f32, found int - x: 1i, - y: 2i, + //~^ ERROR expected f32, found isize + x: 1is, + y: 2is, }; let pt2 = Point:: { - //~^ ERROR expected f32, found int - x: 3i, - y: 4i, + //~^ ERROR expected f32, found isize + x: 3is, + y: 4is, }; let pair = PairF { - //~^ ERROR expected f32, found int - x: 5i, - y: 6i, + //~^ ERROR expected f32, found isize + x: 5is, + y: 6is, }; - let pair2 = PairF:: { - //~^ ERROR expected f32, found int - x: 7i, - y: 8i, + let pair2 = PairF:: { + //~^ ERROR expected f32, found isize + x: 7is, + y: 8is, }; - let pt3 = PointF:: { + let pt3 = PointF:: { //~^ ERROR wrong number of type arguments - x: 9i, - y: 10i, + x: 9is, + y: 10is, }; } diff --git a/src/test/compile-fail/trait-bounds-impl-comparison-1.rs b/src/test/compile-fail/trait-bounds-impl-comparison-1.rs index eec116855c986..5fc80d5660d04 100644 --- a/src/test/compile-fail/trait-bounds-impl-comparison-1.rs +++ b/src/test/compile-fail/trait-bounds-impl-comparison-1.rs @@ -29,7 +29,7 @@ trait Foo { fn test_error8_fn(&self); } -impl Foo for int { +impl Foo for isize { // invalid bound for T, was defined as Eq in trait fn test_error1_fn(&self) {} //~^ ERROR in method `test_error1_fn`, type parameter 0 requires bound `core::cmp::Ord` @@ -66,12 +66,12 @@ impl Foo for int { trait Getter { } trait Trait { - fn method>(); + fn method>(); } -impl Trait for uint { - fn method>() {} - //~^ ERROR in method `method`, type parameter 0 requires bound `Getter` +impl Trait for usize { + fn method>() {} + //~^ ERROR in method `method`, type parameter 0 requires bound `Getter` } fn main() {} diff --git a/src/test/compile-fail/trait-coercion-generic-bad.rs b/src/test/compile-fail/trait-coercion-generic-bad.rs index fcfd079997734..e6ea8e10b22cc 100644 --- a/src/test/compile-fail/trait-coercion-generic-bad.rs +++ b/src/test/compile-fail/trait-coercion-generic-bad.rs @@ -24,7 +24,7 @@ impl Trait<&'static str> for Struct { } fn main() { - let s: Box> = box Struct { person: "Fred" }; - //~^ ERROR the trait `Trait` is not implemented for the type `Struct` + let s: Box> = box Struct { person: "Fred" }; + //~^ ERROR the trait `Trait` is not implemented for the type `Struct` s.f(1); } diff --git a/src/test/compile-fail/trait-impl-1.rs b/src/test/compile-fail/trait-impl-1.rs index 5e2ebc3e620d6..44b478bfb152b 100644 --- a/src/test/compile-fail/trait-impl-1.rs +++ b/src/test/compile-fail/trait-impl-1.rs @@ -21,6 +21,6 @@ impl<'a> T+'a { impl T for int {} fn main() { - let x = &42i; - x.foo(); //~ERROR: type `&int` does not implement any method in scope named `foo` + let x = &42is; + x.foo(); //~ERROR: type `&isize` does not implement any method in scope named `foo` } diff --git a/src/test/compile-fail/tuple-arity-mismatch.rs b/src/test/compile-fail/tuple-arity-mismatch.rs index d0c2faed4b29d..7f073a7bfdbba 100644 --- a/src/test/compile-fail/tuple-arity-mismatch.rs +++ b/src/test/compile-fail/tuple-arity-mismatch.rs @@ -10,12 +10,12 @@ // Issue #6155 -fn first((value, _): (int, f64)) -> int { value } +fn first((value, _): (isize, f64)) -> isize { value } fn main() { let y = first ((1,2.0,3)); //~^ ERROR expected a tuple with 2 elements, found one with 3 elements let y = first ((1,)); - //~^ ERROR expected `(int, f64)`, found `(int,)` + //~^ ERROR expected `(isize, f64)`, found `(isize,)` } diff --git a/src/test/compile-fail/tuple-index-out-of-bounds.rs b/src/test/compile-fail/tuple-index-out-of-bounds.rs index 609e34f2274b7..20dd71e3bdf44 100644 --- a/src/test/compile-fail/tuple-index-out-of-bounds.rs +++ b/src/test/compile-fail/tuple-index-out-of-bounds.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -struct Point(int, int); +struct Point(isize, isize); fn main() { let origin = Point(0, 0); @@ -16,9 +16,9 @@ fn main() { origin.1; origin.2; //~^ ERROR attempted out-of-bounds tuple index `2` on type `Point` - let tuple = (0i, 0i); + let tuple = (0is, 0is); tuple.0; tuple.1; tuple.2; - //~^ ERROR attempted out-of-bounds tuple index `2` on type `(int, int)` + //~^ ERROR attempted out-of-bounds tuple index `2` on type `(isize, isize)` } diff --git a/src/test/compile-fail/tutorial-suffix-inference-test.rs b/src/test/compile-fail/tutorial-suffix-inference-test.rs index c1be54b3f75e1..85ad302f3ed4d 100644 --- a/src/test/compile-fail/tutorial-suffix-inference-test.rs +++ b/src/test/compile-fail/tutorial-suffix-inference-test.rs @@ -21,12 +21,12 @@ fn main() { identity_u16(y); //~^ ERROR mismatched types: expected `u16`, found `i32` - let a = 3i; + let a = 3is; - fn identity_i(n: int) -> int { n } + fn identity_i(n: isize) -> int { n } identity_i(a); // ok identity_u16(a); - //~^ ERROR mismatched types: expected `u16`, found `int` + //~^ ERROR mismatched types: expected `u16`, found `isize` } diff --git a/src/test/compile-fail/type-mismatch-multiple.rs b/src/test/compile-fail/type-mismatch-multiple.rs index 74071f2866517..8b0897565fb91 100644 --- a/src/test/compile-fail/type-mismatch-multiple.rs +++ b/src/test/compile-fail/type-mismatch-multiple.rs @@ -10,6 +10,6 @@ // Checking that the compiler reports multiple type errors at once // error-pattern:mismatched types: expected `bool` -// error-pattern:mismatched types: expected `int` +// error-pattern:mismatched types: expected `isize` -fn main() { let a: bool = 1i; let b: int = true; } +fn main() { let a: bool = 1is; let b: isize = true; } diff --git a/src/test/compile-fail/typeck_type_placeholder_mismatch.rs b/src/test/compile-fail/typeck_type_placeholder_mismatch.rs index aa7b551afc56a..92740cf5082a6 100644 --- a/src/test/compile-fail/typeck_type_placeholder_mismatch.rs +++ b/src/test/compile-fail/typeck_type_placeholder_mismatch.rs @@ -18,12 +18,12 @@ pub fn main() { } fn test1() { - let x: Foo<_> = Bar::; - //~^ ERROR mismatched types: expected `Foo<_>`, found `Bar` - let y: Foo = x; + let x: Foo<_> = Bar::; + //~^ ERROR mismatched types: expected `Foo<_>`, found `Bar` + let y: Foo = x; } fn test2() { - let x: Foo<_> = Bar::; - //~^ ERROR mismatched types: expected `Foo<_>`, found `Bar` + let x: Foo<_> = Bar::; + //~^ ERROR mismatched types: expected `Foo<_>`, found `Bar` } diff --git a/src/test/compile-fail/variadic-ffi.rs b/src/test/compile-fail/variadic-ffi.rs index 17a17dcdcf8d6..702702990c244 100644 --- a/src/test/compile-fail/variadic-ffi.rs +++ b/src/test/compile-fail/variadic-ffi.rs @@ -13,24 +13,24 @@ extern "stdcall" { } extern { - fn foo(f: int, x: u8, ...); + fn foo(f: isize, x: u8, ...); } -extern "C" fn bar(f: int, x: u8) {} +extern "C" fn bar(f: isize, x: u8) {} fn main() { unsafe { foo(); //~ ERROR: this function takes at least 2 parameters but 0 parameters were supplied foo(1); //~ ERROR: this function takes at least 2 parameters but 1 parameter was supplied - let x: unsafe extern "C" fn(f: int, x: u8) = foo; - //~^ ERROR: mismatched types: expected `unsafe extern "C" fn(int, u8)` - // , found `unsafe extern "C" fn(int, u8, ...)` + let x: unsafe extern "C" fn(f: isize, x: u8) = foo; + //~^ ERROR: mismatched types: expected `unsafe extern "C" fn(isize, u8)` + // , found `unsafe extern "C" fn(isize, u8, ...)` // (expected non-variadic fn, found variadic function) - let y: unsafe extern "C" fn(f: int, x: u8, ...) = bar; - //~^ ERROR: mismatched types: expected `unsafe extern "C" fn(int, u8, ...)` - // , found `extern "C" extern fn(int, u8)` + let y: unsafe extern "C" fn(f: isize, x: u8, ...) = bar; + //~^ ERROR: mismatched types: expected `unsafe extern "C" fn(isize, u8, ...)` + // , found `extern "C" extern fn(isize, u8)` // (expected variadic fn, found non-variadic function) foo(1, 2, 3f32); //~ ERROR: can't pass an f32 to variadic function, cast to c_double diff --git a/src/test/compile-fail/warn-foreign-int-types.rs b/src/test/compile-fail/warn-foreign-int-types.rs index 5f7a2f69c4f91..9ff0f011e1dc7 100644 --- a/src/test/compile-fail/warn-foreign-int-types.rs +++ b/src/test/compile-fail/warn-foreign-int-types.rs @@ -13,9 +13,9 @@ mod xx { extern { - pub fn strlen(str: *const u8) -> uint; //~ ERROR found rust type `uint` - pub fn foo(x: int, y: uint); //~ ERROR found rust type `int` - //~^ ERROR found rust type `uint` + pub fn strlen(str: *const u8) -> usize; //~ ERROR found rust type `usize` + pub fn foo(x: isize, y: usize); //~ ERROR found rust type `isize` + //~^ ERROR found rust type `usize` } } diff --git a/src/test/debuginfo/basic-types-globals-metadata.rs b/src/test/debuginfo/basic-types-globals-metadata.rs index 4251f22b29147..e9f801c5f050e 100644 --- a/src/test/debuginfo/basic-types-globals-metadata.rs +++ b/src/test/debuginfo/basic-types-globals-metadata.rs @@ -16,7 +16,7 @@ // gdb-command:whatis 'basic-types-globals-metadata::B' // gdb-check:type = bool // gdb-command:whatis 'basic-types-globals-metadata::I' -// gdb-check:type = int +// gdb-check:type = isize // gdb-command:whatis 'basic-types-globals-metadata::C' // gdb-check:type = char // gdb-command:whatis 'basic-types-globals-metadata::I8' @@ -28,7 +28,7 @@ // gdb-command:whatis 'basic-types-globals-metadata::I64' // gdb-check:type = i64 // gdb-command:whatis 'basic-types-globals-metadata::U' -// gdb-check:type = uint +// gdb-check:type = usize // gdb-command:whatis 'basic-types-globals-metadata::U8' // gdb-check:type = u8 // gdb-command:whatis 'basic-types-globals-metadata::U16' diff --git a/src/test/debuginfo/basic-types-metadata.rs b/src/test/debuginfo/basic-types-metadata.rs index 6aa228ec51bfc..5e2497043da7a 100644 --- a/src/test/debuginfo/basic-types-metadata.rs +++ b/src/test/debuginfo/basic-types-metadata.rs @@ -18,7 +18,7 @@ // gdb-command:whatis b // gdb-check:type = bool // gdb-command:whatis i -// gdb-check:type = int +// gdb-check:type = isize // gdb-command:whatis c // gdb-check:type = char // gdb-command:whatis i8 @@ -30,7 +30,7 @@ // gdb-command:whatis i64 // gdb-check:type = i64 // gdb-command:whatis u -// gdb-check:type = uint +// gdb-check:type = usize // gdb-command:whatis u8 // gdb-check:type = u8 // gdb-command:whatis u16 @@ -53,13 +53,13 @@ fn main() { let unit: () = (); let b: bool = false; - let i: int = -1; + let i: isize = -1; let c: char = 'a'; let i8: i8 = 68; let i16: i16 = -16; let i32: i32 = -32; let i64: i64 = -64; - let u: uint = 1; + let u: usize = 1; let u8: u8 = 100; let u16: u16 = 16; let u32: u32 = 32; diff --git a/src/test/debuginfo/option-like-enum.rs b/src/test/debuginfo/option-like-enum.rs index 333ad602cf130..71c235c878cc1 100644 --- a/src/test/debuginfo/option-like-enum.rs +++ b/src/test/debuginfo/option-like-enum.rs @@ -28,13 +28,13 @@ // gdb-check:$3 = {RUST$ENCODED$ENUM$1$Empty = {454545, 0x87654321, 9988}} // gdb-command:print empty_gdb->discr -// gdb-check:$4 = (int *) 0x0 +// gdb-check:$4 = (isize *) 0x0 // gdb-command:print droid // gdb-check:$5 = {RUST$ENCODED$ENUM$2$Void = {id = 675675, range = 10000001, internals = 0x43218765}} // gdb-command:print void_droid_gdb->internals -// gdb-check:$6 = (int *) 0x0 +// gdb-check:$6 = (isize *) 0x0 // gdb-command:continue @@ -81,25 +81,25 @@ // this case (by casting the value to a memory-equivalent struct). enum MoreFields<'a> { - Full(u32, &'a int, i16), + Full(u32, &'a isize, i16), Empty } struct MoreFieldsRepr<'a> { a: u32, - discr: &'a int, + discr: &'a isize, b: i16 } enum NamedFields<'a> { - Droid { id: i32, range: i64, internals: &'a int }, + Droid { id: i32, range: i64, internals: &'a isize }, Void } struct NamedFieldsRepr<'a> { id: i32, range: i64, - internals: &'a int + internals: &'a isize } fn main() { diff --git a/src/test/debuginfo/type-names.rs b/src/test/debuginfo/type-names.rs index aac5824af0050..b508da73f4add 100644 --- a/src/test/debuginfo/type-names.rs +++ b/src/test/debuginfo/type-names.rs @@ -24,7 +24,7 @@ // gdb-check:type = struct GenericStruct // gdb-command:whatis generic_struct2 -// gdb-check:type = struct GenericStruct uint> +// gdb-check:type = struct GenericStruct usize> // gdb-command:whatis mod_struct // gdb-check:type = struct Struct2 @@ -79,22 +79,22 @@ // RAW POINTERS // gdb-command:whatis mut_ptr1 -// gdb-check:type = struct (*mut type-names::Struct1, int) +// gdb-check:type = struct (*mut type-names::Struct1, isize) // gdb-command:whatis mut_ptr2 -// gdb-check:type = struct (*mut int, int) +// gdb-check:type = struct (*mut isize, isize) // gdb-command:whatis mut_ptr3 -// gdb-check:type = struct (*mut type-names::Mod1::Mod2::Enum3, int) +// gdb-check:type = struct (*mut type-names::Mod1::Mod2::Enum3, isize) // gdb-command:whatis const_ptr1 -// gdb-check:type = struct (*const type-names::Struct1, int) +// gdb-check:type = struct (*const type-names::Struct1, isize) // gdb-command:whatis const_ptr2 -// gdb-check:type = struct (*const int, int) +// gdb-check:type = struct (*const isize, isize) // gdb-command:whatis const_ptr3 -// gdb-check:type = struct (*const type-names::Mod1::Mod2::Enum3, int) +// gdb-check:type = struct (*const type-names::Mod1::Mod2::Enum3, isize) // VECTORS @@ -102,10 +102,10 @@ // gdb-check:type = struct ([type-names::Struct1; 3], i16) // gdb-command:whatis fixed_size_vec2 -// gdb-check:type = struct ([uint; 3], i16) +// gdb-check:type = struct ([usize; 3], i16) // gdb-command:whatis slice1 -// gdb-check:type = struct &[uint] +// gdb-check:type = struct &[usize] // gdb-command:whatis slice2 // gdb-check:type = struct &[type-names::Mod1::Enum2] @@ -128,50 +128,50 @@ // gdb-check:type = struct &Trait2 // gdb-command:whatis generic_mut_ref_trait -// gdb-check:type = struct &mut Trait2> +// gdb-check:type = struct &mut Trait2> // BARE FUNCTIONS // gdb-command:whatis rust_fn -// gdb-check:type = struct (fn(core::option::Option, core::option::Option<&type-names::Mod1::Struct2>), uint) +// gdb-check:type = struct (fn(core::option::Option, core::option::Option<&type-names::Mod1::Struct2>), usize) // gdb-command:whatis extern_c_fn -// gdb-check:type = struct (extern "C" fn(int), uint) +// gdb-check:type = struct (extern "C" fn(isize), usize) // gdb-command:whatis unsafe_fn -// gdb-check:type = struct (unsafe fn(core::result::Result), uint) +// gdb-check:type = struct (unsafe fn(core::result::Result), usize) // gdb-command:whatis extern_stdcall_fn -// gdb-check:type = struct (extern "stdcall" fn(), uint) +// gdb-check:type = struct (extern "stdcall" fn(), usize) // gdb-command:whatis rust_fn_with_return_value -// gdb-check:type = struct (fn(f64) -> uint, uint) +// gdb-check:type = struct (fn(f64) -> usize, usize) // gdb-command:whatis extern_c_fn_with_return_value -// gdb-check:type = struct (extern "C" fn() -> type-names::Struct1, uint) +// gdb-check:type = struct (extern "C" fn() -> type-names::Struct1, usize) // gdb-command:whatis unsafe_fn_with_return_value -// gdb-check:type = struct (unsafe fn(type-names::GenericStruct) -> type-names::Mod1::Struct2, uint) +// gdb-check:type = struct (unsafe fn(type-names::GenericStruct) -> type-names::Mod1::Struct2, usize) // gdb-command:whatis extern_stdcall_fn_with_return_value -// gdb-check:type = struct (extern "stdcall" fn(Box) -> uint, uint) +// gdb-check:type = struct (extern "stdcall" fn(Box) -> usize, usize) // gdb-command:whatis generic_function_int -// gdb-check:type = struct (fn(int) -> int, uint) +// gdb-check:type = struct (fn(isize) -> isize, usize) // gdb-command:whatis generic_function_struct3 -// gdb-check:type = struct (fn(type-names::Mod1::Mod2::Struct3) -> type-names::Mod1::Mod2::Struct3, uint) +// gdb-check:type = struct (fn(type-names::Mod1::Mod2::Struct3) -> type-names::Mod1::Mod2::Struct3, usize) // gdb-command:whatis variadic_function -// gdb-check:type = struct (unsafe extern "C" fn(*const u8, ...) -> int, uint) +// gdb-check:type = struct (unsafe extern "C" fn(*const u8, ...) -> isize, usize) // CLOSURES // gdb-command:whatis closure1 -// gdb-check:type = struct (closure, uint) +// gdb-check:type = struct (closure, usize) // gdb-command:whatis closure2 -// gdb-check:type = struct (closure, uint) +// gdb-check:type = struct (closure, usize) #![omit_gdb_pretty_printer_section] @@ -183,7 +183,7 @@ struct GenericStruct; enum Enum1 { Variant1_1, - Variant1_2(int) + Variant1_2(isize) } mod Mod1 { @@ -209,23 +209,23 @@ mod Mod1 { trait Trait1 { } trait Trait2 { } -impl Trait1 for int {} -impl Trait2 for int {} +impl Trait1 for isize {} +impl Trait2 for isize {} -fn rust_fn(_: Option, _: Option<&Mod1::Struct2>) {} -extern "C" fn extern_c_fn(_: int) {} +fn rust_fn(_: Option, _: Option<&Mod1::Struct2>) {} +extern "C" fn extern_c_fn(_: isize) {} unsafe fn unsafe_fn(_: Result) {} extern "stdcall" fn extern_stdcall_fn() {} -fn rust_fn_with_return_value(_: f64) -> uint { 4 } +fn rust_fn_with_return_value(_: f64) -> usize { 4 } extern "C" fn extern_c_fn_with_return_value() -> Struct1 { Struct1 } unsafe fn unsafe_fn_with_return_value(_: GenericStruct) -> Mod1::Struct2 { Mod1::Struct2 } -extern "stdcall" fn extern_stdcall_fn_with_return_value(_: Box) -> uint { 0 } +extern "stdcall" fn extern_stdcall_fn_with_return_value(_: Box) -> usize { 0 } fn generic_function(x: T) -> T { x } extern { - fn printf(_:*const u8, ...) -> int; + fn printf(_:*const u8, ...) -> isize; } // In many of the cases below, the type that is actually under test is wrapped @@ -240,7 +240,7 @@ fn main() { // Structs let simple_struct = Struct1; let generic_struct1: GenericStruct = GenericStruct; - let generic_struct2: GenericStruct uint> = GenericStruct; + let generic_struct2: GenericStruct usize> = GenericStruct; let mod_struct = Mod1::Struct2; // Enums @@ -269,13 +269,13 @@ fn main() { let mut_ref2 = (&mut mut_generic_struct, 0i32); // Raw Pointers - let mut_ptr1: (*mut Struct1, int) = (ptr::null_mut(), 0); - let mut_ptr2: (*mut int, int) = (ptr::null_mut(), 0); - let mut_ptr3: (*mut Mod1::Mod2::Enum3, int) = (ptr::null_mut(), 0); + let mut_ptr1: (*mut Struct1, isize) = (ptr::null_mut(), 0); + let mut_ptr2: (*mut isize, isize) = (ptr::null_mut(), 0); + let mut_ptr3: (*mut Mod1::Mod2::Enum3, isize) = (ptr::null_mut(), 0); - let const_ptr1: (*const Struct1, int) = (ptr::null(), 0); - let const_ptr2: (*const int, int) = (ptr::null(), 0); - let const_ptr3: (*const Mod1::Mod2::Enum3, int) = (ptr::null(), 0); + let const_ptr1: (*const Struct1, isize) = (ptr::null(), 0); + let const_ptr2: (*const isize, isize) = (ptr::null(), 0); + let const_ptr3: (*const Mod1::Mod2::Enum3, isize) = (ptr::null(), 0); // Vectors let fixed_size_vec1 = ([Struct1, Struct1, Struct1], 0i16); @@ -297,7 +297,7 @@ fn main() { let mut generic_mut_ref_trait_impl = 0i; let generic_mut_ref_trait = (&mut generic_mut_ref_trait_impl) as - &mut Trait2>; + &mut Trait2>; // Bare Functions let rust_fn = (rust_fn, 0u); @@ -310,7 +310,7 @@ fn main() { let unsafe_fn_with_return_value = (unsafe_fn_with_return_value, 0u); let extern_stdcall_fn_with_return_value = (extern_stdcall_fn_with_return_value, 0u); - let generic_function_int = (generic_function::, 0u); + let generic_function_int = (generic_function::, 0u); let generic_function_struct3 = (generic_function::, 0u); let variadic_function = (printf, 0u); @@ -321,7 +321,7 @@ fn main() { // how that maps to rustc's internal representation of these forms. // Once closures have reached their 1.0 form, the tests below should // probably be expanded. - let closure1 = (|&: x:int| {}, 0u); + let closure1 = (|&: x:isize| {}, 0u); let closure2 = (|&: x:i8, y: f32| { (x as f32) + y }, 0u); zzz(); // #break diff --git a/src/test/pretty/issue-4264.pp b/src/test/pretty/issue-4264.pp index 500305f597075..f20087ef677f2 100644 --- a/src/test/pretty/issue-4264.pp +++ b/src/test/pretty/issue-4264.pp @@ -20,18 +20,18 @@ // #4264 fixed-length vector types -pub fn foo(_: [int; (3 as uint)]) { } +pub fn foo(_: [isize; (3 as usize)]) { } pub fn bar() { - const FOO: uint = ((5u as uint) - (4u as uint) as uint); - let _: [(); (FOO as uint)] = ([(() as ())] as [(); 1]); + const FOO: usize = ((5us as usize) - (4us as usize) as usize); + let _: [(); (FOO as usize)] = ([(() as ())] as [(); 1]); - let _: [(); (1u as uint)] = ([(() as ())] as [(); 1]); + let _: [(); (1us as usize)] = ([(() as ())] as [(); 1]); let _ = - (((&((([(1i as int), (2 as int), (3 as int)] as [int; 3])) as - [int; 3]) as &[int; 3]) as *const _ as *const [int; 3]) as - *const [int; (3u as uint)] as *const [int; 3]); + (((&((([(1is as isize), (2 as isize), (3 as isize)] as [isize; 3])) as + [isize; 3]) as &[isize; 3]) as *const _ as *const [isize; 3]) + as *const [isize; (3us as usize)] as *const [isize; 3]); @@ -81,18 +81,19 @@ core::fmt::Arguments<'_>)) as collections::string::String); } -pub type Foo = [int; (3u as uint)]; +pub type Foo = [isize; (3us as usize)]; pub struct Bar { - pub x: [int; (3u as uint)], + pub x: [isize; (3us as usize)], } -pub struct TupleBar([int; (4u as uint)]); -pub enum Baz { BazVariant([int; (5u as uint)]), } +pub struct TupleBar([isize; (4us as usize)]); +pub enum Baz { BazVariant([isize; (5us as usize)]), } pub fn id(x: T) -> T { (x as T) } pub fn use_id() { let _ = - ((id::<[int; (3u as uint)]> as - fn([int; 3]) -> [int; 3] {id})(([(1 as int), (2 as int), - (3 as int)] as [int; 3])) as - [int; 3]); + ((id::<[isize; (3us as usize)]> as + fn([isize; 3]) -> [isize; 3] {id})(([(1 as isize), (2 as isize), + (3 as isize)] as + [isize; 3])) as + [isize; 3]); } fn main() { } diff --git a/src/test/pretty/issue-4264.rs b/src/test/pretty/issue-4264.rs index b481e109e1a3d..75be2f23c2b20 100644 --- a/src/test/pretty/issue-4264.rs +++ b/src/test/pretty/issue-4264.rs @@ -14,35 +14,35 @@ // #4264 fixed-length vector types -pub fn foo(_: [int; 3]) {} +pub fn foo(_: [isize; 3]) {} pub fn bar() { - const FOO: uint = 5u - 4u; + const FOO: usize = 5us - 4us; let _: [(); FOO] = [()]; - let _ : [(); 1u] = [()]; + let _ : [(); 1us] = [()]; - let _ = &([1i,2,3]) as *const _ as *const [int; 3u]; + let _ = &([1is,2,3]) as *const _ as *const [isize; 3us]; format!("test"); } -pub type Foo = [int; 3u]; +pub type Foo = [isize; 3us]; pub struct Bar { - pub x: [int; 3u] + pub x: [isize; 3us] } -pub struct TupleBar([int; 4u]); +pub struct TupleBar([isize; 4us]); pub enum Baz { - BazVariant([int; 5u]) + BazVariant([isize; 5us]) } pub fn id(x: T) -> T { x } pub fn use_id() { - let _ = id::<[int; 3u]>([1,2,3]); + let _ = id::<[isize; 3us]>([1,2,3]); } diff --git a/src/test/run-make/graphviz-flowgraph/f01.dot-expected.dot b/src/test/run-make/graphviz-flowgraph/f01.dot-expected.dot index c5455ab90dc8b..694a06ed83a6f 100644 --- a/src/test/run-make/graphviz-flowgraph/f01.dot-expected.dot +++ b/src/test/run-make/graphviz-flowgraph/f01.dot-expected.dot @@ -1,9 +1,9 @@ digraph block { N0[label="entry"]; N1[label="exit"]; - N2[label="expr 1i"]; - N3[label="stmt 1i;"]; - N4[label="block { 1i; }"]; + N2[label="expr 1is"]; + N3[label="stmt 1is;"]; + N4[label="block { 1is; }"]; N0 -> N2; N2 -> N3; N3 -> N4; diff --git a/src/test/run-make/graphviz-flowgraph/f03.dot-expected.dot b/src/test/run-make/graphviz-flowgraph/f03.dot-expected.dot index 1986c27ad439b..efa2c6404a25f 100644 --- a/src/test/run-make/graphviz-flowgraph/f03.dot-expected.dot +++ b/src/test/run-make/graphviz-flowgraph/f03.dot-expected.dot @@ -1,11 +1,11 @@ digraph block { N0[label="entry"]; N1[label="exit"]; - N2[label="expr 3i"]; + N2[label="expr 3is"]; N3[label="expr 4"]; - N4[label="expr 3i + 4"]; - N5[label="stmt 3i + 4;"]; - N6[label="block { 3i + 4; }"]; + N4[label="expr 3is + 4"]; + N5[label="stmt 3is + 4;"]; + N6[label="block { 3is + 4; }"]; N0 -> N2; N2 -> N3; N3 -> N4; diff --git a/src/test/run-make/graphviz-flowgraph/f04.dot-expected.dot b/src/test/run-make/graphviz-flowgraph/f04.dot-expected.dot index 82cdcb39fbfd4..1f375b767ce49 100644 --- a/src/test/run-make/graphviz-flowgraph/f04.dot-expected.dot +++ b/src/test/run-make/graphviz-flowgraph/f04.dot-expected.dot @@ -1,10 +1,10 @@ digraph block { N0[label="entry"]; N1[label="exit"]; - N2[label="expr 4i"]; + N2[label="expr 4is"]; N3[label="local _x"]; - N4[label="stmt let _x = 4i;"]; - N5[label="block { let _x = 4i; }"]; + N4[label="stmt let _x = 4is;"]; + N5[label="block { let _x = 4is; }"]; N0 -> N2; N2 -> N3; N3 -> N4; diff --git a/src/test/run-make/graphviz-flowgraph/f05.dot-expected.dot b/src/test/run-make/graphviz-flowgraph/f05.dot-expected.dot index 8a27d536ffc80..8c9a930098aa6 100644 --- a/src/test/run-make/graphviz-flowgraph/f05.dot-expected.dot +++ b/src/test/run-make/graphviz-flowgraph/f05.dot-expected.dot @@ -1,14 +1,14 @@ digraph block { N0[label="entry"]; N1[label="exit"]; - N2[label="expr 5i"]; - N3[label="expr 55i"]; - N4[label="expr (5i, 55i)"]; + N2[label="expr 5is"]; + N3[label="expr 55is"]; + N4[label="expr (5is, 55is)"]; N5[label="local _x"]; N6[label="local _y"]; N7[label="pat (_x, _y)"]; - N8[label="stmt let (_x, _y) = (5i, 55i);"]; - N9[label="block { let (_x, _y) = (5i, 55i); }"]; + N8[label="stmt let (_x, _y) = (5is, 55is);"]; + N9[label="block { let (_x, _y) = (5is, 55is); }"]; N0 -> N2; N2 -> N3; N3 -> N4; diff --git a/src/test/run-make/graphviz-flowgraph/f07.dot-expected.dot b/src/test/run-make/graphviz-flowgraph/f07.dot-expected.dot index 4c6383324e5f9..da7d5759b7ede 100644 --- a/src/test/run-make/graphviz-flowgraph/f07.dot-expected.dot +++ b/src/test/run-make/graphviz-flowgraph/f07.dot-expected.dot @@ -1,12 +1,12 @@ digraph block { N0[label="entry"]; N1[label="exit"]; - N2[label="expr 7i"]; - N3[label="expr 77i"]; - N4[label="expr 777i"]; - N5[label="expr 7777i"]; - N6[label="expr [7i, 77i, 777i, 7777i]"]; - N7[label="expr match [7i, 77i, 777i, 7777i] { [x, y, ..] => x + y, }"]; + N2[label="expr 7is"]; + N3[label="expr 77is"]; + N4[label="expr 777is"]; + N5[label="expr 7777is"]; + N6[label="expr [7is, 77is, 777is, 7777is]"]; + N7[label="expr match [7is, 77is, 777is, 7777is] { [x, y, ..] => x + y, }"]; N8[label="(dummy_node)"]; N9[label="local x"]; N10[label="local y"]; @@ -15,8 +15,8 @@ digraph block { N13[label="expr x"]; N14[label="expr y"]; N15[label="expr x + y"]; - N16[label="stmt match [7i, 77i, 777i, 7777i] { [x, y, ..] => x + y, };"]; - N17[label="block { match [7i, 77i, 777i, 7777i] { [x, y, ..] => x + y, }; }"]; + N16[label="stmt match [7is, 77is, 777is, 7777is] { [x, y, ..] => x + y, };"]; + N17[label="block { match [7is, 77is, 777is, 7777is] { [x, y, ..] => x + y, }; }"]; N0 -> N2; N2 -> N3; N3 -> N4; diff --git a/src/test/run-make/graphviz-flowgraph/f08.dot-expected.dot b/src/test/run-make/graphviz-flowgraph/f08.dot-expected.dot index 27a240ed18255..ac1972424dc95 100644 --- a/src/test/run-make/graphviz-flowgraph/f08.dot-expected.dot +++ b/src/test/run-make/graphviz-flowgraph/f08.dot-expected.dot @@ -1,21 +1,21 @@ digraph block { N0[label="entry"]; N1[label="exit"]; - N2[label="expr 8i"]; + N2[label="expr 8is"]; N3[label="local x"]; - N4[label="stmt let x = 8i;"]; + N4[label="stmt let x = 8is;"]; N5[label="local _y"]; N6[label="stmt let _y;"]; N7[label="expr x"]; - N8[label="expr 88i"]; - N9[label="expr x > 88i"]; - N10[label="expr 888i"]; + N8[label="expr 88is"]; + N9[label="expr x > 88is"]; + N10[label="expr 888is"]; N11[label="expr _y"]; - N12[label="expr _y = 888i"]; - N13[label="stmt _y = 888i;"]; - N14[label="block { _y = 888i; }"]; - N15[label="expr if x > 88i { _y = 888i; }"]; - N16[label="block { let x = 8i; let _y; if x > 88i { _y = 888i; } }"]; + N12[label="expr _y = 888is"]; + N13[label="stmt _y = 888is;"]; + N14[label="block { _y = 888is; }"]; + N15[label="expr if x > 88is { _y = 888is; }"]; + N16[label="block { let x = 8is; let _y; if x > 88is { _y = 888is; } }"]; N0 -> N2; N2 -> N3; N3 -> N4; diff --git a/src/test/run-make/graphviz-flowgraph/f09.dot-expected.dot b/src/test/run-make/graphviz-flowgraph/f09.dot-expected.dot index d2c58c6d59aeb..0dc3ff14fba75 100644 --- a/src/test/run-make/graphviz-flowgraph/f09.dot-expected.dot +++ b/src/test/run-make/graphviz-flowgraph/f09.dot-expected.dot @@ -1,29 +1,29 @@ digraph block { N0[label="entry"]; N1[label="exit"]; - N2[label="expr 91i"]; + N2[label="expr 91is"]; N3[label="local x"]; - N4[label="stmt let x = 91i;"]; + N4[label="stmt let x = 91is;"]; N5[label="local _y"]; N6[label="stmt let _y;"]; N7[label="expr x"]; - N8[label="expr 92i"]; - N9[label="expr x > 92i"]; - N10[label="expr 93i"]; + N8[label="expr 92is"]; + N9[label="expr x > 92is"]; + N10[label="expr 93is"]; N11[label="expr _y"]; - N12[label="expr _y = 93i"]; - N13[label="stmt _y = 93i;"]; - N14[label="block { _y = 93i; }"]; - N15[label="expr 94i"]; - N16[label="expr 95i"]; - N17[label="expr 94i + 95i"]; + N12[label="expr _y = 93is"]; + N13[label="stmt _y = 93is;"]; + N14[label="block { _y = 93is; }"]; + N15[label="expr 94is"]; + N16[label="expr 95is"]; + N17[label="expr 94is + 95is"]; N18[label="expr _y"]; - N19[label="expr _y = 94i + 95i"]; - N20[label="stmt _y = 94i + 95i;"]; - N21[label="block { _y = 94i + 95i; }"]; - N22[label="expr { _y = 94i + 95i; }"]; - N23[label="expr if x > 92i { _y = 93i; } else { _y = 94i + 95i; }"]; - N24[label="block { let x = 91i; let _y; if x > 92i { _y = 93i; } else { _y = 94i + 95i; } }"]; + N19[label="expr _y = 94is + 95is"]; + N20[label="stmt _y = 94is + 95is;"]; + N21[label="block { _y = 94is + 95is; }"]; + N22[label="expr { _y = 94is + 95is; }"]; + N23[label="expr if x > 92is { _y = 93is; } else { _y = 94is + 95is; }"]; + N24[label="block {\l let x = 91is;\l let _y;\l if x > 92is { _y = 93is; } else { _y = 94is + 95is; }\l}\l"]; N0 -> N2; N2 -> N3; N3 -> N4; diff --git a/src/test/run-make/graphviz-flowgraph/f09.rs b/src/test/run-make/graphviz-flowgraph/f09.rs index cfe5f4f37d60f..184772e7d5166 100644 --- a/src/test/run-make/graphviz-flowgraph/f09.rs +++ b/src/test/run-make/graphviz-flowgraph/f09.rs @@ -9,10 +9,10 @@ // except according to those terms. pub fn expr_if_twoarm_9() { - let x = 91i; let _y; - if x > 92i { - _y = 93i; + let x = 91is; let _y; + if x > 92is { + _y = 93is; } else { - _y = 94i+95i; + _y = 94is+95is; } } diff --git a/src/test/run-make/graphviz-flowgraph/f10.dot-expected.dot b/src/test/run-make/graphviz-flowgraph/f10.dot-expected.dot index 421a79fd136b3..37606ddac70f7 100644 --- a/src/test/run-make/graphviz-flowgraph/f10.dot-expected.dot +++ b/src/test/run-make/graphviz-flowgraph/f10.dot-expected.dot @@ -1,20 +1,20 @@ digraph block { N0[label="entry"]; N1[label="exit"]; - N2[label="expr 10i"]; + N2[label="expr 10is"]; N3[label="local mut x"]; - N4[label="stmt let mut x = 10i;"]; + N4[label="stmt let mut x = 10is;"]; N5[label="(dummy_node)"]; N6[label="expr x"]; - N7[label="expr 0i"]; - N8[label="expr x > 0i"]; - N9[label="expr while x > 0i { x -= 1i; }"]; - N10[label="expr 1i"]; + N7[label="expr 0is"]; + N8[label="expr x > 0is"]; + N9[label="expr while x > 0is { x -= 1is; }"]; + N10[label="expr 1is"]; N11[label="expr x"]; - N12[label="expr x -= 1i"]; - N13[label="stmt x -= 1i;"]; - N14[label="block { x -= 1i; }"]; - N15[label="block { let mut x = 10i; while x > 0i { x -= 1i; } }"]; + N12[label="expr x -= 1is"]; + N13[label="stmt x -= 1is;"]; + N14[label="block { x -= 1is; }"]; + N15[label="block { let mut x = 10is; while x > 0is { x -= 1is; } }"]; N0 -> N2; N2 -> N3; N3 -> N4; diff --git a/src/test/run-make/graphviz-flowgraph/f11.dot-expected.dot b/src/test/run-make/graphviz-flowgraph/f11.dot-expected.dot index b928058fed99c..39a55f1a0926b 100644 --- a/src/test/run-make/graphviz-flowgraph/f11.dot-expected.dot +++ b/src/test/run-make/graphviz-flowgraph/f11.dot-expected.dot @@ -1,20 +1,20 @@ digraph block { N0[label="entry"]; N1[label="exit"]; - N2[label="expr 11i"]; + N2[label="expr 11is"]; N3[label="local mut _x"]; - N4[label="stmt let mut _x = 11i;"]; + N4[label="stmt let mut _x = 11is;"]; N5[label="(dummy_node)"]; - N6[label="expr loop { _x -= 1i; }"]; - N7[label="expr 1i"]; + N6[label="expr loop { _x -= 1is; }"]; + N7[label="expr 1is"]; N8[label="expr _x"]; - N9[label="expr _x -= 1i"]; - N10[label="stmt _x -= 1i;"]; - N11[label="block { _x -= 1i; }"]; - N12[label="stmt loop { _x -= 1i; }"]; + N9[label="expr _x -= 1is"]; + N10[label="stmt _x -= 1is;"]; + N11[label="block { _x -= 1is; }"]; + N12[label="stmt loop { _x -= 1is; }"]; N13[label="expr \"unreachable\""]; N14[label="stmt \"unreachable\";"]; - N15[label="block { let mut _x = 11i; loop { _x -= 1i; } \"unreachable\"; }"]; + N15[label="block { let mut _x = 11is; loop { _x -= 1is; } \"unreachable\"; }"]; N0 -> N2; N2 -> N3; N3 -> N4; diff --git a/src/test/run-make/graphviz-flowgraph/f12.dot-expected.dot b/src/test/run-make/graphviz-flowgraph/f12.dot-expected.dot index d89a37308de06..e9cd07c0356f8 100644 --- a/src/test/run-make/graphviz-flowgraph/f12.dot-expected.dot +++ b/src/test/run-make/graphviz-flowgraph/f12.dot-expected.dot @@ -1,27 +1,27 @@ digraph block { N0[label="entry"]; N1[label="exit"]; - N2[label="expr 12i"]; + N2[label="expr 12is"]; N3[label="local mut x"]; - N4[label="stmt let mut x = 12i;"]; + N4[label="stmt let mut x = 12is;"]; N5[label="(dummy_node)"]; - N6[label="expr loop { x -= 1i; if x == 2i { break ; \"unreachable\"; } }"]; - N7[label="expr 1i"]; + N6[label="expr loop { x -= 1is; if x == 2is { break ; \"unreachable\"; } }"]; + N7[label="expr 1is"]; N8[label="expr x"]; - N9[label="expr x -= 1i"]; - N10[label="stmt x -= 1i;"]; + N9[label="expr x -= 1is"]; + N10[label="stmt x -= 1is;"]; N11[label="expr x"]; - N12[label="expr 2i"]; - N13[label="expr x == 2i"]; + N12[label="expr 2is"]; + N13[label="expr x == 2is"]; N14[label="expr break"]; N15[label="(dummy_node)"]; N16[label="stmt break ;"]; N17[label="expr \"unreachable\""]; N18[label="stmt \"unreachable\";"]; N19[label="block { break ; \"unreachable\"; }"]; - N20[label="expr if x == 2i { break ; \"unreachable\"; }"]; - N21[label="block { x -= 1i; if x == 2i { break ; \"unreachable\"; } }"]; - N22[label="block { let mut x = 12i; loop { x -= 1i; if x == 2i { break ; \"unreachable\"; } } }"]; + N20[label="expr if x == 2is { break ; \"unreachable\"; }"]; + N21[label="block { x -= 1is; if x == 2is { break ; \"unreachable\"; } }"]; + N22[label="block {\l let mut x = 12is;\l loop { x -= 1is; if x == 2is { break ; \"unreachable\"; } }\l}\l"]; N0 -> N2; N2 -> N3; N3 -> N4; @@ -34,7 +34,7 @@ digraph block { N11 -> N12; N12 -> N13; N13 -> N14; - N14 -> N6[label="exiting scope_0 expr break,\lexiting scope_1 stmt break ;,\lexiting scope_2 block { break ; \"unreachable\"; },\lexiting scope_3 expr if x == 2i { break ; \"unreachable\"; },\lexiting scope_4 block { x -= 1i; if x == 2i { break ; \"unreachable\"; } }"]; + N14 -> N6[label="exiting scope_0 expr break,\lexiting scope_1 stmt break ;,\lexiting scope_2 block { break ; \"unreachable\"; },\lexiting scope_3 expr if x == 2is { break ; \"unreachable\"; },\lexiting scope_4 block { x -= 1is; if x == 2is { break ; \"unreachable\"; } }"]; N15 -> N16; N16 -> N17; N17 -> N18; diff --git a/src/test/run-make/graphviz-flowgraph/f14.dot-expected.dot b/src/test/run-make/graphviz-flowgraph/f14.dot-expected.dot index bdb2c133badf8..ac1a631eb56ed 100644 --- a/src/test/run-make/graphviz-flowgraph/f14.dot-expected.dot +++ b/src/test/run-make/graphviz-flowgraph/f14.dot-expected.dot @@ -1,20 +1,20 @@ digraph block { N0[label="entry"]; N1[label="exit"]; - N2[label="expr 14i"]; + N2[label="expr 14is"]; N3[label="local x"]; - N4[label="stmt let x = 14i;"]; + N4[label="stmt let x = 14is;"]; N5[label="expr x"]; - N6[label="expr 1i"]; - N7[label="expr x > 1i"]; + N6[label="expr 1is"]; + N7[label="expr x > 1is"]; N8[label="expr return"]; N9[label="(dummy_node)"]; N10[label="stmt return;"]; N11[label="expr \"unreachable\""]; N12[label="stmt \"unreachable\";"]; N13[label="block { return; \"unreachable\"; }"]; - N14[label="expr if x > 1i { return; \"unreachable\"; }"]; - N15[label="block { let x = 14i; if x > 1i { return; \"unreachable\"; } }"]; + N14[label="expr if x > 1is { return; \"unreachable\"; }"]; + N15[label="block { let x = 14is; if x > 1is { return; \"unreachable\"; } }"]; N0 -> N2; N2 -> N3; N3 -> N4; diff --git a/src/test/run-make/graphviz-flowgraph/f15.dot-expected.dot b/src/test/run-make/graphviz-flowgraph/f15.dot-expected.dot index 4bd9fc9ec1ad1..7b01c606083ff 100644 --- a/src/test/run-make/graphviz-flowgraph/f15.dot-expected.dot +++ b/src/test/run-make/graphviz-flowgraph/f15.dot-expected.dot @@ -1,54 +1,54 @@ digraph block { N0[label="entry"]; N1[label="exit"]; - N2[label="expr 15i"]; + N2[label="expr 15is"]; N3[label="local mut x"]; - N4[label="stmt let mut x = 15i;"]; - N5[label="expr 151i"]; + N4[label="stmt let mut x = 15is;"]; + N5[label="expr 151is"]; N6[label="local mut y"]; - N7[label="stmt let mut y = 151i;"]; + N7[label="stmt let mut y = 151is;"]; N8[label="(dummy_node)"]; - N9[label="expr \'outer:\l loop {\l \'inner:\l loop {\l if x == 1i { break \'outer ; \"unreachable\"; }\l if y >= 2i { break ; \"unreachable\"; }\l y -= 3i;\l }\l y -= 4i;\l x -= 5i;\l }\l"]; + N9[label="expr \'outer:\l loop {\l \'inner:\l loop {\l if x == 1is { break \'outer ; \"unreachable\"; }\l if y >= 2is { break ; \"unreachable\"; }\l y -= 3is;\l }\l y -= 4is;\l x -= 5is;\l }\l"]; N10[label="(dummy_node)"]; - N11[label="expr \'inner:\l loop {\l if x == 1i { break \'outer ; \"unreachable\"; }\l if y >= 2i { break ; \"unreachable\"; }\l y -= 3i;\l }\l"]; + N11[label="expr \'inner:\l loop {\l if x == 1is { break \'outer ; \"unreachable\"; }\l if y >= 2is { break ; \"unreachable\"; }\l y -= 3is;\l }\l"]; N12[label="expr x"]; - N13[label="expr 1i"]; - N14[label="expr x == 1i"]; + N13[label="expr 1is"]; + N14[label="expr x == 1is"]; N15[label="expr break \'outer"]; N16[label="(dummy_node)"]; N17[label="stmt break \'outer ;"]; N18[label="expr \"unreachable\""]; N19[label="stmt \"unreachable\";"]; N20[label="block { break \'outer ; \"unreachable\"; }"]; - N21[label="expr if x == 1i { break \'outer ; \"unreachable\"; }"]; - N22[label="stmt if x == 1i { break \'outer ; \"unreachable\"; }"]; + N21[label="expr if x == 1is { break \'outer ; \"unreachable\"; }"]; + N22[label="stmt if x == 1is { break \'outer ; \"unreachable\"; }"]; N23[label="expr y"]; - N24[label="expr 2i"]; - N25[label="expr y >= 2i"]; + N24[label="expr 2is"]; + N25[label="expr y >= 2is"]; N26[label="expr break"]; N27[label="(dummy_node)"]; N28[label="stmt break ;"]; N29[label="expr \"unreachable\""]; N30[label="stmt \"unreachable\";"]; N31[label="block { break ; \"unreachable\"; }"]; - N32[label="expr if y >= 2i { break ; \"unreachable\"; }"]; - N33[label="stmt if y >= 2i { break ; \"unreachable\"; }"]; - N34[label="expr 3i"]; + N32[label="expr if y >= 2is { break ; \"unreachable\"; }"]; + N33[label="stmt if y >= 2is { break ; \"unreachable\"; }"]; + N34[label="expr 3is"]; N35[label="expr y"]; - N36[label="expr y -= 3i"]; - N37[label="stmt y -= 3i;"]; - N38[label="block {\l if x == 1i { break \'outer ; \"unreachable\"; }\l if y >= 2i { break ; \"unreachable\"; }\l y -= 3i;\l}\l"]; - N39[label="stmt \'inner:\l loop {\l if x == 1i { break \'outer ; \"unreachable\"; }\l if y >= 2i { break ; \"unreachable\"; }\l y -= 3i;\l }\l"]; - N40[label="expr 4i"]; + N36[label="expr y -= 3is"]; + N37[label="stmt y -= 3is;"]; + N38[label="block {\l if x == 1is { break \'outer ; \"unreachable\"; }\l if y >= 2is { break ; \"unreachable\"; }\l y -= 3is;\l}\l"]; + N39[label="stmt \'inner:\l loop {\l if x == 1is { break \'outer ; \"unreachable\"; }\l if y >= 2is { break ; \"unreachable\"; }\l y -= 3is;\l }\l"]; + N40[label="expr 4is"]; N41[label="expr y"]; - N42[label="expr y -= 4i"]; - N43[label="stmt y -= 4i;"]; - N44[label="expr 5i"]; + N42[label="expr y -= 4is"]; + N43[label="stmt y -= 4is;"]; + N44[label="expr 5is"]; N45[label="expr x"]; - N46[label="expr x -= 5i"]; - N47[label="stmt x -= 5i;"]; - N48[label="block {\l \'inner:\l loop {\l if x == 1i { break \'outer ; \"unreachable\"; }\l if y >= 2i { break ; \"unreachable\"; }\l y -= 3i;\l }\l y -= 4i;\l x -= 5i;\l}\l"]; - N49[label="block {\l let mut x = 15i;\l let mut y = 151i;\l \'outer:\l loop {\l \'inner:\l loop {\l if x == 1i { break \'outer ; \"unreachable\"; }\l if y >= 2i { break ; \"unreachable\"; }\l y -= 3i;\l }\l y -= 4i;\l x -= 5i;\l }\l}\l"]; + N46[label="expr x -= 5is"]; + N47[label="stmt x -= 5is;"]; + N48[label="block {\l \'inner:\l loop {\l if x == 1is { break \'outer ; \"unreachable\"; }\l if y >= 2is { break ; \"unreachable\"; }\l y -= 3is;\l }\l y -= 4is;\l x -= 5is;\l}\l"]; + N49[label="block {\l let mut x = 15is;\l let mut y = 151is;\l \'outer:\l loop {\l \'inner:\l loop {\l if x == 1is { break \'outer ; \"unreachable\"; }\l if y >= 2is { break ; \"unreachable\"; }\l y -= 3is;\l }\l y -= 4is;\l x -= 5is;\l }\l}\l"]; N0 -> N2; N2 -> N3; N3 -> N4; @@ -61,7 +61,7 @@ digraph block { N12 -> N13; N13 -> N14; N14 -> N15; - N15 -> N9[label="exiting scope_0 expr break \'outer,\lexiting scope_1 stmt break \'outer ;,\lexiting scope_2 block { break \'outer ; \"unreachable\"; },\lexiting scope_3 expr if x == 1i { break \'outer ; \"unreachable\"; },\lexiting scope_4 stmt if x == 1i { break \'outer ; \"unreachable\"; },\lexiting scope_5 block {\l if x == 1i { break \'outer ; \"unreachable\"; }\l if y >= 2i { break ; \"unreachable\"; }\l y -= 3i;\l}\l,\lexiting scope_6 expr \'inner:\l loop {\l if x == 1i { break \'outer ; \"unreachable\"; }\l if y >= 2i { break ; \"unreachable\"; }\l y -= 3i;\l }\l,\lexiting scope_7 stmt \'inner:\l loop {\l if x == 1i { break \'outer ; \"unreachable\"; }\l if y >= 2i { break ; \"unreachable\"; }\l y -= 3i;\l }\l,\lexiting scope_8 block {\l \'inner:\l loop {\l if x == 1i { break \'outer ; \"unreachable\"; }\l if y >= 2i { break ; \"unreachable\"; }\l y -= 3i;\l }\l y -= 4i;\l x -= 5i;\l}\l"]; + N15 -> N9[label="exiting scope_0 expr break \'outer,\lexiting scope_1 stmt break \'outer ;,\lexiting scope_2 block { break \'outer ; \"unreachable\"; },\lexiting scope_3 expr if x == 1is { break \'outer ; \"unreachable\"; },\lexiting scope_4 stmt if x == 1is { break \'outer ; \"unreachable\"; },\lexiting scope_5 block {\l if x == 1is { break \'outer ; \"unreachable\"; }\l if y >= 2is { break ; \"unreachable\"; }\l y -= 3is;\l}\l,\lexiting scope_6 expr \'inner:\l loop {\l if x == 1is { break \'outer ; \"unreachable\"; }\l if y >= 2is { break ; \"unreachable\"; }\l y -= 3is;\l }\l,\lexiting scope_7 stmt \'inner:\l loop {\l if x == 1is { break \'outer ; \"unreachable\"; }\l if y >= 2is { break ; \"unreachable\"; }\l y -= 3is;\l }\l,\lexiting scope_8 block {\l \'inner:\l loop {\l if x == 1is { break \'outer ; \"unreachable\"; }\l if y >= 2is { break ; \"unreachable\"; }\l y -= 3is;\l }\l y -= 4is;\l x -= 5is;\l}\l"]; N16 -> N17; N17 -> N18; N18 -> N19; @@ -73,7 +73,7 @@ digraph block { N23 -> N24; N24 -> N25; N25 -> N26; - N26 -> N11[label="exiting scope_0 expr break,\lexiting scope_1 stmt break ;,\lexiting scope_2 block { break ; \"unreachable\"; },\lexiting scope_3 expr if y >= 2i { break ; \"unreachable\"; },\lexiting scope_4 stmt if y >= 2i { break ; \"unreachable\"; },\lexiting scope_5 block {\l if x == 1i { break \'outer ; \"unreachable\"; }\l if y >= 2i { break ; \"unreachable\"; }\l y -= 3i;\l}\l"]; + N26 -> N11[label="exiting scope_0 expr break,\lexiting scope_1 stmt break ;,\lexiting scope_2 block { break ; \"unreachable\"; },\lexiting scope_3 expr if y >= 2is { break ; \"unreachable\"; },\lexiting scope_4 stmt if y >= 2is { break ; \"unreachable\"; },\lexiting scope_5 block {\l if x == 1is { break \'outer ; \"unreachable\"; }\l if y >= 2is { break ; \"unreachable\"; }\l y -= 3is;\l}\l"]; N27 -> N28; N28 -> N29; N29 -> N30; diff --git a/src/test/run-make/graphviz-flowgraph/f16.dot-expected.dot b/src/test/run-make/graphviz-flowgraph/f16.dot-expected.dot index 16b871bd844bf..2123185a08386 100644 --- a/src/test/run-make/graphviz-flowgraph/f16.dot-expected.dot +++ b/src/test/run-make/graphviz-flowgraph/f16.dot-expected.dot @@ -1,57 +1,57 @@ digraph block { N0[label="entry"]; N1[label="exit"]; - N2[label="expr 16i"]; + N2[label="expr 16is"]; N3[label="local mut x"]; - N4[label="stmt let mut x = 16i;"]; - N5[label="expr 16i"]; + N4[label="stmt let mut x = 16is;"]; + N5[label="expr 16is"]; N6[label="local mut y"]; - N7[label="stmt let mut y = 16i;"]; + N7[label="stmt let mut y = 16is;"]; N8[label="(dummy_node)"]; - N9[label="expr \'outer:\l loop {\l \'inner:\l loop {\l if x == 1i { continue \'outer ; \"unreachable\"; }\l if y >= 1i { break ; \"unreachable\"; }\l y -= 1i;\l }\l y -= 1i;\l x -= 1i;\l }\l"]; + N9[label="expr \'outer:\l loop {\l \'inner:\l loop {\l if x == 1is { continue \'outer ; \"unreachable\"; }\l if y >= 1is { break ; \"unreachable\"; }\l y -= 1is;\l }\l y -= 1is;\l x -= 1is;\l }\l"]; N10[label="(dummy_node)"]; - N11[label="expr \'inner:\l loop {\l if x == 1i { continue \'outer ; \"unreachable\"; }\l if y >= 1i { break ; \"unreachable\"; }\l y -= 1i;\l }\l"]; + N11[label="expr \'inner:\l loop {\l if x == 1is { continue \'outer ; \"unreachable\"; }\l if y >= 1is { break ; \"unreachable\"; }\l y -= 1is;\l }\l"]; N12[label="expr x"]; - N13[label="expr 1i"]; - N14[label="expr x == 1i"]; + N13[label="expr 1is"]; + N14[label="expr x == 1is"]; N15[label="expr continue \'outer"]; N16[label="(dummy_node)"]; N17[label="stmt continue \'outer ;"]; N18[label="expr \"unreachable\""]; N19[label="stmt \"unreachable\";"]; N20[label="block { continue \'outer ; \"unreachable\"; }"]; - N21[label="expr if x == 1i { continue \'outer ; \"unreachable\"; }"]; - N22[label="stmt if x == 1i { continue \'outer ; \"unreachable\"; }"]; + N21[label="expr if x == 1is { continue \'outer ; \"unreachable\"; }"]; + N22[label="stmt if x == 1is { continue \'outer ; \"unreachable\"; }"]; N23[label="expr y"]; - N24[label="expr 1i"]; - N25[label="expr y >= 1i"]; + N24[label="expr 1is"]; + N25[label="expr y >= 1is"]; N26[label="expr break"]; N27[label="(dummy_node)"]; N28[label="stmt break ;"]; N29[label="expr \"unreachable\""]; N30[label="stmt \"unreachable\";"]; N31[label="block { break ; \"unreachable\"; }"]; - N32[label="expr if y >= 1i { break ; \"unreachable\"; }"]; - N33[label="stmt if y >= 1i { break ; \"unreachable\"; }"]; - N34[label="expr 1i"]; + N32[label="expr if y >= 1is { break ; \"unreachable\"; }"]; + N33[label="stmt if y >= 1is { break ; \"unreachable\"; }"]; + N34[label="expr 1is"]; N35[label="expr y"]; - N36[label="expr y -= 1i"]; - N37[label="stmt y -= 1i;"]; - N38[label="block {\l if x == 1i { continue \'outer ; \"unreachable\"; }\l if y >= 1i { break ; \"unreachable\"; }\l y -= 1i;\l}\l"]; - N39[label="stmt \'inner:\l loop {\l if x == 1i { continue \'outer ; \"unreachable\"; }\l if y >= 1i { break ; \"unreachable\"; }\l y -= 1i;\l }\l"]; - N40[label="expr 1i"]; + N36[label="expr y -= 1is"]; + N37[label="stmt y -= 1is;"]; + N38[label="block {\l if x == 1is { continue \'outer ; \"unreachable\"; }\l if y >= 1is { break ; \"unreachable\"; }\l y -= 1is;\l}\l"]; + N39[label="stmt \'inner:\l loop {\l if x == 1is { continue \'outer ; \"unreachable\"; }\l if y >= 1is { break ; \"unreachable\"; }\l y -= 1is;\l }\l"]; + N40[label="expr 1is"]; N41[label="expr y"]; - N42[label="expr y -= 1i"]; - N43[label="stmt y -= 1i;"]; - N44[label="expr 1i"]; + N42[label="expr y -= 1is"]; + N43[label="stmt y -= 1is;"]; + N44[label="expr 1is"]; N45[label="expr x"]; - N46[label="expr x -= 1i"]; - N47[label="stmt x -= 1i;"]; - N48[label="block {\l \'inner:\l loop {\l if x == 1i { continue \'outer ; \"unreachable\"; }\l if y >= 1i { break ; \"unreachable\"; }\l y -= 1i;\l }\l y -= 1i;\l x -= 1i;\l}\l"]; - N49[label="stmt \'outer:\l loop {\l \'inner:\l loop {\l if x == 1i { continue \'outer ; \"unreachable\"; }\l if y >= 1i { break ; \"unreachable\"; }\l y -= 1i;\l }\l y -= 1i;\l x -= 1i;\l }\l"]; + N46[label="expr x -= 1is"]; + N47[label="stmt x -= 1is;"]; + N48[label="block {\l \'inner:\l loop {\l if x == 1is { continue \'outer ; \"unreachable\"; }\l if y >= 1is { break ; \"unreachable\"; }\l y -= 1is;\l }\l y -= 1is;\l x -= 1is;\l}\l"]; + N49[label="stmt \'outer:\l loop {\l \'inner:\l loop {\l if x == 1is { continue \'outer ; \"unreachable\"; }\l if y >= 1is { break ; \"unreachable\"; }\l y -= 1is;\l }\l y -= 1is;\l x -= 1is;\l }\l"]; N50[label="expr \"unreachable\""]; N51[label="stmt \"unreachable\";"]; - N52[label="block {\l let mut x = 16i;\l let mut y = 16i;\l \'outer:\l loop {\l \'inner:\l loop {\l if x == 1i { continue \'outer ; \"unreachable\"; }\l if y >= 1i { break ; \"unreachable\"; }\l y -= 1i;\l }\l y -= 1i;\l x -= 1i;\l }\l \"unreachable\";\l}\l"]; + N52[label="block {\l let mut x = 16is;\l let mut y = 16is;\l \'outer:\l loop {\l \'inner:\l loop {\l if x == 1is { continue \'outer ; \"unreachable\"; }\l if y >= 1is { break ; \"unreachable\"; }\l y -= 1is;\l }\l y -= 1is;\l x -= 1is;\l }\l \"unreachable\";\l}\l"]; N0 -> N2; N2 -> N3; N3 -> N4; @@ -64,7 +64,7 @@ digraph block { N12 -> N13; N13 -> N14; N14 -> N15; - N15 -> N8[label="exiting scope_0 expr continue \'outer,\lexiting scope_1 stmt continue \'outer ;,\lexiting scope_2 block { continue \'outer ; \"unreachable\"; },\lexiting scope_3 expr if x == 1i { continue \'outer ; \"unreachable\"; },\lexiting scope_4 stmt if x == 1i { continue \'outer ; \"unreachable\"; },\lexiting scope_5 block {\l if x == 1i { continue \'outer ; \"unreachable\"; }\l if y >= 1i { break ; \"unreachable\"; }\l y -= 1i;\l}\l,\lexiting scope_6 expr \'inner:\l loop {\l if x == 1i { continue \'outer ; \"unreachable\"; }\l if y >= 1i { break ; \"unreachable\"; }\l y -= 1i;\l }\l,\lexiting scope_7 stmt \'inner:\l loop {\l if x == 1i { continue \'outer ; \"unreachable\"; }\l if y >= 1i { break ; \"unreachable\"; }\l y -= 1i;\l }\l,\lexiting scope_8 block {\l \'inner:\l loop {\l if x == 1i { continue \'outer ; \"unreachable\"; }\l if y >= 1i { break ; \"unreachable\"; }\l y -= 1i;\l }\l y -= 1i;\l x -= 1i;\l}\l"]; + N15 -> N8[label="exiting scope_0 expr continue \'outer,\lexiting scope_1 stmt continue \'outer ;,\lexiting scope_2 block { continue \'outer ; \"unreachable\"; },\lexiting scope_3 expr if x == 1is { continue \'outer ; \"unreachable\"; },\lexiting scope_4 stmt if x == 1is { continue \'outer ; \"unreachable\"; },\lexiting scope_5 block {\l if x == 1is { continue \'outer ; \"unreachable\"; }\l if y >= 1is { break ; \"unreachable\"; }\l y -= 1is;\l}\l,\lexiting scope_6 expr \'inner:\l loop {\l if x == 1is { continue \'outer ; \"unreachable\"; }\l if y >= 1is { break ; \"unreachable\"; }\l y -= 1is;\l }\l,\lexiting scope_7 stmt \'inner:\l loop {\l if x == 1is { continue \'outer ; \"unreachable\"; }\l if y >= 1is { break ; \"unreachable\"; }\l y -= 1is;\l }\l,\lexiting scope_8 block {\l \'inner:\l loop {\l if x == 1is { continue \'outer ; \"unreachable\"; }\l if y >= 1is { break ; \"unreachable\"; }\l y -= 1is;\l }\l y -= 1is;\l x -= 1is;\l}\l"]; N16 -> N17; N17 -> N18; N18 -> N19; @@ -76,7 +76,7 @@ digraph block { N23 -> N24; N24 -> N25; N25 -> N26; - N26 -> N11[label="exiting scope_0 expr break,\lexiting scope_1 stmt break ;,\lexiting scope_2 block { break ; \"unreachable\"; },\lexiting scope_3 expr if y >= 1i { break ; \"unreachable\"; },\lexiting scope_4 stmt if y >= 1i { break ; \"unreachable\"; },\lexiting scope_5 block {\l if x == 1i { continue \'outer ; \"unreachable\"; }\l if y >= 1i { break ; \"unreachable\"; }\l y -= 1i;\l}\l"]; + N26 -> N11[label="exiting scope_0 expr break,\lexiting scope_1 stmt break ;,\lexiting scope_2 block { break ; \"unreachable\"; },\lexiting scope_3 expr if y >= 1is { break ; \"unreachable\"; },\lexiting scope_4 stmt if y >= 1is { break ; \"unreachable\"; },\lexiting scope_5 block {\l if x == 1is { continue \'outer ; \"unreachable\"; }\l if y >= 1is { break ; \"unreachable\"; }\l y -= 1is;\l}\l"]; N27 -> N28; N28 -> N29; N29 -> N30; diff --git a/src/test/run-make/graphviz-flowgraph/f17.dot-expected.dot b/src/test/run-make/graphviz-flowgraph/f17.dot-expected.dot index c78224c00df8a..7941b4f7ce540 100644 --- a/src/test/run-make/graphviz-flowgraph/f17.dot-expected.dot +++ b/src/test/run-make/graphviz-flowgraph/f17.dot-expected.dot @@ -1,13 +1,13 @@ digraph block { N0[label="entry"]; N1[label="exit"]; - N2[label="expr 1i"]; - N3[label="expr 7i"]; - N4[label="expr 17i"]; - N5[label="expr [1i, 7i, 17i]"]; + N2[label="expr 1is"]; + N3[label="expr 7is"]; + N4[label="expr 17is"]; + N5[label="expr [1is, 7is, 17is]"]; N6[label="local _v"]; - N7[label="stmt let _v = [1i, 7i, 17i];"]; - N8[label="block { let _v = [1i, 7i, 17i]; }"]; + N7[label="stmt let _v = [1is, 7is, 17is];"]; + N8[label="block { let _v = [1is, 7is, 17is]; }"]; N0 -> N2; N2 -> N3; N3 -> N4; diff --git a/src/test/run-make/graphviz-flowgraph/f20.dot-expected.dot b/src/test/run-make/graphviz-flowgraph/f20.dot-expected.dot index a625a1a0026fa..c9e4b41c81269 100644 --- a/src/test/run-make/graphviz-flowgraph/f20.dot-expected.dot +++ b/src/test/run-make/graphviz-flowgraph/f20.dot-expected.dot @@ -1,17 +1,17 @@ digraph block { N0[label="entry"]; N1[label="exit"]; - N2[label="expr 2u"]; - N3[label="expr 0u"]; - N4[label="expr 20u"]; - N5[label="expr [2u, 0u, 20u]"]; + N2[label="expr 2us"]; + N3[label="expr 0us"]; + N4[label="expr 20us"]; + N5[label="expr [2us, 0us, 20us]"]; N6[label="local v"]; - N7[label="stmt let v = [2u, 0u, 20u];"]; + N7[label="stmt let v = [2us, 0us, 20us];"]; N8[label="expr v"]; - N9[label="expr 20u"]; - N10[label="expr v[20u]"]; - N11[label="stmt v[20u];"]; - N12[label="block { let v = [2u, 0u, 20u]; v[20u]; }"]; + N9[label="expr 20us"]; + N10[label="expr v[20us]"]; + N11[label="stmt v[20us];"]; + N12[label="block { let v = [2us, 0us, 20us]; v[20us]; }"]; N0 -> N2; N2 -> N3; N3 -> N4; diff --git a/src/test/run-make/graphviz-flowgraph/f21.dot-expected.dot b/src/test/run-make/graphviz-flowgraph/f21.dot-expected.dot index ad2ef60ce2918..e7a2cf2ff732f 100644 --- a/src/test/run-make/graphviz-flowgraph/f21.dot-expected.dot +++ b/src/test/run-make/graphviz-flowgraph/f21.dot-expected.dot @@ -1,52 +1,52 @@ digraph block { N0[label="entry"]; N1[label="exit"]; - N2[label="expr 15i"]; + N2[label="expr 15is"]; N3[label="local mut x"]; - N4[label="stmt let mut x = 15i;"]; - N5[label="expr 151i"]; + N4[label="stmt let mut x = 15is;"]; + N5[label="expr 151is"]; N6[label="local mut y"]; - N7[label="stmt let mut y = 151i;"]; + N7[label="stmt let mut y = 151is;"]; N8[label="(dummy_node)"]; - N9[label="expr \'outer:\l loop {\l \'inner:\l loop {\l if x == 1i { break \'outer ; \"unreachable\"; }\l if y >= 2i { return; \"unreachable\"; }\l y -= 3i;\l x -= 5i;\l }\l \"unreachable\";\l }\l"]; + N9[label="expr \'outer:\l loop {\l \'inner:\l loop {\l if x == 1is { break \'outer ; \"unreachable\"; }\l if y >= 2is { return; \"unreachable\"; }\l y -= 3is;\l x -= 5is;\l }\l \"unreachable\";\l }\l"]; N10[label="(dummy_node)"]; - N11[label="expr \'inner:\l loop {\l if x == 1i { break \'outer ; \"unreachable\"; }\l if y >= 2i { return; \"unreachable\"; }\l y -= 3i;\l x -= 5i;\l }\l"]; + N11[label="expr \'inner:\l loop {\l if x == 1is { break \'outer ; \"unreachable\"; }\l if y >= 2is { return; \"unreachable\"; }\l y -= 3is;\l x -= 5is;\l }\l"]; N12[label="expr x"]; - N13[label="expr 1i"]; - N14[label="expr x == 1i"]; + N13[label="expr 1is"]; + N14[label="expr x == 1is"]; N15[label="expr break \'outer"]; N16[label="(dummy_node)"]; N17[label="stmt break \'outer ;"]; N18[label="expr \"unreachable\""]; N19[label="stmt \"unreachable\";"]; N20[label="block { break \'outer ; \"unreachable\"; }"]; - N21[label="expr if x == 1i { break \'outer ; \"unreachable\"; }"]; - N22[label="stmt if x == 1i { break \'outer ; \"unreachable\"; }"]; + N21[label="expr if x == 1is { break \'outer ; \"unreachable\"; }"]; + N22[label="stmt if x == 1is { break \'outer ; \"unreachable\"; }"]; N23[label="expr y"]; - N24[label="expr 2i"]; - N25[label="expr y >= 2i"]; + N24[label="expr 2is"]; + N25[label="expr y >= 2is"]; N26[label="expr return"]; N27[label="(dummy_node)"]; N28[label="stmt return;"]; N29[label="expr \"unreachable\""]; N30[label="stmt \"unreachable\";"]; N31[label="block { return; \"unreachable\"; }"]; - N32[label="expr if y >= 2i { return; \"unreachable\"; }"]; - N33[label="stmt if y >= 2i { return; \"unreachable\"; }"]; - N34[label="expr 3i"]; + N32[label="expr if y >= 2is { return; \"unreachable\"; }"]; + N33[label="stmt if y >= 2is { return; \"unreachable\"; }"]; + N34[label="expr 3is"]; N35[label="expr y"]; - N36[label="expr y -= 3i"]; - N37[label="stmt y -= 3i;"]; - N38[label="expr 5i"]; + N36[label="expr y -= 3is"]; + N37[label="stmt y -= 3is;"]; + N38[label="expr 5is"]; N39[label="expr x"]; - N40[label="expr x -= 5i"]; - N41[label="stmt x -= 5i;"]; - N42[label="block {\l if x == 1i { break \'outer ; \"unreachable\"; }\l if y >= 2i { return; \"unreachable\"; }\l y -= 3i;\l x -= 5i;\l}\l"]; - N43[label="stmt \'inner:\l loop {\l if x == 1i { break \'outer ; \"unreachable\"; }\l if y >= 2i { return; \"unreachable\"; }\l y -= 3i;\l x -= 5i;\l }\l"]; + N40[label="expr x -= 5is"]; + N41[label="stmt x -= 5is;"]; + N42[label="block {\l if x == 1is { break \'outer ; \"unreachable\"; }\l if y >= 2is { return; \"unreachable\"; }\l y -= 3is;\l x -= 5is;\l}\l"]; + N43[label="stmt \'inner:\l loop {\l if x == 1is { break \'outer ; \"unreachable\"; }\l if y >= 2is { return; \"unreachable\"; }\l y -= 3is;\l x -= 5is;\l }\l"]; N44[label="expr \"unreachable\""]; N45[label="stmt \"unreachable\";"]; - N46[label="block {\l \'inner:\l loop {\l if x == 1i { break \'outer ; \"unreachable\"; }\l if y >= 2i { return; \"unreachable\"; }\l y -= 3i;\l x -= 5i;\l }\l \"unreachable\";\l}\l"]; - N47[label="block {\l let mut x = 15i;\l let mut y = 151i;\l \'outer:\l loop {\l \'inner:\l loop {\l if x == 1i { break \'outer ; \"unreachable\"; }\l if y >= 2i { return; \"unreachable\"; }\l y -= 3i;\l x -= 5i;\l }\l \"unreachable\";\l }\l}\l"]; + N46[label="block {\l \'inner:\l loop {\l if x == 1is { break \'outer ; \"unreachable\"; }\l if y >= 2is { return; \"unreachable\"; }\l y -= 3is;\l x -= 5is;\l }\l \"unreachable\";\l}\l"]; + N47[label="block {\l let mut x = 15is;\l let mut y = 151is;\l \'outer:\l loop {\l \'inner:\l loop {\l if x == 1is { break \'outer ; \"unreachable\"; }\l if y >= 2is { return; \"unreachable\"; }\l y -= 3is;\l x -= 5is;\l }\l \"unreachable\";\l }\l}\l"]; N0 -> N2; N2 -> N3; N3 -> N4; @@ -59,7 +59,7 @@ digraph block { N12 -> N13; N13 -> N14; N14 -> N15; - N15 -> N9[label="exiting scope_0 expr break \'outer,\lexiting scope_1 stmt break \'outer ;,\lexiting scope_2 block { break \'outer ; \"unreachable\"; },\lexiting scope_3 expr if x == 1i { break \'outer ; \"unreachable\"; },\lexiting scope_4 stmt if x == 1i { break \'outer ; \"unreachable\"; },\lexiting scope_5 block {\l if x == 1i { break \'outer ; \"unreachable\"; }\l if y >= 2i { return; \"unreachable\"; }\l y -= 3i;\l x -= 5i;\l}\l,\lexiting scope_6 expr \'inner:\l loop {\l if x == 1i { break \'outer ; \"unreachable\"; }\l if y >= 2i { return; \"unreachable\"; }\l y -= 3i;\l x -= 5i;\l }\l,\lexiting scope_7 stmt \'inner:\l loop {\l if x == 1i { break \'outer ; \"unreachable\"; }\l if y >= 2i { return; \"unreachable\"; }\l y -= 3i;\l x -= 5i;\l }\l,\lexiting scope_8 block {\l \'inner:\l loop {\l if x == 1i { break \'outer ; \"unreachable\"; }\l if y >= 2i { return; \"unreachable\"; }\l y -= 3i;\l x -= 5i;\l }\l \"unreachable\";\l}\l"]; + N15 -> N9[label="exiting scope_0 expr break \'outer,\lexiting scope_1 stmt break \'outer ;,\lexiting scope_2 block { break \'outer ; \"unreachable\"; },\lexiting scope_3 expr if x == 1is { break \'outer ; \"unreachable\"; },\lexiting scope_4 stmt if x == 1is { break \'outer ; \"unreachable\"; },\lexiting scope_5 block {\l if x == 1is { break \'outer ; \"unreachable\"; }\l if y >= 2is { return; \"unreachable\"; }\l y -= 3is;\l x -= 5is;\l}\l,\lexiting scope_6 expr \'inner:\l loop {\l if x == 1is { break \'outer ; \"unreachable\"; }\l if y >= 2is { return; \"unreachable\"; }\l y -= 3is;\l x -= 5is;\l }\l,\lexiting scope_7 stmt \'inner:\l loop {\l if x == 1is { break \'outer ; \"unreachable\"; }\l if y >= 2is { return; \"unreachable\"; }\l y -= 3is;\l x -= 5is;\l }\l,\lexiting scope_8 block {\l \'inner:\l loop {\l if x == 1is { break \'outer ; \"unreachable\"; }\l if y >= 2is { return; \"unreachable\"; }\l y -= 3is;\l x -= 5is;\l }\l \"unreachable\";\l}\l"]; N16 -> N17; N17 -> N18; N18 -> N19; @@ -71,7 +71,7 @@ digraph block { N23 -> N24; N24 -> N25; N25 -> N26; - N26 -> N1[label="exiting scope_0 expr \'inner:\l loop {\l if x == 1i { break \'outer ; \"unreachable\"; }\l if y >= 2i { return; \"unreachable\"; }\l y -= 3i;\l x -= 5i;\l }\l,\lexiting scope_1 expr \'outer:\l loop {\l \'inner:\l loop {\l if x == 1i { break \'outer ; \"unreachable\"; }\l if y >= 2i { return; \"unreachable\"; }\l y -= 3i;\l x -= 5i;\l }\l \"unreachable\";\l }\l"]; + N26 -> N1[label="exiting scope_0 expr \'inner:\l loop {\l if x == 1is { break \'outer ; \"unreachable\"; }\l if y >= 2is { return; \"unreachable\"; }\l y -= 3is;\l x -= 5is;\l }\l,\lexiting scope_1 expr \'outer:\l loop {\l \'inner:\l loop {\l if x == 1is { break \'outer ; \"unreachable\"; }\l if y >= 2is { return; \"unreachable\"; }\l y -= 3is;\l x -= 5is;\l }\l \"unreachable\";\l }\l"]; N27 -> N28; N28 -> N29; N29 -> N30; diff --git a/src/test/run-make/graphviz-flowgraph/f22.dot-expected.dot b/src/test/run-make/graphviz-flowgraph/f22.dot-expected.dot index dcceb5bb937da..edd39b40b36a3 100644 --- a/src/test/run-make/graphviz-flowgraph/f22.dot-expected.dot +++ b/src/test/run-make/graphviz-flowgraph/f22.dot-expected.dot @@ -1,55 +1,55 @@ digraph block { N0[label="entry"]; N1[label="exit"]; - N2[label="expr 15i"]; + N2[label="expr 15is"]; N3[label="local mut x"]; - N4[label="stmt let mut x = 15i;"]; - N5[label="expr 151i"]; + N4[label="stmt let mut x = 15is;"]; + N5[label="expr 151is"]; N6[label="local mut y"]; - N7[label="stmt let mut y = 151i;"]; + N7[label="stmt let mut y = 151is;"]; N8[label="(dummy_node)"]; - N9[label="expr \'outer:\l loop {\l \'inner:\l loop {\l if x == 1i { continue \'outer ; \"unreachable\"; }\l if y >= 2i { return; \"unreachable\"; }\l x -= 1i;\l y -= 3i;\l }\l \"unreachable\";\l }\l"]; + N9[label="expr \'outer:\l loop {\l \'inner:\l loop {\l if x == 1is { continue \'outer ; \"unreachable\"; }\l if y >= 2is { return; \"unreachable\"; }\l x -= 1is;\l y -= 3is;\l }\l \"unreachable\";\l }\l"]; N10[label="(dummy_node)"]; - N11[label="expr \'inner:\l loop {\l if x == 1i { continue \'outer ; \"unreachable\"; }\l if y >= 2i { return; \"unreachable\"; }\l x -= 1i;\l y -= 3i;\l }\l"]; + N11[label="expr \'inner:\l loop {\l if x == 1is { continue \'outer ; \"unreachable\"; }\l if y >= 2is { return; \"unreachable\"; }\l x -= 1is;\l y -= 3is;\l }\l"]; N12[label="expr x"]; - N13[label="expr 1i"]; - N14[label="expr x == 1i"]; + N13[label="expr 1is"]; + N14[label="expr x == 1is"]; N15[label="expr continue \'outer"]; N16[label="(dummy_node)"]; N17[label="stmt continue \'outer ;"]; N18[label="expr \"unreachable\""]; N19[label="stmt \"unreachable\";"]; N20[label="block { continue \'outer ; \"unreachable\"; }"]; - N21[label="expr if x == 1i { continue \'outer ; \"unreachable\"; }"]; - N22[label="stmt if x == 1i { continue \'outer ; \"unreachable\"; }"]; + N21[label="expr if x == 1is { continue \'outer ; \"unreachable\"; }"]; + N22[label="stmt if x == 1is { continue \'outer ; \"unreachable\"; }"]; N23[label="expr y"]; - N24[label="expr 2i"]; - N25[label="expr y >= 2i"]; + N24[label="expr 2is"]; + N25[label="expr y >= 2is"]; N26[label="expr return"]; N27[label="(dummy_node)"]; N28[label="stmt return;"]; N29[label="expr \"unreachable\""]; N30[label="stmt \"unreachable\";"]; N31[label="block { return; \"unreachable\"; }"]; - N32[label="expr if y >= 2i { return; \"unreachable\"; }"]; - N33[label="stmt if y >= 2i { return; \"unreachable\"; }"]; - N34[label="expr 1i"]; + N32[label="expr if y >= 2is { return; \"unreachable\"; }"]; + N33[label="stmt if y >= 2is { return; \"unreachable\"; }"]; + N34[label="expr 1is"]; N35[label="expr x"]; - N36[label="expr x -= 1i"]; - N37[label="stmt x -= 1i;"]; - N38[label="expr 3i"]; + N36[label="expr x -= 1is"]; + N37[label="stmt x -= 1is;"]; + N38[label="expr 3is"]; N39[label="expr y"]; - N40[label="expr y -= 3i"]; - N41[label="stmt y -= 3i;"]; - N42[label="block {\l if x == 1i { continue \'outer ; \"unreachable\"; }\l if y >= 2i { return; \"unreachable\"; }\l x -= 1i;\l y -= 3i;\l}\l"]; - N43[label="stmt \'inner:\l loop {\l if x == 1i { continue \'outer ; \"unreachable\"; }\l if y >= 2i { return; \"unreachable\"; }\l x -= 1i;\l y -= 3i;\l }\l"]; + N40[label="expr y -= 3is"]; + N41[label="stmt y -= 3is;"]; + N42[label="block {\l if x == 1is { continue \'outer ; \"unreachable\"; }\l if y >= 2is { return; \"unreachable\"; }\l x -= 1is;\l y -= 3is;\l}\l"]; + N43[label="stmt \'inner:\l loop {\l if x == 1is { continue \'outer ; \"unreachable\"; }\l if y >= 2is { return; \"unreachable\"; }\l x -= 1is;\l y -= 3is;\l }\l"]; N44[label="expr \"unreachable\""]; N45[label="stmt \"unreachable\";"]; - N46[label="block {\l \'inner:\l loop {\l if x == 1i { continue \'outer ; \"unreachable\"; }\l if y >= 2i { return; \"unreachable\"; }\l x -= 1i;\l y -= 3i;\l }\l \"unreachable\";\l}\l"]; - N47[label="stmt \'outer:\l loop {\l \'inner:\l loop {\l if x == 1i { continue \'outer ; \"unreachable\"; }\l if y >= 2i { return; \"unreachable\"; }\l x -= 1i;\l y -= 3i;\l }\l \"unreachable\";\l }\l"]; + N46[label="block {\l \'inner:\l loop {\l if x == 1is { continue \'outer ; \"unreachable\"; }\l if y >= 2is { return; \"unreachable\"; }\l x -= 1is;\l y -= 3is;\l }\l \"unreachable\";\l}\l"]; + N47[label="stmt \'outer:\l loop {\l \'inner:\l loop {\l if x == 1is { continue \'outer ; \"unreachable\"; }\l if y >= 2is { return; \"unreachable\"; }\l x -= 1is;\l y -= 3is;\l }\l \"unreachable\";\l }\l"]; N48[label="expr \"unreachable\""]; N49[label="stmt \"unreachable\";"]; - N50[label="block {\l let mut x = 15i;\l let mut y = 151i;\l \'outer:\l loop {\l \'inner:\l loop {\l if x == 1i { continue \'outer ; \"unreachable\"; }\l if y >= 2i { return; \"unreachable\"; }\l x -= 1i;\l y -= 3i;\l }\l \"unreachable\";\l }\l \"unreachable\";\l}\l"]; + N50[label="block {\l let mut x = 15is;\l let mut y = 151is;\l \'outer:\l loop {\l \'inner:\l loop {\l if x == 1is { continue \'outer ; \"unreachable\"; }\l if y >= 2is { return; \"unreachable\"; }\l x -= 1is;\l y -= 3is;\l }\l \"unreachable\";\l }\l \"unreachable\";\l}\l"]; N0 -> N2; N2 -> N3; N3 -> N4; @@ -62,7 +62,7 @@ digraph block { N12 -> N13; N13 -> N14; N14 -> N15; - N15 -> N8[label="exiting scope_0 expr continue \'outer,\lexiting scope_1 stmt continue \'outer ;,\lexiting scope_2 block { continue \'outer ; \"unreachable\"; },\lexiting scope_3 expr if x == 1i { continue \'outer ; \"unreachable\"; },\lexiting scope_4 stmt if x == 1i { continue \'outer ; \"unreachable\"; },\lexiting scope_5 block {\l if x == 1i { continue \'outer ; \"unreachable\"; }\l if y >= 2i { return; \"unreachable\"; }\l x -= 1i;\l y -= 3i;\l}\l,\lexiting scope_6 expr \'inner:\l loop {\l if x == 1i { continue \'outer ; \"unreachable\"; }\l if y >= 2i { return; \"unreachable\"; }\l x -= 1i;\l y -= 3i;\l }\l,\lexiting scope_7 stmt \'inner:\l loop {\l if x == 1i { continue \'outer ; \"unreachable\"; }\l if y >= 2i { return; \"unreachable\"; }\l x -= 1i;\l y -= 3i;\l }\l,\lexiting scope_8 block {\l \'inner:\l loop {\l if x == 1i { continue \'outer ; \"unreachable\"; }\l if y >= 2i { return; \"unreachable\"; }\l x -= 1i;\l y -= 3i;\l }\l \"unreachable\";\l}\l"]; + N15 -> N8[label="exiting scope_0 expr continue \'outer,\lexiting scope_1 stmt continue \'outer ;,\lexiting scope_2 block { continue \'outer ; \"unreachable\"; },\lexiting scope_3 expr if x == 1is { continue \'outer ; \"unreachable\"; },\lexiting scope_4 stmt if x == 1is { continue \'outer ; \"unreachable\"; },\lexiting scope_5 block {\l if x == 1is { continue \'outer ; \"unreachable\"; }\l if y >= 2is { return; \"unreachable\"; }\l x -= 1is;\l y -= 3is;\l}\l,\lexiting scope_6 expr \'inner:\l loop {\l if x == 1is { continue \'outer ; \"unreachable\"; }\l if y >= 2is { return; \"unreachable\"; }\l x -= 1is;\l y -= 3is;\l }\l,\lexiting scope_7 stmt \'inner:\l loop {\l if x == 1is { continue \'outer ; \"unreachable\"; }\l if y >= 2is { return; \"unreachable\"; }\l x -= 1is;\l y -= 3is;\l }\l,\lexiting scope_8 block {\l \'inner:\l loop {\l if x == 1is { continue \'outer ; \"unreachable\"; }\l if y >= 2is { return; \"unreachable\"; }\l x -= 1is;\l y -= 3is;\l }\l \"unreachable\";\l}\l"]; N16 -> N17; N17 -> N18; N18 -> N19; @@ -74,7 +74,7 @@ digraph block { N23 -> N24; N24 -> N25; N25 -> N26; - N26 -> N1[label="exiting scope_0 expr \'inner:\l loop {\l if x == 1i { continue \'outer ; \"unreachable\"; }\l if y >= 2i { return; \"unreachable\"; }\l x -= 1i;\l y -= 3i;\l }\l,\lexiting scope_1 expr \'outer:\l loop {\l \'inner:\l loop {\l if x == 1i { continue \'outer ; \"unreachable\"; }\l if y >= 2i { return; \"unreachable\"; }\l x -= 1i;\l y -= 3i;\l }\l \"unreachable\";\l }\l"]; + N26 -> N1[label="exiting scope_0 expr \'inner:\l loop {\l if x == 1is { continue \'outer ; \"unreachable\"; }\l if y >= 2is { return; \"unreachable\"; }\l x -= 1is;\l y -= 3is;\l }\l,\lexiting scope_1 expr \'outer:\l loop {\l \'inner:\l loop {\l if x == 1is { continue \'outer ; \"unreachable\"; }\l if y >= 2is { return; \"unreachable\"; }\l x -= 1is;\l y -= 3is;\l }\l \"unreachable\";\l }\l"]; N27 -> N28; N28 -> N29; N29 -> N30; diff --git a/src/test/run-make/graphviz-flowgraph/f23.dot-expected.dot b/src/test/run-make/graphviz-flowgraph/f23.dot-expected.dot index 034ecfb7f2099..2b5c5cdff44e3 100644 --- a/src/test/run-make/graphviz-flowgraph/f23.dot-expected.dot +++ b/src/test/run-make/graphviz-flowgraph/f23.dot-expected.dot @@ -1,57 +1,57 @@ digraph block { N0[label="entry"]; N1[label="exit"]; - N2[label="expr 23i"]; + N2[label="expr 23is"]; N3[label="local mut x"]; - N4[label="stmt let mut x = 23i;"]; - N5[label="expr 23i"]; + N4[label="stmt let mut x = 23is;"]; + N5[label="expr 23is"]; N6[label="local mut y"]; - N7[label="stmt let mut y = 23i;"]; - N8[label="expr 23i"]; + N7[label="stmt let mut y = 23is;"]; + N8[label="expr 23is"]; N9[label="local mut z"]; - N10[label="stmt let mut z = 23i;"]; + N10[label="stmt let mut z = 23is;"]; N11[label="(dummy_node)"]; N12[label="expr x"]; - N13[label="expr 0i"]; - N14[label="expr x > 0i"]; - N15[label="expr while x > 0i {\l x -= 1i;\l while y > 0i {\l y -= 1i;\l while z > 0i { z -= 1i; }\l if x > 10i { return; \"unreachable\"; }\l }\l}\l"]; - N16[label="expr 1i"]; + N13[label="expr 0is"]; + N14[label="expr x > 0is"]; + N15[label="expr while x > 0is {\l x -= 1is;\l while y > 0is {\l y -= 1is;\l while z > 0is { z -= 1is; }\l if x > 10is { return; \"unreachable\"; }\l }\l}\l"]; + N16[label="expr 1is"]; N17[label="expr x"]; - N18[label="expr x -= 1i"]; - N19[label="stmt x -= 1i;"]; + N18[label="expr x -= 1is"]; + N19[label="stmt x -= 1is;"]; N20[label="(dummy_node)"]; N21[label="expr y"]; - N22[label="expr 0i"]; - N23[label="expr y > 0i"]; - N24[label="expr while y > 0i {\l y -= 1i;\l while z > 0i { z -= 1i; }\l if x > 10i { return; \"unreachable\"; }\l}\l"]; - N25[label="expr 1i"]; + N22[label="expr 0is"]; + N23[label="expr y > 0is"]; + N24[label="expr while y > 0is {\l y -= 1is;\l while z > 0is { z -= 1is; }\l if x > 10is { return; \"unreachable\"; }\l}\l"]; + N25[label="expr 1is"]; N26[label="expr y"]; - N27[label="expr y -= 1i"]; - N28[label="stmt y -= 1i;"]; + N27[label="expr y -= 1is"]; + N28[label="stmt y -= 1is;"]; N29[label="(dummy_node)"]; N30[label="expr z"]; - N31[label="expr 0i"]; - N32[label="expr z > 0i"]; - N33[label="expr while z > 0i { z -= 1i; }"]; - N34[label="expr 1i"]; + N31[label="expr 0is"]; + N32[label="expr z > 0is"]; + N33[label="expr while z > 0is { z -= 1is; }"]; + N34[label="expr 1is"]; N35[label="expr z"]; - N36[label="expr z -= 1i"]; - N37[label="stmt z -= 1i;"]; - N38[label="block { z -= 1i; }"]; - N39[label="stmt while z > 0i { z -= 1i; }"]; + N36[label="expr z -= 1is"]; + N37[label="stmt z -= 1is;"]; + N38[label="block { z -= 1is; }"]; + N39[label="stmt while z > 0is { z -= 1is; }"]; N40[label="expr x"]; - N41[label="expr 10i"]; - N42[label="expr x > 10i"]; + N41[label="expr 10is"]; + N42[label="expr x > 10is"]; N43[label="expr return"]; N44[label="(dummy_node)"]; N45[label="stmt return;"]; N46[label="expr \"unreachable\""]; N47[label="stmt \"unreachable\";"]; N48[label="block { return; \"unreachable\"; }"]; - N49[label="expr if x > 10i { return; \"unreachable\"; }"]; - N50[label="block { y -= 1i; while z > 0i { z -= 1i; } if x > 10i { return; \"unreachable\"; } }"]; - N51[label="block {\l x -= 1i;\l while y > 0i {\l y -= 1i;\l while z > 0i { z -= 1i; }\l if x > 10i { return; \"unreachable\"; }\l }\l}\l"]; - N52[label="block {\l let mut x = 23i;\l let mut y = 23i;\l let mut z = 23i;\l while x > 0i {\l x -= 1i;\l while y > 0i {\l y -= 1i;\l while z > 0i { z -= 1i; }\l if x > 10i { return; \"unreachable\"; }\l }\l }\l}\l"]; + N49[label="expr if x > 10is { return; \"unreachable\"; }"]; + N50[label="block {\l y -= 1is;\l while z > 0is { z -= 1is; }\l if x > 10is { return; \"unreachable\"; }\l}\l"]; + N51[label="block {\l x -= 1is;\l while y > 0is {\l y -= 1is;\l while z > 0is { z -= 1is; }\l if x > 10is { return; \"unreachable\"; }\l }\l}\l"]; + N52[label="block {\l let mut x = 23is;\l let mut y = 23is;\l let mut z = 23is;\l while x > 0is {\l x -= 1is;\l while y > 0is {\l y -= 1is;\l while z > 0is { z -= 1is; }\l if x > 10is { return; \"unreachable\"; }\l }\l }\l}\l"]; N0 -> N2; N2 -> N3; N3 -> N4; @@ -95,7 +95,7 @@ digraph block { N40 -> N41; N41 -> N42; N42 -> N43; - N43 -> N1[label="exiting scope_0 expr while y > 0i {\l y -= 1i;\l while z > 0i { z -= 1i; }\l if x > 10i { return; \"unreachable\"; }\l}\l,\lexiting scope_1 expr while x > 0i {\l x -= 1i;\l while y > 0i {\l y -= 1i;\l while z > 0i { z -= 1i; }\l if x > 10i { return; \"unreachable\"; }\l }\l}\l"]; + N43 -> N1[label="exiting scope_0 expr while y > 0is {\l y -= 1is;\l while z > 0is { z -= 1is; }\l if x > 10is { return; \"unreachable\"; }\l}\l,\lexiting scope_1 expr while x > 0is {\l x -= 1is;\l while y > 0is {\l y -= 1is;\l while z > 0is { z -= 1is; }\l if x > 10is { return; \"unreachable\"; }\l }\l}\l"]; N44 -> N45; N45 -> N46; N46 -> N47; diff --git a/src/test/run-make/graphviz-flowgraph/f24.dot-expected.dot b/src/test/run-make/graphviz-flowgraph/f24.dot-expected.dot index ddb5b865c2edb..ee3fe7ced6cd7 100644 --- a/src/test/run-make/graphviz-flowgraph/f24.dot-expected.dot +++ b/src/test/run-make/graphviz-flowgraph/f24.dot-expected.dot @@ -1,81 +1,81 @@ digraph block { N0[label="entry"]; N1[label="exit"]; - N2[label="expr 24i"]; + N2[label="expr 24is"]; N3[label="local mut x"]; - N4[label="stmt let mut x = 24i;"]; - N5[label="expr 24i"]; + N4[label="stmt let mut x = 24is;"]; + N5[label="expr 24is"]; N6[label="local mut y"]; - N7[label="stmt let mut y = 24i;"]; - N8[label="expr 24i"]; + N7[label="stmt let mut y = 24is;"]; + N8[label="expr 24is"]; N9[label="local mut z"]; - N10[label="stmt let mut z = 24i;"]; + N10[label="stmt let mut z = 24is;"]; N11[label="(dummy_node)"]; - N12[label="expr loop {\l if x == 0i { break ; \"unreachable\"; }\l x -= 1i;\l loop {\l if y == 0i { break ; \"unreachable\"; }\l y -= 1i;\l loop { if z == 0i { break ; \"unreachable\"; } z -= 1i; }\l if x > 10i { return; \"unreachable\"; }\l }\l}\l"]; + N12[label="expr loop {\l if x == 0is { break ; \"unreachable\"; }\l x -= 1is;\l loop {\l if y == 0is { break ; \"unreachable\"; }\l y -= 1is;\l loop { if z == 0is { break ; \"unreachable\"; } z -= 1is; }\l if x > 10is { return; \"unreachable\"; }\l }\l}\l"]; N13[label="expr x"]; - N14[label="expr 0i"]; - N15[label="expr x == 0i"]; + N14[label="expr 0is"]; + N15[label="expr x == 0is"]; N16[label="expr break"]; N17[label="(dummy_node)"]; N18[label="stmt break ;"]; N19[label="expr \"unreachable\""]; N20[label="stmt \"unreachable\";"]; N21[label="block { break ; \"unreachable\"; }"]; - N22[label="expr if x == 0i { break ; \"unreachable\"; }"]; - N23[label="stmt if x == 0i { break ; \"unreachable\"; }"]; - N24[label="expr 1i"]; + N22[label="expr if x == 0is { break ; \"unreachable\"; }"]; + N23[label="stmt if x == 0is { break ; \"unreachable\"; }"]; + N24[label="expr 1is"]; N25[label="expr x"]; - N26[label="expr x -= 1i"]; - N27[label="stmt x -= 1i;"]; + N26[label="expr x -= 1is"]; + N27[label="stmt x -= 1is;"]; N28[label="(dummy_node)"]; - N29[label="expr loop {\l if y == 0i { break ; \"unreachable\"; }\l y -= 1i;\l loop { if z == 0i { break ; \"unreachable\"; } z -= 1i; }\l if x > 10i { return; \"unreachable\"; }\l}\l"]; + N29[label="expr loop {\l if y == 0is { break ; \"unreachable\"; }\l y -= 1is;\l loop { if z == 0is { break ; \"unreachable\"; } z -= 1is; }\l if x > 10is { return; \"unreachable\"; }\l}\l"]; N30[label="expr y"]; - N31[label="expr 0i"]; - N32[label="expr y == 0i"]; + N31[label="expr 0is"]; + N32[label="expr y == 0is"]; N33[label="expr break"]; N34[label="(dummy_node)"]; N35[label="stmt break ;"]; N36[label="expr \"unreachable\""]; N37[label="stmt \"unreachable\";"]; N38[label="block { break ; \"unreachable\"; }"]; - N39[label="expr if y == 0i { break ; \"unreachable\"; }"]; - N40[label="stmt if y == 0i { break ; \"unreachable\"; }"]; - N41[label="expr 1i"]; + N39[label="expr if y == 0is { break ; \"unreachable\"; }"]; + N40[label="stmt if y == 0is { break ; \"unreachable\"; }"]; + N41[label="expr 1is"]; N42[label="expr y"]; - N43[label="expr y -= 1i"]; - N44[label="stmt y -= 1i;"]; + N43[label="expr y -= 1is"]; + N44[label="stmt y -= 1is;"]; N45[label="(dummy_node)"]; - N46[label="expr loop { if z == 0i { break ; \"unreachable\"; } z -= 1i; }"]; + N46[label="expr loop { if z == 0is { break ; \"unreachable\"; } z -= 1is; }"]; N47[label="expr z"]; - N48[label="expr 0i"]; - N49[label="expr z == 0i"]; + N48[label="expr 0is"]; + N49[label="expr z == 0is"]; N50[label="expr break"]; N51[label="(dummy_node)"]; N52[label="stmt break ;"]; N53[label="expr \"unreachable\""]; N54[label="stmt \"unreachable\";"]; N55[label="block { break ; \"unreachable\"; }"]; - N56[label="expr if z == 0i { break ; \"unreachable\"; }"]; - N57[label="stmt if z == 0i { break ; \"unreachable\"; }"]; - N58[label="expr 1i"]; + N56[label="expr if z == 0is { break ; \"unreachable\"; }"]; + N57[label="stmt if z == 0is { break ; \"unreachable\"; }"]; + N58[label="expr 1is"]; N59[label="expr z"]; - N60[label="expr z -= 1i"]; - N61[label="stmt z -= 1i;"]; - N62[label="block { if z == 0i { break ; \"unreachable\"; } z -= 1i; }"]; - N63[label="stmt loop { if z == 0i { break ; \"unreachable\"; } z -= 1i; }"]; + N60[label="expr z -= 1is"]; + N61[label="stmt z -= 1is;"]; + N62[label="block { if z == 0is { break ; \"unreachable\"; } z -= 1is; }"]; + N63[label="stmt loop { if z == 0is { break ; \"unreachable\"; } z -= 1is; }"]; N64[label="expr x"]; - N65[label="expr 10i"]; - N66[label="expr x > 10i"]; + N65[label="expr 10is"]; + N66[label="expr x > 10is"]; N67[label="expr return"]; N68[label="(dummy_node)"]; N69[label="stmt return;"]; N70[label="expr \"unreachable\""]; N71[label="stmt \"unreachable\";"]; N72[label="block { return; \"unreachable\"; }"]; - N73[label="expr if x > 10i { return; \"unreachable\"; }"]; - N74[label="block {\l if y == 0i { break ; \"unreachable\"; }\l y -= 1i;\l loop { if z == 0i { break ; \"unreachable\"; } z -= 1i; }\l if x > 10i { return; \"unreachable\"; }\l}\l"]; - N75[label="block {\l if x == 0i { break ; \"unreachable\"; }\l x -= 1i;\l loop {\l if y == 0i { break ; \"unreachable\"; }\l y -= 1i;\l loop { if z == 0i { break ; \"unreachable\"; } z -= 1i; }\l if x > 10i { return; \"unreachable\"; }\l }\l}\l"]; - N76[label="block {\l let mut x = 24i;\l let mut y = 24i;\l let mut z = 24i;\l loop {\l if x == 0i { break ; \"unreachable\"; }\l x -= 1i;\l loop {\l if y == 0i { break ; \"unreachable\"; }\l y -= 1i;\l loop { if z == 0i { break ; \"unreachable\"; } z -= 1i; }\l if x > 10i { return; \"unreachable\"; }\l }\l }\l}\l"]; + N73[label="expr if x > 10is { return; \"unreachable\"; }"]; + N74[label="block {\l if y == 0is { break ; \"unreachable\"; }\l y -= 1is;\l loop { if z == 0is { break ; \"unreachable\"; } z -= 1is; }\l if x > 10is { return; \"unreachable\"; }\l}\l"]; + N75[label="block {\l if x == 0is { break ; \"unreachable\"; }\l x -= 1is;\l loop {\l if y == 0is { break ; \"unreachable\"; }\l y -= 1is;\l loop { if z == 0is { break ; \"unreachable\"; } z -= 1is; }\l if x > 10is { return; \"unreachable\"; }\l }\l}\l"]; + N76[label="block {\l let mut x = 24is;\l let mut y = 24is;\l let mut z = 24is;\l loop {\l if x == 0is { break ; \"unreachable\"; }\l x -= 1is;\l loop {\l if y == 0is { break ; \"unreachable\"; }\l y -= 1is;\l loop { if z == 0is { break ; \"unreachable\"; } z -= 1is; }\l if x > 10is { return; \"unreachable\"; }\l }\l }\l}\l"]; N0 -> N2; N2 -> N3; N3 -> N4; @@ -90,7 +90,7 @@ digraph block { N13 -> N14; N14 -> N15; N15 -> N16; - N16 -> N12[label="exiting scope_0 expr break,\lexiting scope_1 stmt break ;,\lexiting scope_2 block { break ; \"unreachable\"; },\lexiting scope_3 expr if x == 0i { break ; \"unreachable\"; },\lexiting scope_4 stmt if x == 0i { break ; \"unreachable\"; },\lexiting scope_5 block {\l if x == 0i { break ; \"unreachable\"; }\l x -= 1i;\l loop {\l if y == 0i { break ; \"unreachable\"; }\l y -= 1i;\l loop { if z == 0i { break ; \"unreachable\"; } z -= 1i; }\l if x > 10i { return; \"unreachable\"; }\l }\l}\l"]; + N16 -> N12[label="exiting scope_0 expr break,\lexiting scope_1 stmt break ;,\lexiting scope_2 block { break ; \"unreachable\"; },\lexiting scope_3 expr if x == 0is { break ; \"unreachable\"; },\lexiting scope_4 stmt if x == 0is { break ; \"unreachable\"; },\lexiting scope_5 block {\l if x == 0is { break ; \"unreachable\"; }\l x -= 1is;\l loop {\l if y == 0is { break ; \"unreachable\"; }\l y -= 1is;\l loop { if z == 0is { break ; \"unreachable\"; } z -= 1is; }\l if x > 10is { return; \"unreachable\"; }\l }\l}\l"]; N17 -> N18; N18 -> N19; N19 -> N20; @@ -107,7 +107,7 @@ digraph block { N30 -> N31; N31 -> N32; N32 -> N33; - N33 -> N29[label="exiting scope_0 expr break,\lexiting scope_1 stmt break ;,\lexiting scope_2 block { break ; \"unreachable\"; },\lexiting scope_3 expr if y == 0i { break ; \"unreachable\"; },\lexiting scope_4 stmt if y == 0i { break ; \"unreachable\"; },\lexiting scope_5 block {\l if y == 0i { break ; \"unreachable\"; }\l y -= 1i;\l loop { if z == 0i { break ; \"unreachable\"; } z -= 1i; }\l if x > 10i { return; \"unreachable\"; }\l}\l"]; + N33 -> N29[label="exiting scope_0 expr break,\lexiting scope_1 stmt break ;,\lexiting scope_2 block { break ; \"unreachable\"; },\lexiting scope_3 expr if y == 0is { break ; \"unreachable\"; },\lexiting scope_4 stmt if y == 0is { break ; \"unreachable\"; },\lexiting scope_5 block {\l if y == 0is { break ; \"unreachable\"; }\l y -= 1is;\l loop { if z == 0is { break ; \"unreachable\"; } z -= 1is; }\l if x > 10is { return; \"unreachable\"; }\l}\l"]; N34 -> N35; N35 -> N36; N36 -> N37; @@ -124,7 +124,7 @@ digraph block { N47 -> N48; N48 -> N49; N49 -> N50; - N50 -> N46[label="exiting scope_0 expr break,\lexiting scope_1 stmt break ;,\lexiting scope_2 block { break ; \"unreachable\"; },\lexiting scope_3 expr if z == 0i { break ; \"unreachable\"; },\lexiting scope_4 stmt if z == 0i { break ; \"unreachable\"; },\lexiting scope_5 block { if z == 0i { break ; \"unreachable\"; } z -= 1i; }"]; + N50 -> N46[label="exiting scope_0 expr break,\lexiting scope_1 stmt break ;,\lexiting scope_2 block { break ; \"unreachable\"; },\lexiting scope_3 expr if z == 0is { break ; \"unreachable\"; },\lexiting scope_4 stmt if z == 0is { break ; \"unreachable\"; },\lexiting scope_5 block { if z == 0is { break ; \"unreachable\"; } z -= 1is; }"]; N51 -> N52; N52 -> N53; N53 -> N54; @@ -143,7 +143,7 @@ digraph block { N64 -> N65; N65 -> N66; N66 -> N67; - N67 -> N1[label="exiting scope_0 expr loop {\l if y == 0i { break ; \"unreachable\"; }\l y -= 1i;\l loop { if z == 0i { break ; \"unreachable\"; } z -= 1i; }\l if x > 10i { return; \"unreachable\"; }\l}\l,\lexiting scope_1 expr loop {\l if x == 0i { break ; \"unreachable\"; }\l x -= 1i;\l loop {\l if y == 0i { break ; \"unreachable\"; }\l y -= 1i;\l loop { if z == 0i { break ; \"unreachable\"; } z -= 1i; }\l if x > 10i { return; \"unreachable\"; }\l }\l}\l"]; + N67 -> N1[label="exiting scope_0 expr loop {\l if y == 0is { break ; \"unreachable\"; }\l y -= 1is;\l loop { if z == 0is { break ; \"unreachable\"; } z -= 1is; }\l if x > 10is { return; \"unreachable\"; }\l}\l,\lexiting scope_1 expr loop {\l if x == 0is { break ; \"unreachable\"; }\l x -= 1is;\l loop {\l if y == 0is { break ; \"unreachable\"; }\l y -= 1is;\l loop { if z == 0is { break ; \"unreachable\"; } z -= 1is; }\l if x > 10is { return; \"unreachable\"; }\l }\l}\l"]; N68 -> N69; N69 -> N70; N70 -> N71; diff --git a/src/test/run-make/graphviz-flowgraph/f25.dot-expected.dot b/src/test/run-make/graphviz-flowgraph/f25.dot-expected.dot index 9fd4dbfc39553..82799c724b0bd 100644 --- a/src/test/run-make/graphviz-flowgraph/f25.dot-expected.dot +++ b/src/test/run-make/graphviz-flowgraph/f25.dot-expected.dot @@ -1,81 +1,81 @@ digraph block { N0[label="entry"]; N1[label="exit"]; - N2[label="expr 25i"]; + N2[label="expr 25is"]; N3[label="local mut x"]; - N4[label="stmt let mut x = 25i;"]; - N5[label="expr 25i"]; + N4[label="stmt let mut x = 25is;"]; + N5[label="expr 25is"]; N6[label="local mut y"]; - N7[label="stmt let mut y = 25i;"]; - N8[label="expr 25i"]; + N7[label="stmt let mut y = 25is;"]; + N8[label="expr 25is"]; N9[label="local mut z"]; - N10[label="stmt let mut z = 25i;"]; + N10[label="stmt let mut z = 25is;"]; N11[label="(dummy_node)"]; - N12[label="expr \'a:\l loop {\l if x == 0i { break ; \"unreachable\"; }\l x -= 1i;\l \'a:\l loop {\l if y == 0i { break ; \"unreachable\"; }\l y -= 1i;\l \'a: loop { if z == 0i { break ; \"unreachable\"; } z -= 1i; }\l if x > 10i { continue \'a ; \"unreachable\"; }\l }\l }\l"]; + N12[label="expr \'a:\l loop {\l if x == 0is { break ; \"unreachable\"; }\l x -= 1is;\l \'a:\l loop {\l if y == 0is { break ; \"unreachable\"; }\l y -= 1is;\l \'a: loop { if z == 0is { break ; \"unreachable\"; } z -= 1is; }\l if x > 10is { continue \'a ; \"unreachable\"; }\l }\l }\l"]; N13[label="expr x"]; - N14[label="expr 0i"]; - N15[label="expr x == 0i"]; + N14[label="expr 0is"]; + N15[label="expr x == 0is"]; N16[label="expr break"]; N17[label="(dummy_node)"]; N18[label="stmt break ;"]; N19[label="expr \"unreachable\""]; N20[label="stmt \"unreachable\";"]; N21[label="block { break ; \"unreachable\"; }"]; - N22[label="expr if x == 0i { break ; \"unreachable\"; }"]; - N23[label="stmt if x == 0i { break ; \"unreachable\"; }"]; - N24[label="expr 1i"]; + N22[label="expr if x == 0is { break ; \"unreachable\"; }"]; + N23[label="stmt if x == 0is { break ; \"unreachable\"; }"]; + N24[label="expr 1is"]; N25[label="expr x"]; - N26[label="expr x -= 1i"]; - N27[label="stmt x -= 1i;"]; + N26[label="expr x -= 1is"]; + N27[label="stmt x -= 1is;"]; N28[label="(dummy_node)"]; - N29[label="expr \'a:\l loop {\l if y == 0i { break ; \"unreachable\"; }\l y -= 1i;\l \'a: loop { if z == 0i { break ; \"unreachable\"; } z -= 1i; }\l if x > 10i { continue \'a ; \"unreachable\"; }\l }\l"]; + N29[label="expr \'a:\l loop {\l if y == 0is { break ; \"unreachable\"; }\l y -= 1is;\l \'a: loop { if z == 0is { break ; \"unreachable\"; } z -= 1is; }\l if x > 10is { continue \'a ; \"unreachable\"; }\l }\l"]; N30[label="expr y"]; - N31[label="expr 0i"]; - N32[label="expr y == 0i"]; + N31[label="expr 0is"]; + N32[label="expr y == 0is"]; N33[label="expr break"]; N34[label="(dummy_node)"]; N35[label="stmt break ;"]; N36[label="expr \"unreachable\""]; N37[label="stmt \"unreachable\";"]; N38[label="block { break ; \"unreachable\"; }"]; - N39[label="expr if y == 0i { break ; \"unreachable\"; }"]; - N40[label="stmt if y == 0i { break ; \"unreachable\"; }"]; - N41[label="expr 1i"]; + N39[label="expr if y == 0is { break ; \"unreachable\"; }"]; + N40[label="stmt if y == 0is { break ; \"unreachable\"; }"]; + N41[label="expr 1is"]; N42[label="expr y"]; - N43[label="expr y -= 1i"]; - N44[label="stmt y -= 1i;"]; + N43[label="expr y -= 1is"]; + N44[label="stmt y -= 1is;"]; N45[label="(dummy_node)"]; - N46[label="expr \'a: loop { if z == 0i { break ; \"unreachable\"; } z -= 1i; }"]; + N46[label="expr \'a: loop { if z == 0is { break ; \"unreachable\"; } z -= 1is; }"]; N47[label="expr z"]; - N48[label="expr 0i"]; - N49[label="expr z == 0i"]; + N48[label="expr 0is"]; + N49[label="expr z == 0is"]; N50[label="expr break"]; N51[label="(dummy_node)"]; N52[label="stmt break ;"]; N53[label="expr \"unreachable\""]; N54[label="stmt \"unreachable\";"]; N55[label="block { break ; \"unreachable\"; }"]; - N56[label="expr if z == 0i { break ; \"unreachable\"; }"]; - N57[label="stmt if z == 0i { break ; \"unreachable\"; }"]; - N58[label="expr 1i"]; + N56[label="expr if z == 0is { break ; \"unreachable\"; }"]; + N57[label="stmt if z == 0is { break ; \"unreachable\"; }"]; + N58[label="expr 1is"]; N59[label="expr z"]; - N60[label="expr z -= 1i"]; - N61[label="stmt z -= 1i;"]; - N62[label="block { if z == 0i { break ; \"unreachable\"; } z -= 1i; }"]; - N63[label="stmt \'a: loop { if z == 0i { break ; \"unreachable\"; } z -= 1i; }"]; + N60[label="expr z -= 1is"]; + N61[label="stmt z -= 1is;"]; + N62[label="block { if z == 0is { break ; \"unreachable\"; } z -= 1is; }"]; + N63[label="stmt \'a: loop { if z == 0is { break ; \"unreachable\"; } z -= 1is; }"]; N64[label="expr x"]; - N65[label="expr 10i"]; - N66[label="expr x > 10i"]; + N65[label="expr 10is"]; + N66[label="expr x > 10is"]; N67[label="expr continue \'a"]; N68[label="(dummy_node)"]; N69[label="stmt continue \'a ;"]; N70[label="expr \"unreachable\""]; N71[label="stmt \"unreachable\";"]; N72[label="block { continue \'a ; \"unreachable\"; }"]; - N73[label="expr if x > 10i { continue \'a ; \"unreachable\"; }"]; - N74[label="block {\l if y == 0i { break ; \"unreachable\"; }\l y -= 1i;\l \'a: loop { if z == 0i { break ; \"unreachable\"; } z -= 1i; }\l if x > 10i { continue \'a ; \"unreachable\"; }\l}\l"]; - N75[label="block {\l if x == 0i { break ; \"unreachable\"; }\l x -= 1i;\l \'a:\l loop {\l if y == 0i { break ; \"unreachable\"; }\l y -= 1i;\l \'a: loop { if z == 0i { break ; \"unreachable\"; } z -= 1i; }\l if x > 10i { continue \'a ; \"unreachable\"; }\l }\l}\l"]; - N76[label="block {\l let mut x = 25i;\l let mut y = 25i;\l let mut z = 25i;\l \'a:\l loop {\l if x == 0i { break ; \"unreachable\"; }\l x -= 1i;\l \'a:\l loop {\l if y == 0i { break ; \"unreachable\"; }\l y -= 1i;\l \'a:\l loop {\l if z == 0i { break ; \"unreachable\"; }\l z -= 1i;\l }\l if x > 10i { continue \'a ; \"unreachable\"; }\l }\l }\l}\l"]; + N73[label="expr if x > 10is { continue \'a ; \"unreachable\"; }"]; + N74[label="block {\l if y == 0is { break ; \"unreachable\"; }\l y -= 1is;\l \'a: loop { if z == 0is { break ; \"unreachable\"; } z -= 1is; }\l if x > 10is { continue \'a ; \"unreachable\"; }\l}\l"]; + N75[label="block {\l if x == 0is { break ; \"unreachable\"; }\l x -= 1is;\l \'a:\l loop {\l if y == 0is { break ; \"unreachable\"; }\l y -= 1is;\l \'a: loop { if z == 0is { break ; \"unreachable\"; } z -= 1is; }\l if x > 10is { continue \'a ; \"unreachable\"; }\l }\l}\l"]; + N76[label="block {\l let mut x = 25is;\l let mut y = 25is;\l let mut z = 25is;\l \'a:\l loop {\l if x == 0is { break ; \"unreachable\"; }\l x -= 1is;\l \'a:\l loop {\l if y == 0is { break ; \"unreachable\"; }\l y -= 1is;\l \'a:\l loop {\l if z == 0is { break ; \"unreachable\"; }\l z -= 1is;\l }\l if x > 10is { continue \'a ; \"unreachable\"; }\l }\l }\l}\l"]; N0 -> N2; N2 -> N3; N3 -> N4; @@ -90,7 +90,7 @@ digraph block { N13 -> N14; N14 -> N15; N15 -> N16; - N16 -> N12[label="exiting scope_0 expr break,\lexiting scope_1 stmt break ;,\lexiting scope_2 block { break ; \"unreachable\"; },\lexiting scope_3 expr if x == 0i { break ; \"unreachable\"; },\lexiting scope_4 stmt if x == 0i { break ; \"unreachable\"; },\lexiting scope_5 block {\l if x == 0i { break ; \"unreachable\"; }\l x -= 1i;\l \'a:\l loop {\l if y == 0i { break ; \"unreachable\"; }\l y -= 1i;\l \'a: loop { if z == 0i { break ; \"unreachable\"; } z -= 1i; }\l if x > 10i { continue \'a ; \"unreachable\"; }\l }\l}\l"]; + N16 -> N12[label="exiting scope_0 expr break,\lexiting scope_1 stmt break ;,\lexiting scope_2 block { break ; \"unreachable\"; },\lexiting scope_3 expr if x == 0is { break ; \"unreachable\"; },\lexiting scope_4 stmt if x == 0is { break ; \"unreachable\"; },\lexiting scope_5 block {\l if x == 0is { break ; \"unreachable\"; }\l x -= 1is;\l \'a:\l loop {\l if y == 0is { break ; \"unreachable\"; }\l y -= 1is;\l \'a: loop { if z == 0is { break ; \"unreachable\"; } z -= 1is; }\l if x > 10is { continue \'a ; \"unreachable\"; }\l }\l}\l"]; N17 -> N18; N18 -> N19; N19 -> N20; @@ -107,7 +107,7 @@ digraph block { N30 -> N31; N31 -> N32; N32 -> N33; - N33 -> N29[label="exiting scope_0 expr break,\lexiting scope_1 stmt break ;,\lexiting scope_2 block { break ; \"unreachable\"; },\lexiting scope_3 expr if y == 0i { break ; \"unreachable\"; },\lexiting scope_4 stmt if y == 0i { break ; \"unreachable\"; },\lexiting scope_5 block {\l if y == 0i { break ; \"unreachable\"; }\l y -= 1i;\l \'a: loop { if z == 0i { break ; \"unreachable\"; } z -= 1i; }\l if x > 10i { continue \'a ; \"unreachable\"; }\l}\l"]; + N33 -> N29[label="exiting scope_0 expr break,\lexiting scope_1 stmt break ;,\lexiting scope_2 block { break ; \"unreachable\"; },\lexiting scope_3 expr if y == 0is { break ; \"unreachable\"; },\lexiting scope_4 stmt if y == 0is { break ; \"unreachable\"; },\lexiting scope_5 block {\l if y == 0is { break ; \"unreachable\"; }\l y -= 1is;\l \'a: loop { if z == 0is { break ; \"unreachable\"; } z -= 1is; }\l if x > 10is { continue \'a ; \"unreachable\"; }\l}\l"]; N34 -> N35; N35 -> N36; N36 -> N37; @@ -124,7 +124,7 @@ digraph block { N47 -> N48; N48 -> N49; N49 -> N50; - N50 -> N46[label="exiting scope_0 expr break,\lexiting scope_1 stmt break ;,\lexiting scope_2 block { break ; \"unreachable\"; },\lexiting scope_3 expr if z == 0i { break ; \"unreachable\"; },\lexiting scope_4 stmt if z == 0i { break ; \"unreachable\"; },\lexiting scope_5 block { if z == 0i { break ; \"unreachable\"; } z -= 1i; }"]; + N50 -> N46[label="exiting scope_0 expr break,\lexiting scope_1 stmt break ;,\lexiting scope_2 block { break ; \"unreachable\"; },\lexiting scope_3 expr if z == 0is { break ; \"unreachable\"; },\lexiting scope_4 stmt if z == 0is { break ; \"unreachable\"; },\lexiting scope_5 block { if z == 0is { break ; \"unreachable\"; } z -= 1is; }"]; N51 -> N52; N52 -> N53; N53 -> N54; @@ -143,7 +143,7 @@ digraph block { N64 -> N65; N65 -> N66; N66 -> N67; - N67 -> N28[label="exiting scope_0 expr continue \'a,\lexiting scope_1 stmt continue \'a ;,\lexiting scope_2 block { continue \'a ; \"unreachable\"; },\lexiting scope_3 expr if x > 10i { continue \'a ; \"unreachable\"; },\lexiting scope_4 block {\l if y == 0i { break ; \"unreachable\"; }\l y -= 1i;\l \'a: loop { if z == 0i { break ; \"unreachable\"; } z -= 1i; }\l if x > 10i { continue \'a ; \"unreachable\"; }\l}\l"]; + N67 -> N28[label="exiting scope_0 expr continue \'a,\lexiting scope_1 stmt continue \'a ;,\lexiting scope_2 block { continue \'a ; \"unreachable\"; },\lexiting scope_3 expr if x > 10is { continue \'a ; \"unreachable\"; },\lexiting scope_4 block {\l if y == 0is { break ; \"unreachable\"; }\l y -= 1is;\l \'a: loop { if z == 0is { break ; \"unreachable\"; } z -= 1is; }\l if x > 10is { continue \'a ; \"unreachable\"; }\l}\l"]; N68 -> N69; N69 -> N70; N70 -> N71;