diff options
Diffstat (limited to 'src/librustrt')
| -rw-r--r-- | src/librustrt/unwind.rs | 2 | ||||
| -rw-r--r-- | src/librustrt/util.rs | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/librustrt/unwind.rs b/src/librustrt/unwind.rs index f07e8ecc335..1561f428ce5 100644 --- a/src/librustrt/unwind.rs +++ b/src/librustrt/unwind.rs @@ -562,7 +562,7 @@ fn begin_unwind_inner(msg: Box<Any + Send>, file_line: &(&'static str, uint)) -> // MAX_CALLBACKS, so we're sure to clamp it as necessary. let callbacks = unsafe { let amt = CALLBACK_CNT.load(atomic::SeqCst); - CALLBACKS[..cmp::min(amt, MAX_CALLBACKS)] + CALLBACKS.slice_to(cmp::min(amt, MAX_CALLBACKS)) }; for cb in callbacks.iter() { match cb.load(atomic::SeqCst) { diff --git a/src/librustrt/util.rs b/src/librustrt/util.rs index 455df88963e..77e3e25eb0e 100644 --- a/src/librustrt/util.rs +++ b/src/librustrt/util.rs @@ -62,8 +62,8 @@ pub fn abort(args: &fmt::Arguments) -> ! { } impl<'a> FormatWriter for BufWriter<'a> { fn write(&mut self, bytes: &[u8]) -> fmt::Result { - let left = self.buf[mut self.pos..]; - let to_write = bytes[..cmp::min(bytes.len(), left.len())]; + let left = self.buf.slice_from_mut(self.pos); + let to_write = bytes.slice_to(cmp::min(bytes.len(), left.len())); slice::bytes::copy_memory(left, to_write); self.pos += to_write.len(); Ok(()) @@ -74,7 +74,7 @@ pub fn abort(args: &fmt::Arguments) -> ! { let mut msg = [0u8, ..512]; let mut w = BufWriter { buf: msg, pos: 0 }; let _ = write!(&mut w, "{}", args); - let msg = str::from_utf8(w.buf[mut ..w.pos]).unwrap_or("aborted"); + let msg = str::from_utf8(w.buf.slice_to(w.pos)).unwrap_or("aborted"); let msg = if msg.is_empty() {"aborted"} else {msg}; // Give some context to the message |