about summary refs log tree commit diff
path: root/src/librustrt
diff options
context:
space:
mode:
authorAaron Turon <aturon@mozilla.com>2014-10-02 11:48:07 -0700
committerAaron Turon <aturon@mozilla.com>2014-10-02 11:48:07 -0700
commitd2ea0315e09cbd495a67c9e3d5053b57e2b5a8b7 (patch)
treed39de6be5866c0f0f37f9f3219b8217c873d8b52 /src/librustrt
parentc0c6c895890770d7029324fd9b592f42e0564e8b (diff)
downloadrust-d2ea0315e09cbd495a67c9e3d5053b57e2b5a8b7.tar.gz
rust-d2ea0315e09cbd495a67c9e3d5053b57e2b5a8b7.zip
Revert "Use slice syntax instead of slice_to, etc."
This reverts commit 40b9f5ded50ac4ce8c9323921ec556ad611af6b7.
Diffstat (limited to 'src/librustrt')
-rw-r--r--src/librustrt/unwind.rs2
-rw-r--r--src/librustrt/util.rs6
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