From 66c507cc32898123887e3c3b96b0198d8532840e Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Thu, 26 Feb 2015 17:56:19 +0100 Subject: [PATCH 1/2] Replace uint by usize Conflicts: src/libcore/panicking.rs --- src/libcore/panicking.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libcore/panicking.rs b/src/libcore/panicking.rs index 168dcf4978c46..307e8225ef83a 100644 --- a/src/libcore/panicking.rs +++ b/src/libcore/panicking.rs @@ -16,7 +16,7 @@ //! interface for panicking is: //! //! ```ignore -//! fn panic_impl(fmt: fmt::Arguments, &(&'static str, uint)) -> !; +//! fn panic_impl(fmt: fmt::Arguments, &(&'static str, u64)) -> !; //! ``` //! //! This definition allows for panicking with any general message, but it does not @@ -66,11 +66,11 @@ fn panic_bounds_check(file_line: &(&'static str, u32), #[cold] #[inline(never)] #[cfg(stage0)] -pub fn panic_fmt(fmt: fmt::Arguments, file_line: &(&'static str, usize)) -> ! { +pub fn panic_fmt(fmt: fmt::Arguments, file_line: &(&'static str, u64)) -> ! { #[allow(improper_ctypes)] extern { #[lang = "panic_fmt"] - fn panic_impl(fmt: fmt::Arguments, file: &'static str, line: uint) -> !; + fn panic_impl(fmt: fmt::Arguments, file: &'static str, line: u64) -> !; } let (file, line) = *file_line; unsafe { panic_impl(fmt, file, line as uint) } @@ -81,7 +81,7 @@ pub fn panic_fmt(fmt: fmt::Arguments, file_line: &(&'static str, u32)) -> ! { #[allow(improper_ctypes)] extern { #[lang = "panic_fmt"] - fn panic_impl(fmt: fmt::Arguments, file: &'static str, line: uint) -> !; + fn panic_impl(fmt: fmt::Arguments, file: &'static str, line: u32) -> !; } let (file, line) = *file_line; unsafe { panic_impl(fmt, file, line as uint) } From ca2cd0f83a1c9c4deebabd2a2cf35b36262fec38 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Thu, 26 Feb 2015 17:57:32 +0100 Subject: [PATCH 2/2] Replace usize in favor of u64 after discussing with @aturon Conflicts: src/libcore/panicking.rs --- src/libcore/panicking.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libcore/panicking.rs b/src/libcore/panicking.rs index 307e8225ef83a..c045c7ae7d669 100644 --- a/src/libcore/panicking.rs +++ b/src/libcore/panicking.rs @@ -85,4 +85,4 @@ pub fn panic_fmt(fmt: fmt::Arguments, file_line: &(&'static str, u32)) -> ! { } let (file, line) = *file_line; unsafe { panic_impl(fmt, file, line as uint) } -} +} \ No newline at end of file