---

yaml
---
r: 145195
b: refs/heads/try2
c: befc561
h: refs/heads/master
i:
  145193: d1df4f9
  145191: 6485b53
v: v3

Author: thestinger

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 023aab453c53fdeee8a99da2766ba562b224785c
+refs/heads/try2: befc561fa4f76b058fc4d9d14f7ed508df0cb272
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libextra/workcache.rs

@@ -198,7 +198,6 @@ impl Database {
     }
 }
 
-// FIXME #4330: use &mut self here
 #[unsafe_destructor]
 impl Drop for Database {
     fn drop(&mut self) {

branches/try2/src/librustpkg/rustpkg.rs

@@ -189,7 +189,6 @@ pub trait CtxMethods {
     fn test(&self);
     fn uninstall(&self, _id: &str, _vers: Option<~str>);
     fn unprefer(&self, _id: &str, _vers: Option<~str>);
-    fn init(&self);
 }
 
 impl CtxMethods for BuildContext {
@@ -320,13 +319,6 @@ impl CtxMethods for BuildContext {
             "test" => {
                 self.test();
             }
-            "init" => {
-                if args.len() != 0 {
-                    return usage::init();
-                } else {
-                    self.init();
-                }
-            }
             "uninstall" => {
                 if args.len() < 1 {
                     return usage::uninstall();
@@ -548,13 +540,6 @@ impl CtxMethods for BuildContext {
         fail!("test not yet implemented");
     }
 
-    fn init(&self) {
-        os::mkdir_recursive(&Path("src"),   U_RWX);
-        os::mkdir_recursive(&Path("lib"),   U_RWX);
-        os::mkdir_recursive(&Path("bin"),   U_RWX);
-        os::mkdir_recursive(&Path("build"), U_RWX);
-    }
-
     fn uninstall(&self, _id: &str, _vers: Option<~str>)  {
         fail!("uninstall not yet implemented");
     }
@@ -703,7 +688,6 @@ pub fn main_args(args: &[~str]) {
                     ~"list"    => usage::list(),
                     ~"prefer" => usage::prefer(),
                     ~"test" => usage::test(),
-                    ~"init" => usage::init(),
                     ~"uninstall" => usage::uninstall(),
                     ~"unprefer" => usage::unprefer(),
                     _ => usage::general()

branches/try2/src/librustpkg/usage.rs

@@ -148,10 +148,3 @@ and exit code will be redirected.
 Options:
     -c, --cfg      Pass a cfg flag to the package script");
 }
-
-pub fn init() {
-    io::println("rustpkg init name
-
-This makes a new workspace for working on a project named name.
-");
-}

branches/try2/src/librustpkg/util.rs

@@ -33,7 +33,7 @@ use workcache_support::{digest_file_with_date, digest_only_date};
 // you could update the match in rustpkg.rc but forget to update this list. I think
 // that should be fixed.
 static COMMANDS: &'static [&'static str] =
-    &["build", "clean", "do", "info", "init", "install", "list", "prefer", "test", "uninstall",
+    &["build", "clean", "do", "info", "install", "list", "prefer", "test", "uninstall",
       "unprefer"];
 
 

branches/try2/src/libstd/rt/rc.rs

@@ -78,17 +78,14 @@ impl<T> Drop for RC<T> {
         assert!(self.refcount() > 0);
 
         unsafe {
-            // FIXME(#4330) Need self by value to get mutability.
-            let this: &mut RC<T> = cast::transmute_mut(self);
-
-            match *this.get_mut_state() {
+            match *self.get_mut_state() {
                 (ref mut count, _) => {
                     *count = *count - 1
                 }
             }
 
-            if this.refcount() == 0 {
-                let _: ~(uint, T) = cast::transmute(this.p);
+            if self.refcount() == 0 {
+                let _: ~(uint, T) = cast::transmute(self.p);
             }
         }
     }

branches/try2/src/libstd/rt/uv/uvio.rs

@@ -188,11 +188,7 @@ impl UvEventLoop {
 
 impl Drop for UvEventLoop {
     fn drop(&mut self) {
-        // XXX: Need mutable finalizer
-        let this = unsafe {
-            transmute::<&UvEventLoop, &mut UvEventLoop>(self)
-        };
-        this.uvio.uv_loop().close();
+        self.uvio.uv_loop().close();
     }
 }
 
@@ -648,9 +644,7 @@ impl UvTcpListener {
 
 impl Drop for UvTcpListener {
     fn drop(&mut self) {
-        // XXX need mutable finalizer
-        let self_ = unsafe { transmute::<&UvTcpListener, &mut UvTcpListener>(self) };
-        do self_.home_for_io_with_sched |self_, scheduler| {
+        do self.home_for_io_with_sched |self_, scheduler| {
             do scheduler.deschedule_running_task_and_then |_, task| {
                 let task = Cell::new(task);
                 do self_.watcher.as_stream().close {
@@ -763,9 +757,7 @@ impl HomingIO for UvTcpStream {
 
 impl Drop for UvTcpStream {
     fn drop(&mut self) {
-        // XXX need mutable finalizer
-        let this = unsafe { transmute::<&UvTcpStream, &mut UvTcpStream>(self) };
-        do this.home_for_io_with_sched |self_, scheduler| {
+        do self.home_for_io_with_sched |self_, scheduler| {
             do scheduler.deschedule_running_task_and_then |_, task| {
                 let task_cell = Cell::new(task);
                 do self_.watcher.as_stream().close {
@@ -922,9 +914,7 @@ impl HomingIO for UvUdpSocket {
 
 impl Drop for UvUdpSocket {
     fn drop(&mut self) {
-        // XXX need mutable finalizer
-        let this = unsafe { transmute::<&UvUdpSocket, &mut UvUdpSocket>(self) };
-        do this.home_for_io_with_sched |self_, scheduler| {
+        do self.home_for_io_with_sched |self_, scheduler| {
             do scheduler.deschedule_running_task_and_then |_, task| {
                 let task_cell = Cell::new(task);
                 do self_.watcher.close {

branches/try2/src/libstd/unstable/atomics.rs

@@ -339,13 +339,7 @@ impl<T> AtomicOption<T> {
 #[unsafe_destructor]
 impl<T> Drop for AtomicOption<T> {
     fn drop(&mut self) {
-        // 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);
-        }
+        let _ = self.take(SeqCst);
     }
 }
 

branches/try2/src/libsyntax/ext/bytes.rs

@@ -30,43 +30,43 @@ pub fn expand_syntax_ext(cx: @ExtCtxt, sp: Span, tts: &[ast::token_tree]) -> bas
                 // string literal, push each byte to vector expression
                 ast::lit_str(s) => {
                     for byte in s.byte_iter() {
-                        bytes.push(cx.expr_u8(expr.span, byte));
+                        bytes.push(cx.expr_u8(sp, byte));
                     }
                 }
 
                 // u8 literal, push to vector expression
                 ast::lit_uint(v, ast::ty_u8) => {
                     if v > 0xFF {
-                        cx.span_err(expr.span, "Too large u8 literal in bytes!")
+                        cx.span_err(sp, "Too large u8 literal in bytes!")
                     } else {
-                        bytes.push(cx.expr_u8(expr.span, v as u8));
+                        bytes.push(cx.expr_u8(sp, v as u8));
                     }
                 }
 
                 // integer literal, push to vector expression
                 ast::lit_int_unsuffixed(v) => {
                     if v > 0xFF {
-                        cx.span_err(expr.span, "Too large integer literal in bytes!")
+                        cx.span_err(sp, "Too large integer literal in bytes!")
                     } else if v < 0 {
-                        cx.span_err(expr.span, "Negative integer literal in bytes!")
+                        cx.span_err(sp, "Negative integer literal in bytes!")
                     } else {
-                        bytes.push(cx.expr_u8(expr.span, v as u8));
+                        bytes.push(cx.expr_u8(sp, v as u8));
                     }
                 }
 
                 // char literal, push to vector expression
                 ast::lit_char(v) => {
                     if char::from_u32(v).unwrap().is_ascii() {
-                        bytes.push(cx.expr_u8(expr.span, v as u8));
+                        bytes.push(cx.expr_u8(sp, v as u8));
                     } else {
-                        cx.span_err(expr.span, "Non-ascii char literal in bytes!")
+                        cx.span_err(sp, "Non-ascii char literal in bytes!")
                     }
                 }
 
-                _ => cx.span_err(expr.span, "Unsupported literal in bytes!")
+                _ => cx.span_err(sp, "Unsupported literal in bytes!")
             },
 
-            _ => cx.span_err(expr.span, "Non-literal in bytes!")
+            _ => cx.span_err(sp, "Non-literal in bytes!")
         }
     }