about summary refs log tree commit diff
path: root/src/libstd/rt
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-06-25 02:02:00 +0000
committerbors <bors@rust-lang.org>2014-06-25 02:02:00 +0000
commit91be86af0952aebb1f7c1811a6abcccd7bd1c26e (patch)
tree45fd08bfce0007e8e32453b94fd3229d1a13fba3 /src/libstd/rt
parent05ca9f747d62c9385cc142daa3c24a32d32a3f16 (diff)
parentcdccecb24f5c467282b73413494343d3848b4e5a (diff)
downloadrust-91be86af0952aebb1f7c1811a6abcccd7bd1c26e.tar.gz
rust-91be86af0952aebb1f7c1811a6abcccd7bd1c26e.zip
auto merge of #15163 : alexcrichton/rust/rollup, r=alexcrichton
Diffstat (limited to 'src/libstd/rt')
-rw-r--r--src/libstd/rt/backtrace.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/rt/backtrace.rs b/src/libstd/rt/backtrace.rs
index b98fe8f0aae..e3652ffac6e 100644
--- a/src/libstd/rt/backtrace.rs
+++ b/src/libstd/rt/backtrace.rs
@@ -949,7 +949,7 @@ mod imp {
         let _c = Cleanup { handle: process, SymCleanup: SymCleanup };
 
         // And now that we're done with all the setup, do the stack walking!
-        let mut i = 0;
+        let mut i = 0i;
         try!(write!(w, "stack backtrace:\n"));
         while StackWalk64(image, process, thread, &mut frame, &mut context,
                           0 as *libc::c_void, 0 as *libc::c_void,