From a3eb6e3ca16bbc7639230f241fe8d8c9fb15ac26 Mon Sep 17 00:00:00 2001 From: Nicholas Date: Sat, 7 Mar 2015 23:27:43 -0800 Subject: [PATCH 1/2] In panicking.rs, change to usize from uint --- src/libcore/panicking.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libcore/panicking.rs b/src/libcore/panicking.rs index c1c8ac9cc1fa7..38f26a30b5441 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, usize)) -> !; //! ``` //! //! This definition allows for panicking with any general message, but it does not @@ -52,8 +52,8 @@ 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: usize) -> !; } let (file, line) = *file_line; - unsafe { panic_impl(fmt, file, line as uint) } + unsafe { panic_impl(fmt, file, line as usize) } } From 9155bca3c41ea3be46cf974c3aec29f89fcc86bb Mon Sep 17 00:00:00 2001 From: Nicholas Date: Sun, 8 Mar 2015 10:06:04 -0700 Subject: [PATCH 2/2] And change again to u32 --- src/libcore/panicking.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libcore/panicking.rs b/src/libcore/panicking.rs index 38f26a30b5441..5d18570c5b002 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, usize)) -> !; +//! fn panic_impl(fmt: fmt::Arguments, &(&'static str, u32)) -> !; //! ``` //! //! This definition allows for panicking with any general message, but it does not @@ -52,8 +52,8 @@ 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: usize) -> !; + fn panic_impl(fmt: fmt::Arguments, file: &'static str, line: u32) -> !; } let (file, line) = *file_line; - unsafe { panic_impl(fmt, file, line as usize) } + unsafe { panic_impl(fmt, file, line as u32) } }