librustc: Remove the fallback to `int` for integers and `f64` for

floating point numbers for real.

This will break code that looks like:

    let mut x = 0;
    while ... {
        x += 1;
    }
    println!("{}", x);

Change that code to:

    let mut x = 0i;
    while ... {
        x += 1;
    }
    println!("{}", x);

Closes #15201.

[breaking-change]

32 files changed, 88 insertions, 85 deletions

diff --git a/src/test/debuginfo/basic-types-metadata.rs b/src/test/debuginfo/basic-types-metadata.rs
index da32518d993..51d2f36cc78 100644
--- a/src/test/debuginfo/basic-types-metadata.rs
+++ b/src/test/debuginfo/basic-types-metadata.rs
@@ -67,7 +67,7 @@ fn main() {
     let f32: f32 = 2.5;
     let f64: f64 = 3.5;
     _zzz();
-    if 1 == 1 { _yyy(); }
+    if 1i == 1 { _yyy(); }
 }
 
 fn _zzz() {()}
diff --git a/src/test/debuginfo/box.rs b/src/test/debuginfo/box.rs
index 01129c845e9..dcfe1804510 100644
--- a/src/test/debuginfo/box.rs
+++ b/src/test/debuginfo/box.rs
@@ -30,9 +30,9 @@
 use std::gc::GC;
 
 fn main() {
-    let a = box 1;
-    let b = box() (2, 3.5);
-    let c = box(GC) 4;
+    let a = box 1i;
+    let b = box() (2i, 3.5f64);
+    let c = box(GC) 4i;
     let d = box(GC) false;
     _zzz();
 }
diff --git a/src/test/debuginfo/closure-in-generic-function.rs b/src/test/debuginfo/closure-in-generic-function.rs
index 7a89b682d15..cc241040f2b 100644
--- a/src/test/debuginfo/closure-in-generic-function.rs
+++ b/src/test/debuginfo/closure-in-generic-function.rs
@@ -39,8 +39,8 @@ fn some_generic_fun<T1, T2>(a: T1, b: T2) -> (T2, T1) {
 }
 
 fn main() {
-    some_generic_fun(0.5, 10);
-    some_generic_fun(&29, box 110);
+    some_generic_fun(0.5f64, 10i);
+    some_generic_fun(&29i, box 110i);
 }
 
 fn zzz() {()}
