about summary refs log tree commit diff
path: root/src/libhexfloat
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-06-29 19:46:46 +0000
committerbors <bors@rust-lang.org>2014-06-29 19:46:46 +0000
commitff94f867d29a90ab59060c10a62f65994776a8c4 (patch)
tree2a1eb17ef28c64da19f6b3248217d113e6a2b8bd /src/libhexfloat
parentcc5663ad55f3dc3a642c8e2c4043900783dcc9f8 (diff)
parenta5bb0a3a4574af88add700ace7aefc37172fa7a5 (diff)
downloadrust-ff94f867d29a90ab59060c10a62f65994776a8c4.tar.gz
rust-ff94f867d29a90ab59060c10a62f65994776a8c4.zip
auto merge of #15234 : pcwalton/rust/integer-fallback-and-casts, r=alexcrichton
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]

r? @alexcrichton
Diffstat (limited to 'src/libhexfloat')
-rw-r--r--src/libhexfloat/lib.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libhexfloat/lib.rs b/src/libhexfloat/lib.rs
index 351afc1c5d4..1b43f236e69 100644
--- a/src/libhexfloat/lib.rs
+++ b/src/libhexfloat/lib.rs
@@ -77,12 +77,12 @@ fn hex_float_lit_err(s: &str) -> Option<(uint, String)> {
     if chars.next() != Some('x') {
         return Some((i, "Expected 'x'".to_string()));
     } i+=1;
-    let mut d_len = 0;
+    let mut d_len = 0i;
     for _ in chars.take_while(|c| c.is_digit_radix(16)) { chars.next(); i+=1; d_len += 1;}
     if chars.next() != Some('.') {
         return Some((i, "Expected '.'".to_string()));
     } i+=1;
-    let mut f_len = 0;
+    let mut f_len = 0i;
     for _ in chars.take_while(|c| c.is_digit_radix(16)) { chars.next(); i+=1; f_len += 1;}
     if d_len == 0 && f_len == 0 {
         return Some((i, "Expected digits before or after decimal \
@@ -92,7 +92,7 @@ fn hex_float_lit_err(s: &str) -> Option<(uint, String)> {
         return Some((i, "Expected 'p'".to_string()));
     } i+=1;
     if chars.peek() == Some(&'-') { chars.next(); i+= 1 }
-    let mut e_len = 0;
+    let mut e_len = 0i;
     for _ in chars.take_while(|c| c.is_digit()) { chars.next(); i+=1; e_len += 1}
     if e_len == 0 {
         return Some((i, "Expected exponent digits".to_string()));