diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-01-08 09:24:08 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-01-08 09:24:08 -0800 |
| commit | 4281bd1932bf185e1154f7a79832bbd2d9155e41 (patch) | |
| tree | 27263299612651b57cb595a2cebf4830dc113904 /src/libstd/macros.rs | |
| parent | 8ed88c11af9495e7119da4ac59f329a33cedac59 (diff) | |
| parent | a661bd6575dd3fac17cf77fdea8b76ca790ac212 (diff) | |
| download | rust-4281bd1932bf185e1154f7a79832bbd2d9155e41.tar.gz rust-4281bd1932bf185e1154f7a79832bbd2d9155e41.zip | |
rollup merge of #20754: nikomatsakis/int-feature
Conflicts: src/test/compile-fail/borrowck-move-out-of-overloaded-auto-deref.rs src/test/compile-fail/issue-2590.rs src/test/compile-fail/lint-stability.rs src/test/compile-fail/slice-mut-2.rs src/test/compile-fail/std-uncopyable-atomics.rs
Diffstat (limited to 'src/libstd/macros.rs')
| -rw-r--r-- | src/libstd/macros.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libstd/macros.rs b/src/libstd/macros.rs index 0f293d789ab..626372db23b 100644 --- a/src/libstd/macros.rs +++ b/src/libstd/macros.rs @@ -44,7 +44,7 @@ macro_rules! panic { ($msg:expr) => ({ $crate::rt::begin_unwind($msg, { // static requires less code at runtime, more constant data - static _FILE_LINE: (&'static str, uint) = (file!(), line!()); + static _FILE_LINE: (&'static str, usize) = (file!(), line!()); &_FILE_LINE }) }); @@ -54,7 +54,7 @@ macro_rules! panic { // used inside a dead function. Just `#[allow(dead_code)]` is // insufficient, since the user may have // `#[forbid(dead_code)]` and which cannot be overridden. - static _FILE_LINE: (&'static str, uint) = (file!(), line!()); + static _FILE_LINE: (&'static str, usize) = (file!(), line!()); &_FILE_LINE }) }); @@ -466,7 +466,7 @@ pub mod builtin { /// A macro which expands to the line number on which it was invoked. /// - /// The expanded expression has type `uint`, and the returned line is not + /// The expanded expression has type `usize`, and the returned line is not /// the invocation of the `line!()` macro itself, but rather the first macro /// invocation leading up to the invocation of the `line!()` macro. /// @@ -481,7 +481,7 @@ pub mod builtin { /// A macro which expands to the column number on which it was invoked. /// - /// The expanded expression has type `uint`, and the returned column is not + /// The expanded expression has type `usize`, and the returned column is not /// the invocation of the `column!()` macro itself, but rather the first macro /// invocation leading up to the invocation of the `column!()` macro. /// |