From 2f365ffdad40475e8f70f7af7f210d6c597b60f5 Mon Sep 17 00:00:00 2001
From: Aaron Turon <aturon@mozilla.com>
Date: Thu, 2 Oct 2014 11:47:38 -0700
Subject: Revert "Review and rebasing changes"

This reverts commit 6e0611a48707a1f5d90aee32a02b2b15957ef25b.
---
 src/libstd/os.rs           | 2 +-
 src/libstd/rt/backtrace.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/libstd')

diff --git a/src/libstd/os.rs b/src/libstd/os.rs
index c6948cccafe..d904e657e40 100644
--- a/src/libstd/os.rs
+++ b/src/libstd/os.rs
@@ -144,7 +144,7 @@ pub mod windows {
     use option::{None, Option};
     use option;
     use os::TMPBUF_SZ;
-    use slice::MutableSlice;
+    use slice::{MutableSlice, ImmutableSlice};
     use string::String;
     use str::StrSlice;
     use vec::Vec;
diff --git a/src/libstd/rt/backtrace.rs b/src/libstd/rt/backtrace.rs
index e1925fc79d0..33f8713e1a1 100644
--- a/src/libstd/rt/backtrace.rs
+++ b/src/libstd/rt/backtrace.rs
@@ -999,7 +999,7 @@ mod imp {
                 let bytes = cstr.as_bytes();
                 match cstr.as_str() {
                     Some(s) => try!(super::demangle(w, s)),
-                    None => try!(w.write(bytes[..bytes.len()-1])),
+                    None => try!(w.write(bytes.slice_to(bytes.len() - 1))),
                 }
             }
             try!(w.write(['\n' as u8]));
-- 
cgit 1.4.1-3-g733a5