From 967c7d828aacd9f788973c05acabafc194bd5772 Mon Sep 17 00:00:00 2001
From: Ben Blum <bblum@andrew.cmu.edu>
Date: Mon, 10 Jun 2013 17:27:18 -0400
Subject: Replace str::raw::buf_as_slice with c_str_to_static_slice. Close
 #3843.

---
 src/libstd/rt/uv/mod.rs | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

(limited to 'src/libstd/rt')

diff --git a/src/libstd/rt/uv/mod.rs b/src/libstd/rt/uv/mod.rs
index 10c8b84bc51..dd66a76eead 100644
--- a/src/libstd/rt/uv/mod.rs
+++ b/src/libstd/rt/uv/mod.rs
@@ -238,20 +238,6 @@ pub fn last_uv_error<H, W: Watcher + NativeHandle<*H>>(watcher: &W) -> UvError {
 }
 
 pub fn uv_error_to_io_error(uverr: UvError) -> IoError {
-
-    // XXX: Could go in str::raw
-    unsafe fn c_str_to_static_slice(s: *libc::c_char) -> &'static str {
-        let s = s as *u8;
-        let mut (curr, len) = (s, 0u);
-        while *curr != 0u8 {
-            len += 1u;
-            curr = ptr::offset(s, len);
-        }
-
-        str::raw::buf_as_slice(s, len, |d| cast::transmute(d))
-    }
-
-
     unsafe {
         // Importing error constants
         use rt::uv::uvll::*;
@@ -259,7 +245,7 @@ pub fn uv_error_to_io_error(uverr: UvError) -> IoError {
 
         // uv error descriptions are static
         let c_desc = uvll::strerror(&*uverr);
-        let desc = c_str_to_static_slice(c_desc);
+        let desc = str::raw::c_str_to_static_slice(c_desc);
 
         let kind = match uverr.code {
             UNKNOWN => OtherIoError,
-- 
cgit 1.4.1-3-g733a5


From 8081aea3b86d9e25746ff03acabe53c3644b600c Mon Sep 17 00:00:00 2001
From: Ben Blum <bblum@andrew.cmu.edu>
Date: Mon, 10 Jun 2013 18:18:04 -0400
Subject: Tag a bunch of destructors that need mutable self with FIXME for
 #4330. Close #4943.

---
 src/libstd/pipes.rs            | 1 +
 src/libstd/rt/rc.rs            | 2 +-
 src/libstd/run.rs              | 2 +-
 src/libstd/task/spawn.rs       | 1 +
 src/libstd/unstable/atomics.rs | 1 +
 5 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/libstd/rt')

diff --git a/src/libstd/pipes.rs b/src/libstd/pipes.rs
index 1137540ae70..012ad0ed80d 100644
--- a/src/libstd/pipes.rs
+++ b/src/libstd/pipes.rs
@@ -315,6 +315,7 @@ struct BufferResource<T> {
 impl<T> Drop for BufferResource<T> {
     fn finalize(&self) {
         unsafe {
+            // FIXME(#4330) Need self by value to get mutability.
             let this: &mut BufferResource<T> = transmute(self);
 
             let mut b = move_it!(this.buffer);
diff --git a/src/libstd/rt/rc.rs b/src/libstd/rt/rc.rs
index 1c0c8c14fdf..2977d081508 100644
--- a/src/libstd/rt/rc.rs
+++ b/src/libstd/rt/rc.rs
@@ -78,7 +78,7 @@ impl<T> Drop for RC<T> {
         assert!(self.refcount() > 0);
 
         unsafe {
-            // XXX: Mutable finalizer
+            // FIXME(#4330) Need self by value to get mutability.
             let this: &mut RC<T> = cast::transmute_mut(self);
 
             match *this.get_mut_state() {
diff --git a/src/libstd/run.rs b/src/libstd/run.rs
index 41bc573f10d..85015c9bc5e 100644
--- a/src/libstd/run.rs
+++ b/src/libstd/run.rs
@@ -429,7 +429,7 @@ impl Process {
 
 impl Drop for Process {
     fn finalize(&self) {
-        // FIXME #4943: transmute is bad.
+        // FIXME(#4330) Need self by value to get mutability.
         let mut_self: &mut Process = unsafe { cast::transmute(self) };
 
         mut_self.finish();
diff --git a/src/libstd/task/spawn.rs b/src/libstd/task/spawn.rs
index 87e9296657f..bc409e06633 100644
--- a/src/libstd/task/spawn.rs
+++ b/src/libstd/task/spawn.rs
@@ -323,6 +323,7 @@ impl Drop for TCB {
     // Runs on task exit.
     fn finalize(&self) {
         unsafe {
+            // FIXME(#4330) Need self by value to get mutability.
             let this: &mut TCB = transmute(self);
 
             // If we are failing, the whole taskgroup needs to die.
diff --git a/src/libstd/unstable/atomics.rs b/src/libstd/unstable/atomics.rs
index 58d0c01f990..856f4e6e3c1 100644
--- a/src/libstd/unstable/atomics.rs
+++ b/src/libstd/unstable/atomics.rs
@@ -275,6 +275,7 @@ impl<T> Drop for AtomicOption<T> {
         // This will ensure that the contained data is
         // destroyed, unless it's null.
         unsafe {
+            // FIXME(#4330) Need self by value to get mutability.
             let this : &mut AtomicOption<T> = cast::transmute(self);
             let _ = this.take(SeqCst);
         }
-- 
cgit 1.4.1-3-g733a5