diff --git a/src/test/debuginfo/destructured-local.rs b/src/test/debuginfo/destructured-local.rs
index c543a11475e..d91d98f4305 100644
--- a/src/test/debuginfo/destructured-local.rs
+++ b/src/test/debuginfo/destructured-local.rs
@@ -156,7 +156,7 @@ fn main() {
     let Struct { a: k, b: l } = Struct { a: 12, b: 13 };
 
     // ignored tuple element
-    let (m, _, n) = (14, 15, 16);
+    let (m, _, n) = (14i, 15i, 16i);
 
     // ignored struct field
     let Struct { b: o, .. } = Struct { a: 17, b: 18 };
@@ -169,25 +169,25 @@ fn main() {
 
     // complex nesting
     let ((u, v), ((w, (x, Struct { a: y, b: z})), Struct { a: ae, b: oe }), ue) =
-        ((25, 26), ((27, (28, Struct { a: 29, b: 30})), Struct { a: 31, b: 32 }), 33);
+        ((25i, 26i), ((27i, (28i, Struct { a: 29, b: 30})), Struct { a: 31, b: 32 }), 33i);
 
     // reference
-    let &aa = &(34, 35);
+    let &aa = &(34i, 35i);
 
     // reference
-    let &bb = &(36, 37);
+    let &bb = &(36i, 37i);
 
     // contained reference
-    let (&cc, _) = (&38, 39);
+    let (&cc, _) = (&38i, 39i);
 
     // unique pointer
-    let box dd = box() (40, 41, 42);
+    let box dd = box() (40i, 41i, 42i);
 
     // ref binding
-    let ref ee = (43, 44, 45);
+    let ref ee = (43i, 44i, 45i);
 
     // ref binding in tuple
-    let (ref ff, gg) = (46, (47, 48));
+    let (ref ff, gg) = (46i, (47i, 48i));
 
     // ref binding in struct
     let Struct { b: ref hh, .. } = Struct { a: 49, b: 50 };
diff --git a/src/test/debuginfo/function-arg-initialization.rs b/src/test/debuginfo/function-arg-initialization.rs
index d439f49fe69..535efa0b84e 100644
--- a/src/test/debuginfo/function-arg-initialization.rs
+++ b/src/test/debuginfo/function-arg-initialization.rs
@@ -155,7 +155,7 @@ fn non_immediate_args(a: BigStruct, b: BigStruct) {
 }
 
 fn binding(a: i64, b: u64, c: f64) {
-    let x = 0;
+    let x = 0i;
 }
 
 fn assignment(mut a: u64, b: u64, c: f64) {
diff --git a/src/test/debuginfo/function-prologue-stepping-no-split-stack.rs b/src/test/debuginfo/function-prologue-stepping-no-split-stack.rs
index a9ccf3cdb16..0160a6f1879 100644
--- a/src/test/debuginfo/function-prologue-stepping-no-split-stack.rs
+++ b/src/test/debuginfo/function-prologue-stepping-no-split-stack.rs
@@ -152,7 +152,7 @@ fn non_immediate_args(a: BigStruct, b: BigStruct) {
 
 #[no_split_stack]
 fn binding(a: i64, b: u64, c: f64) {
-    let x = 0;
+    let x = 0i;
 }
 
 #[no_split_stack]
diff --git a/src/test/debuginfo/generic-functions-nested.rs b/src/test/debuginfo/generic-functions-nested.rs
index d9b20a84cdd..1805405dc1e 100644
--- a/src/test/debuginfo/generic-functions-nested.rs
+++ b/src/test/debuginfo/generic-functions-nested.rs
@@ -43,8 +43,8 @@
 // gdb-command:continue
 
 fn outer<TA: Clone>(a: TA) {
-    inner(a.clone(), 1);
-    inner(a.clone(), 2.5);
+    inner(a.clone(), 1i);
+    inner(a.clone(), 2.5f64);
 
     fn inner<TX, TY>(x: TX, y: TY) {
         zzz();
diff --git a/src/test/debuginfo/generic-method-on-generic-struct.rs b/src/test/debuginfo/generic-method-on-generic-struct.rs
index ad088d9a5eb..9ed1c0175a9 100644
--- a/src/test/debuginfo/generic-method-on-generic-struct.rs
+++ b/src/test/debuginfo/generic-method-on-generic-struct.rs
@@ -91,7 +91,7 @@ fn main() {
     let _ = stack.self_by_ref(-1, -2_i8);
     let _ = stack.self_by_val(-3, -4_i16);
 
-    let owned = box Struct { x: 1234.5 };
+    let owned = box Struct { x: 1234.5f64 };
     let _ = owned.self_by_ref(-5, -6_i32);
     let _ = owned.self_by_val(-7, -8_i64);
     let _ = owned.self_owned(-9, -10.5_f32);
diff --git a/src/test/debuginfo/generic-static-method-on-struct-and-enum.rs b/src/test/debuginfo/generic-static-method-on-struct-and-enum.rs
index 82a9d708966..b62b6f186b9 100644
--- a/src/test/debuginfo/generic-static-method-on-struct-and-enum.rs
+++ b/src/test/debuginfo/generic-static-method-on-struct-and-enum.rs
@@ -61,8 +61,8 @@ impl Enum {
 }
 
 fn main() {
-    Struct::static_method(1, 2);
-    Enum::static_method(-3, 4.5, 5);
+    Struct::static_method(1i, 2i);
+    Enum::static_method(-3i, 4.5f64, 5i);
 }
 
 fn zzz() {()}
diff --git a/src/test/debuginfo/generic-struct-style-enum.rs b/src/test/debuginfo/generic-struct-style-enum.rs
index eddf4dfd755..7fec116b8e5 100644
--- a/src/test/debuginfo/generic-struct-style-enum.rs
+++ b/src/test/debuginfo/generic-struct-style-enum.rs
@@ -72,7 +72,7 @@ fn main() {
     // 0b01011001 = 89
     let case3: Regular<u16, i32, u64>  = Case3 { a: 0, b: 6438275382588823897 };
 
-    let univariant = TheOnlyCase { a: -1 };
+    let univariant = TheOnlyCase { a: -1i };
 
     zzz();
 }
diff --git a/src/test/debuginfo/generic-struct.rs b/src/test/debuginfo/generic-struct.rs
index 69217f4b878..a2c5a0973fc 100644
--- a/src/test/debuginfo/generic-struct.rs
+++ b/src/test/debuginfo/generic-struct.rs
@@ -31,10 +31,13 @@ struct AGenericStruct<TKey, TValue> {
 
 fn main() {
 
-    let int_int = AGenericStruct { key: 0, value: 1 };
-    let int_float = AGenericStruct { key: 2, value: 3.5 };
-    let float_int = AGenericStruct { key: 4.5, value: 5 };
-    let float_int_float = AGenericStruct { key: 6.5, value: AGenericStruct { key: 7, value: 8.5 } };
+    let int_int = AGenericStruct { key: 0i, value: 1i };
+    let int_float = AGenericStruct { key: 2i, value: 3.5f64 };
+    let float_int = AGenericStruct { key: 4.5f64, value: 5i };
+    let float_int_float = AGenericStruct {
+        key: 6.5f64,
+        value: AGenericStruct { key: 7i, value: 8.5f64 },
+    };
 
     zzz();
 }
diff --git a/src/test/debuginfo/lexical-scope-in-for-loop.rs b/src/test/debuginfo/lexical-scope-in-for-loop.rs
index 0f6ac953179..0fb823a74cc 100644
--- a/src/test/debuginfo/lexical-scope-in-for-loop.rs
+++ b/src/test/debuginfo/lexical-scope-in-for-loop.rs
@@ -55,15 +55,15 @@
 
 fn main() {
 
-    let range = [1, 2, 3];
+    let range = [1i, 2, 3];
 
-    let x = 1000000; // wan meeeljen doollaars!
+    let x = 1000000i; // wan meeeljen doollaars!
 
     for &x in range.iter() {
         zzz();
         sentinel();
 
-        let x = -1 * x;
+        let x = -1i * x;
 
         zzz();
         sentinel();
diff --git a/src/test/debuginfo/lexical-scope-in-if.rs b/src/test/debuginfo/lexical-scope-in-if.rs
index ef573735d0d..6018e62af00 100644
--- a/src/test/debuginfo/lexical-scope-in-if.rs
+++ b/src/test/debuginfo/lexical-scope-in-if.rs
@@ -80,8 +80,8 @@
 
 fn main() {
 
-    let x = 999;
-    let y = -1;
+    let x = 999i;
+    let y = -1i;
 
     zzz();
     sentinel();
@@ -90,13 +90,13 @@ fn main() {
         zzz();
         sentinel();
 
-        let x = 1001;
+        let x = 1001i;
 
         zzz();
         sentinel();
 
-        let x = 1002;
-        let y = 1003;
+        let x = 1002i;
+        let y = 1003i;
         zzz();
         sentinel();
     } else {
@@ -112,8 +112,8 @@ fn main() {
         zzz();
         sentinel();
 
-        let x = 1004;
-        let y = 1005;
+        let x = 1004i;
+        let y = 1005i;
         zzz();
         sentinel();
     }
diff --git a/src/test/debuginfo/lexical-scope-in-match.rs b/src/test/debuginfo/lexical-scope-in-match.rs
index b347afbbbcd..7bec677e4b1 100644
--- a/src/test/debuginfo/lexical-scope-in-match.rs
+++ b/src/test/debuginfo/lexical-scope-in-match.rs
@@ -81,13 +81,13 @@ struct Struct {
 
 fn main() {
 
-    let shadowed = 231;
-    let not_shadowed = 232;
+    let shadowed = 231i;
+    let not_shadowed = 232i;
 
     zzz();
     sentinel();
 
-    match (233, 234) {
+    match (233i, 234i) {
         (shadowed, local_to_arm) => {
 
             zzz();
@@ -95,7 +95,7 @@ fn main() {
         }
     }
 
-    match (235, 236) {
+    match (235i, 236i) {
         // with literal
         (235, shadowed) => {
 
@@ -132,7 +132,7 @@ fn main() {
         _ => {}
     }
 
-    match (243, 244) {
+    match (243i, 244i) {
         (shadowed, ref local_to_arm) => {
 
             zzz();
diff --git a/src/test/debuginfo/lexical-scope-in-parameterless-closure.rs b/src/test/debuginfo/lexical-scope-in-parameterless-closure.rs
index ad8f04d1fc7..0e47f2c9921 100644
--- a/src/test/debuginfo/lexical-scope-in-parameterless-closure.rs
+++ b/src/test/debuginfo/lexical-scope-in-parameterless-closure.rs
@@ -16,6 +16,6 @@
 // Nothing to do here really, just make sure it compiles. See issue #8513.
 fn main() {
     let _ = ||();
-    let _ = range(1u,3).map(|_| 5);
+    let _ = range(1u,3).map(|_| 5i);
 }
 
diff --git a/src/test/debuginfo/lexical-scope-in-stack-closure.rs b/src/test/debuginfo/lexical-scope-in-stack-closure.rs
index c56cdbe0315..0168eaa86c2 100644
--- a/src/test/debuginfo/lexical-scope-in-stack-closure.rs
+++ b/src/test/debuginfo/lexical-scope-in-stack-closure.rs
@@ -55,7 +55,7 @@ fn main() {
         zzz();
         sentinel();
 
-        let x = 2.5;
+        let x = 2.5f64;
 
         zzz();
         sentinel();
diff --git a/src/test/debuginfo/lexical-scope-in-unconditional-loop.rs b/src/test/debuginfo/lexical-scope-in-unconditional-loop.rs
index 12e95c4f9c7..48edd7ae12a 100644
--- a/src/test/debuginfo/lexical-scope-in-unconditional-loop.rs
+++ b/src/test/debuginfo/lexical-scope-in-unconditional-loop.rs
@@ -84,7 +84,7 @@
 
 fn main() {
 
-    let mut x = 0;
+    let mut x = 0i;
 
     loop {
         if x >= 2 {
@@ -108,7 +108,7 @@ fn main() {
             zzz();
             sentinel();
 
-            let x = -987;
+            let x = -987i;
 
             zzz();
             sentinel();
diff --git a/src/test/debuginfo/lexical-scope-in-unique-closure.rs b/src/test/debuginfo/lexical-scope-in-unique-closure.rs
index 328910b0f13..ce3b2a530e2 100644
--- a/src/test/debuginfo/lexical-scope-in-unique-closure.rs
+++ b/src/test/debuginfo/lexical-scope-in-unique-closure.rs
@@ -55,7 +55,7 @@ fn main() {
         zzz();
         sentinel();
 
-        let x = 2.5;
+        let x = 2.5f64;
 
         zzz();
         sentinel();
diff --git a/src/test/debuginfo/lexical-scope-in-while.rs b/src/test/debuginfo/lexical-scope-in-while.rs
index 1b2a9f75182..d726eb6581e 100644
--- a/src/test/debuginfo/lexical-scope-in-while.rs
+++ b/src/test/debuginfo/lexical-scope-in-while.rs
@@ -84,7 +84,7 @@
 
 fn main() {
 
-    let mut x = 0;
+    let mut x = 0i;
 
     while x < 2 {
         zzz();
@@ -104,7 +104,7 @@ fn main() {
             zzz();
             sentinel();
 
-            let x = -987;
+            let x = -987i;
 
             zzz();
             sentinel();
diff --git a/src/test/debuginfo/lexical-scope-with-macro.rs b/src/test/debuginfo/lexical-scope-with-macro.rs
index 3fb6f10fe33..e55271239d4 100644
--- a/src/test/debuginfo/lexical-scope-with-macro.rs
+++ b/src/test/debuginfo/lexical-scope-with-macro.rs
@@ -77,7 +77,7 @@ macro_rules! no_new_scope(
 
 macro_rules! new_scope(
     () => ({
-        let a = 890242;
+        let a = 890242i;
         zzz();
         sentinel();
     })
@@ -105,8 +105,8 @@ macro_rules! dup_expr(
 
 fn main() {
 
-    let a = trivial!(10);
-    let b = no_new_scope!(33);
+    let a = trivial!(10i);
+    let b = no_new_scope!(33i);
 
     zzz();
     sentinel();
@@ -116,12 +116,12 @@ fn main() {
     zzz();
     sentinel();
 
-    shadow_within_macro!(100);
+    shadow_within_macro!(100i);
 
     zzz();
     sentinel();
 
-    let c = dup_expr!(10 * 20);
+    let c = dup_expr!(10i * 20);
 
     zzz();
     sentinel();
diff --git a/src/test/debuginfo/lexical-scopes-in-block-expression.rs b/src/test/debuginfo/lexical-scopes-in-block-expression.rs
index 41b88dc3e98..2a9969dc6e9 100644
--- a/src/test/debuginfo/lexical-scopes-in-block-expression.rs
+++ b/src/test/debuginfo/lexical-scopes-in-block-expression.rs
@@ -227,8 +227,8 @@ fn a_function(x: int) -> int {
 
 fn main() {
 
-    let val = -1;
-    let ten = 10;
+    let val = -1i;
+    let ten = 10i;
 
     // surrounded by struct expression
     let point = Point {
@@ -280,7 +280,7 @@ fn main() {
         sentinel();
 
         val
-    }, 0);
+    }, 0i);
 
     zzz();
     sentinel();
@@ -355,7 +355,7 @@ fn main() {
     sentinel();
 
     // index expression
-    let a_vector = [10, ..20];
+    let a_vector = [10i, ..20];
     let _ = a_vector[{
         zzz();
         sentinel();
diff --git a/src/test/debuginfo/limited-debuginfo.rs b/src/test/debuginfo/limited-debuginfo.rs
index 616f312c078..9cda2c45131 100644
--- a/src/test/debuginfo/limited-debuginfo.rs
+++ b/src/test/debuginfo/limited-debuginfo.rs
@@ -46,7 +46,7 @@ fn zzz() {()}
 
 fn some_function(a: int, b: int) {
     let some_variable = Struct { a: 11, b: 22 };
-    let some_other_variable = 23;
+    let some_other_variable = 23i;
     zzz();
 }
 
diff --git a/src/test/debuginfo/managed-pointer-within-unique.rs b/src/test/debuginfo/managed-pointer-within-unique.rs
index b56db2d1846..cc18ea64f38 100644
--- a/src/test/debuginfo/managed-pointer-within-unique.rs
+++ b/src/test/debuginfo/managed-pointer-within-unique.rs
@@ -37,9 +37,9 @@ struct ContainsManaged {
 }
 
 fn main() {
-    let ordinary_unique = box() (-1, -2);
+    let ordinary_unique = box() (-1i, -2i);
 
-    let managed_within_unique = box ContainsManaged { x: -3, y: box(GC) -4 };
+    let managed_within_unique = box ContainsManaged { x: -3, y: box(GC) -4i };
 
     zzz();
 }
diff --git a/src/test/debuginfo/method-on-generic-struct.rs b/src/test/debuginfo/method-on-generic-struct.rs
index 2f7b0c845ea..0bac86b1e66 100644
--- a/src/test/debuginfo/method-on-generic-struct.rs
+++ b/src/test/debuginfo/method-on-generic-struct.rs
@@ -91,7 +91,7 @@ fn main() {
     let _ = stack.self_by_ref(-1, -2);
     let _ = stack.self_by_val(-3, -4);
 
-    let owned = box Struct { x: 1234.5 };
+    let owned = box Struct { x: 1234.5f64 };
     let _ = owned.self_by_ref(-5, -6);
     let _ = owned.self_by_val(-7, -8);
     let _ = owned.self_owned(-9, -10);
diff --git a/src/test/debuginfo/multiple-functions-equal-var-names.rs b/src/test/debuginfo/multiple-functions-equal-var-names.rs
index 510718254d9..9e40f03c201 100644
--- a/src/test/debuginfo/multiple-functions-equal-var-names.rs
+++ b/src/test/debuginfo/multiple-functions-equal-var-names.rs
@@ -31,18 +31,18 @@
 #![allow(unused_variable)]
 
 fn function_one() {
-    let abc = 10101;
+    let abc = 10101i;
     zzz();
 }
 
 fn function_two() {
-    let abc = 20202;
+    let abc = 20202i;
     zzz();
 }
 
 
 fn function_three() {
-    let abc = 30303;
+    let abc = 30303i;
     zzz();
 }
 
diff --git a/src/test/debuginfo/multiple-functions.rs b/src/test/debuginfo/multiple-functions.rs
index 362a8a93dd1..ef1c69f9eb8 100644
--- a/src/test/debuginfo/multiple-functions.rs
+++ b/src/test/debuginfo/multiple-functions.rs
@@ -31,18 +31,18 @@
 #![allow(unused_variable)]
 
 fn function_one() {
-    let a = 10101;
+    let a = 10101i;
     zzz();
 }
 
 fn function_two() {
-    let b = 20202;
+    let b = 20202i;
     zzz();
 }
 
 
 fn function_three() {
-    let c = 30303;
+    let c = 30303i;
     zzz();
 }
 
diff --git a/src/test/debuginfo/name-shadowing-and-scope-nesting.rs b/src/test/debuginfo/name-shadowing-and-scope-nesting.rs
index f967ced38ec..8ee6d434016 100644
--- a/src/test/debuginfo/name-shadowing-and-scope-nesting.rs
+++ b/src/test/debuginfo/name-shadowing-and-scope-nesting.rs
@@ -63,25 +63,25 @@ fn main() {
     zzz();
     sentinel();
 
-    let x = 10;
+    let x = 10i;
 
     zzz();
     sentinel();
 
-    let x = 10.5;
-    let y = 20;
+    let x = 10.5f64;
+    let y = 20i;
 
     zzz();
     sentinel();
 
     {
         let x = true;
-        let y = 2220;
+        let y = 2220i;
 
         zzz();
         sentinel();
 
-        let x = 203203.5;
+        let x = 203203.5f64;
 
         zzz();
         sentinel();
diff --git a/src/test/debuginfo/option-like-enum.rs b/src/test/debuginfo/option-like-enum.rs
index 04cd7e13863..de6d6814308 100644
--- a/src/test/debuginfo/option-like-enum.rs
+++ b/src/test/debuginfo/option-like-enum.rs
@@ -72,18 +72,18 @@ struct NamedFieldsRepr<'a> {
 
 fn main() {
 
-    let some: Option<&u32> = Some(unsafe { std::mem::transmute(0x12345678) });
+    let some: Option<&u32> = Some(unsafe { std::mem::transmute(0x12345678u) });
     let none: Option<&u32> = None;
 
-    let full = Full(454545, unsafe { std::mem::transmute(0x87654321) }, 9988);
+    let full = Full(454545, unsafe { std::mem::transmute(0x87654321u) }, 9988);
 
-    let int_val = 0;
+    let int_val = 0i;
     let empty: &MoreFieldsRepr = unsafe { std::mem::transmute(&Empty) };
 
     let droid = Droid {
         id: 675675,
         range: 10000001,
-        internals: unsafe { std::mem::transmute(0x43218765) }
+        internals: unsafe { std::mem::transmute(0x43218765u) }
     };
 
     let void_droid: &NamedFieldsRepr = unsafe { std::mem::transmute(&Void) };
diff --git a/src/test/debuginfo/shadowed-argument.rs b/src/test/debuginfo/shadowed-argument.rs
index 129263c0f76..c180d6b5bcf 100644
--- a/src/test/debuginfo/shadowed-argument.rs
+++ b/src/test/debuginfo/shadowed-argument.rs
@@ -39,13 +39,13 @@ fn a_function(x: bool, y: bool) {
     zzz();
     sentinel();
 
-    let x = 10;
+    let x = 10i;
 
     zzz();
     sentinel();
 
-    let x = 10.5;
-    let y = 20;
+    let x = 10.5f64;
+    let y = 20i;
 
     zzz();
     sentinel();
diff --git a/src/test/debuginfo/shadowed-variable.rs b/src/test/debuginfo/shadowed-variable.rs
index 825ecb9c0ca..88ef3c4879e 100644
--- a/src/test/debuginfo/shadowed-variable.rs
+++ b/src/test/debuginfo/shadowed-variable.rs
@@ -42,13 +42,13 @@ fn main() {
     zzz();
     sentinel();
 
-    let x = 10;
+    let x = 10i;
 
     zzz();
     sentinel();
 
-    let x = 10.5;
-    let y = 20;
+    let x = 10.5f64;
+    let y = 20i;
 
     zzz();
     sentinel();
diff --git a/src/test/debuginfo/simple-lexical-scope.rs b/src/test/debuginfo/simple-lexical-scope.rs
index 171e3eae659..107b64131e0 100644
--- a/src/test/debuginfo/simple-lexical-scope.rs
+++ b/src/test/debuginfo/simple-lexical-scope.rs
@@ -60,7 +60,7 @@ fn main() {
         zzz();
         sentinel();
 
-        let x = 10;
+        let x = 10i;
 
         zzz();
         sentinel();
@@ -69,7 +69,7 @@ fn main() {
             zzz();
             sentinel();
 
-            let x = 10.5;
+            let x = 10.5f64;
 
             zzz();
             sentinel();
diff --git a/src/test/debuginfo/vec.rs b/src/test/debuginfo/vec.rs
index 11f317469a2..155865f415b 100644
--- a/src/test/debuginfo/vec.rs
+++ b/src/test/debuginfo/vec.rs
@@ -26,7 +26,7 @@
 static mut VECT: [i32, ..3] = [1, 2, 3];
 
 fn main() {
-    let a = [1, 2, 3];
+    let a = [1i, 2, 3];
 
     unsafe {
         VECT[0] = 4;