diff options
| author | bors <bors@rust-lang.org> | 2015-01-02 02:31:12 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-01-02 02:31:12 +0000 |
| commit | cd614164e692cca3a1460737f581fcb6d4630baf (patch) | |
| tree | 9543983dc912f84eb6c12a1db4531c17c280388e /src/libstd/rt | |
| parent | 39d74026663597a8d4ad0ab04e6d117bf9fd6ad4 (diff) | |
| parent | 2c92ddeda7e2a8e9b6d6b629818eacdb96787575 (diff) | |
| download | rust-cd614164e692cca3a1460737f581fcb6d4630baf.tar.gz rust-cd614164e692cca3a1460737f581fcb6d4630baf.zip | |
auto merge of #20387 : nick29581/rust/arrays-2, r=alexcrichton
Closes #19999
Diffstat (limited to 'src/libstd/rt')
| -rw-r--r-- | src/libstd/rt/libunwind.rs | 2 | ||||
| -rw-r--r-- | src/libstd/rt/unwind.rs | 4 | ||||
| -rw-r--r-- | src/libstd/rt/util.rs | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/libstd/rt/libunwind.rs b/src/libstd/rt/libunwind.rs index 2feea7fa0a4..4dbe878277d 100644 --- a/src/libstd/rt/libunwind.rs +++ b/src/libstd/rt/libunwind.rs @@ -82,7 +82,7 @@ pub const unwinder_private_data_size: uint = 2; pub struct _Unwind_Exception { pub exception_class: _Unwind_Exception_Class, pub exception_cleanup: _Unwind_Exception_Cleanup_Fn, - pub private: [_Unwind_Word, ..unwinder_private_data_size], + pub private: [_Unwind_Word; unwinder_private_data_size], } pub enum _Unwind_Context {} diff --git a/src/libstd/rt/unwind.rs b/src/libstd/rt/unwind.rs index c273c52dacc..e0c512706e6 100644 --- a/src/libstd/rt/unwind.rs +++ b/src/libstd/rt/unwind.rs @@ -83,7 +83,7 @@ pub type Callback = fn(msg: &(Any + Send), file: &'static str, line: uint); // // For more information, see below. const MAX_CALLBACKS: uint = 16; -static CALLBACKS: [atomic::AtomicUint, ..MAX_CALLBACKS] = +static CALLBACKS: [atomic::AtomicUint; MAX_CALLBACKS] = [atomic::INIT_ATOMIC_UINT, atomic::INIT_ATOMIC_UINT, atomic::INIT_ATOMIC_UINT, atomic::INIT_ATOMIC_UINT, atomic::INIT_ATOMIC_UINT, atomic::INIT_ATOMIC_UINT, @@ -168,7 +168,7 @@ fn rust_panic(cause: Box<Any + Send>) -> ! { uwe: uw::_Unwind_Exception { exception_class: rust_exception_class(), exception_cleanup: exception_cleanup, - private: [0, ..uw::unwinder_private_data_size], + private: [0; uw::unwinder_private_data_size], }, cause: Some(cause), }; diff --git a/src/libstd/rt/util.rs b/src/libstd/rt/util.rs index 5448af3f753..fee86e33455 100644 --- a/src/libstd/rt/util.rs +++ b/src/libstd/rt/util.rs @@ -134,7 +134,7 @@ pub fn abort(args: fmt::Arguments) -> ! { } // Convert the arguments into a stack-allocated string - let mut msg = [0u8, ..512]; + let mut msg = [0u8; 512]; let mut w = BufWriter { buf: &mut msg, pos: 0 }; let _ = write!(&mut w, "{}", args); let msg = str::from_utf8(w.buf[mut ..w.pos]).unwrap_or("aborted"); |