---

yaml
---
r: 47316
b: refs/heads/try
c: c623d21
h: refs/heads/master
v: v3

Author: nikomatsakis

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 3bbcac322669cff3abde5be937cc4ec3860f3985
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d9689399d091c3265f00434a69c551a61c28dc
-refs/heads/try: 43d43adf6bd2024b1ddc0e596d4bed88e1df82b1
+refs/heads/try: c623d21e388315df672951fcb8efb5000923ab3d
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/doc/tutorial.md

@@ -1126,7 +1126,7 @@ points to.
 
 ~~~
 let managed = @mut 10;
-let mut owned = ~20;
+let owned = ~mut 20;
 
 let mut value = 30;
 let borrowed = &mut value;

branches/try/src/libcore/at_vec.rs

@@ -168,7 +168,7 @@ pub mod traits {
     use kinds::Copy;
     use ops::Add;
 
-    impl<T:Copy> Add<&[const T],@[T]> for @[T] {
+    pub impl<T:Copy> Add<&[const T],@[T]> for @[T] {
         #[inline(always)]
         pure fn add(&self, rhs: & &self/[const T]) -> @[T] {
             append(*self, (*rhs))

branches/try/src/libcore/dvec.rs

@@ -133,6 +133,18 @@ impl<A> DVec<A> {
         self.check_out(|v| self.give_back(f(v)))
     }
 
+    /**
+     * Swaps out the current vector and hands it off to a user-provided
+     * function `f`.  The function should transform it however is desired
+     * and return a new vector to replace it with.
+     */
+    #[inline(always)]
+    fn swap_mut(f: &fn(v: ~[mut A]) -> ~[mut A]) {
+        do self.swap |v| {
+            vec::cast_from_mut(f(vec::cast_to_mut(v)))
+        }
+    }
+
     /// Returns the number of elements currently in the dvec
     #[inline(always)]
     pure fn len() -> uint {
@@ -205,7 +217,7 @@ impl<A> DVec<A> {
     }
 
     /// Gives access to the vector as a slice with mutable contents
-    fn borrow_mut<R>(op: &fn(x: &mut [A]) -> R) -> R {
+    fn borrow_mut<R>(op: fn(x: &[mut A]) -> R) -> R {
         do self.check_out |v| {
             let mut v = v;
             let result = op(v);

branches/try/src/libcore/io.rs

@@ -474,10 +474,7 @@ impl<R:Reader,C> Reader for Wrapper<R, C> {
 
 pub struct FILERes {
     f: *libc::FILE,
-}
-
-impl Drop for FILERes {
-    fn finalize(&self) {
+    drop {
         unsafe {
             libc::fclose(self.f);
         }
@@ -686,10 +683,7 @@ impl Writer for fd_t {
 
 pub struct FdRes {
     fd: fd_t,
-}
-
-impl Drop for FdRes {
-    fn finalize(&self) {
+    drop {
         unsafe {
             libc::close(self.fd);
         }

branches/try/src/libcore/num/f32.rs

@@ -284,7 +284,7 @@ impl num::One for f32 {
     static pure fn one() -> f32 { 1.0 }
 }
 
-impl NumCast for f32 {
+pub impl NumCast for f32 {
     /**
      * Cast `n` to an `f32`
      */

branches/try/src/libcore/num/f64.rs

@@ -299,7 +299,7 @@ impl cmp::Ord for f64 {
     pure fn gt(&self, other: &f64) -> bool { (*self) > (*other) }
 }
 
-impl NumCast for f64 {
+pub impl NumCast for f64 {
     /**
      * Cast `n` to an `f64`
      */

branches/try/src/libcore/num/float.rs

@@ -420,7 +420,7 @@ impl num::One for float {
     static pure fn one() -> float { 1.0 }
 }
 
-impl NumCast for float {
+pub impl NumCast for float {
     /**
      * Cast `n` to a `float`
      */

branches/try/src/libcore/num/int-template/i16.rs

@@ -17,7 +17,7 @@ mod inst {
     pub const bits: uint = ::u16::bits;
 }
 
-impl NumCast for i16 {
+pub impl NumCast for i16 {
     /**
      * Cast `n` to a `i16`
      */

branches/try/src/libcore/num/int-template/i32.rs

@@ -17,7 +17,7 @@ mod inst {
     pub const bits: uint = ::u32::bits;
 }
 
-impl NumCast for i32 {
+pub impl NumCast for i32 {
     /**
      * Cast `n` to a `i32`
      */

branches/try/src/libcore/num/int-template/i64.rs

@@ -17,7 +17,7 @@ mod inst {
     pub const bits: uint = ::u64::bits;
 }
 
-impl NumCast for i64 {
+pub impl NumCast for i64 {
     /**
      * Cast `n` to a `i64`
      */

branches/try/src/libcore/num/int-template/i8.rs

@@ -17,7 +17,7 @@ mod inst {
     pub const bits: uint = ::u8::bits;
 }
 
-impl NumCast for i8 {
+pub impl NumCast for i8 {
     /**
      * Cast `n` to a `i8`
      */

branches/try/src/libcore/num/int-template/int.rs

@@ -58,7 +58,7 @@ mod inst {
     }
 }
 
-impl NumCast for int {
+pub impl NumCast for int {
     /**
      * Cast `n` to a `int`
      */

branches/try/src/libcore/num/uint-template/u16.rs

@@ -19,7 +19,7 @@ mod inst {
     pub const bits: uint = 16;
 }
 
-impl NumCast for u16 {
+pub impl NumCast for u16 {
     /**
      * Cast `n` to a `u16`
      */

branches/try/src/libcore/num/uint-template/u32.rs

@@ -19,7 +19,7 @@ mod inst {
     pub const bits: uint = 32;
 }
 
-impl NumCast for u32 {
+pub impl NumCast for u32 {
     /**
      * Cast `n` to a `u32`
      */

branches/try/src/libcore/num/uint-template/u64.rs

@@ -19,7 +19,7 @@ mod inst {
     pub const bits: uint = 64;
 }
 
-impl NumCast for u64 {
+pub impl NumCast for u64 {
     /**
      * Cast `n` to a `u64`
      */

branches/try/src/libcore/num/uint-template/u8.rs

@@ -26,7 +26,7 @@ mod inst {
     pub pure fn is_ascii(x: T) -> bool { return 0 as T == x & 128 as T; }
 }
 
-impl NumCast for u8 {
+pub impl NumCast for u8 {
     /**
      * Cast `n` to a `u8`
      */

branches/try/src/libcore/num/uint-template/uint.rs

@@ -110,7 +110,7 @@ pub mod inst {
         return true;
     }
 
-    impl iter::Times for uint {
+    pub impl iter::Times for uint {
         #[inline(always)]
         /**
         * A convenience form for basic iteration. Given a uint `x`,
@@ -209,7 +209,7 @@ pub mod inst {
     }
 }
 
-impl NumCast for uint {
+pub impl NumCast for uint {
     /**
      * Cast `n` to a `uint`
      */

branches/try/src/libcore/option.rs

@@ -56,7 +56,7 @@ pub enum Option<T> {
     Some(T),
 }
 
-impl<T:Ord> Ord for Option<T> {
+pub impl<T:Ord> Ord for Option<T> {
     pure fn lt(&self, other: &Option<T>) -> bool {
         match (self, other) {
             (&None, &None) => false,
@@ -450,10 +450,7 @@ fn test_unwrap_str() {
 fn test_unwrap_resource() {
     struct R {
        i: @mut int,
-    }
-
-    impl ::ops::Drop for R {
-       fn finalize(&self) { *(self.i) += 1; }
+       drop { *(self.i) += 1; }
     }
 
     fn R(i: @mut int) -> R {

branches/try/src/libcore/os.rs

@@ -109,7 +109,7 @@ pub mod win32 {
             let mut done = false;
             while !done {
                 let mut k: DWORD = 0;
-                let mut buf = vec::from_elem(n as uint, 0u16);
+                let buf = vec::cast_to_mut(vec::from_elem(n as uint, 0u16));
                 do vec::as_mut_buf(buf) |b, _sz| {
                     k = f(b, TMPBUF_SZ as DWORD);
                     if k == (0 as DWORD) {

branches/try/src/libcore/owned.rs

@@ -13,22 +13,22 @@
 use cmp::{Eq, Ord};
 
 #[cfg(notest)]
-impl<T:Eq> Eq for ~T {
+impl<T:Eq> Eq for ~const T {
     #[inline(always)]
-    pure fn eq(&self, other: &~T) -> bool { *(*self) == *(*other) }
+    pure fn eq(&self, other: &~const T) -> bool { *(*self) == *(*other) }
     #[inline(always)]
-    pure fn ne(&self, other: &~T) -> bool { *(*self) != *(*other) }
+    pure fn ne(&self, other: &~const T) -> bool { *(*self) != *(*other) }
 }
 
 #[cfg(notest)]
-impl<T:Ord> Ord for ~T {
+impl<T:Ord> Ord for ~const T {
     #[inline(always)]
-    pure fn lt(&self, other: &~T) -> bool { *(*self) < *(*other) }
+    pure fn lt(&self, other: &~const T) -> bool { *(*self) < *(*other) }
     #[inline(always)]
-    pure fn le(&self, other: &~T) -> bool { *(*self) <= *(*other) }
+    pure fn le(&self, other: &~const T) -> bool { *(*self) <= *(*other) }
     #[inline(always)]
-    pure fn ge(&self, other: &~T) -> bool { *(*self) >= *(*other) }
+    pure fn ge(&self, other: &~const T) -> bool { *(*self) >= *(*other) }
     #[inline(always)]
-    pure fn gt(&self, other: &~T) -> bool { *(*self) > *(*other) }
+    pure fn gt(&self, other: &~const T) -> bool { *(*self) > *(*other) }
 }
 

branches/try/src/libcore/pipes.rs

@@ -346,10 +346,7 @@ pub unsafe fn get_buffer<T>(p: *PacketHeader) -> ~Buffer<T> {
 struct BufferResource<T> {
     buffer: ~Buffer<T>,
 
-}
-
-impl<T> ::ops::Drop for BufferResource<T> {
-    fn finalize(&self) {
+    drop {
         unsafe {
             let b = move_it!(self.buffer);
             //let p = ptr::addr_of(*b);

branches/try/src/libcore/private.rs

@@ -126,10 +126,7 @@ struct ArcData<T> {
 
 struct ArcDestruct<T> {
     mut data: *libc::c_void,
-}
-
-impl<T> Drop for ArcDestruct<T>{
-    fn finalize(&self) {
+    drop {
         unsafe {
             if self.data.is_null() {
                 return; // Happens when destructing an unwrapper's handle.
@@ -181,10 +178,7 @@ pub unsafe fn unwrap_shared_mutable_state<T:Owned>(rc: SharedMutableState<T>)
     struct DeathThroes<T> {
         mut ptr:      Option<~ArcData<T>>,
         mut response: Option<comm::ChanOne<bool>>,
-    }
-
-    impl<T> Drop for DeathThroes<T>{
-        fn finalize(&self) {
+        drop {
             unsafe {
                 let response = option::swap_unwrap(&mut self.response);
                 // In case we get killed early, we need to tell the person who
@@ -317,10 +311,7 @@ type rust_little_lock = *libc::c_void;
 
 struct LittleLock {
     l: rust_little_lock,
-}
-
-impl Drop for LittleLock {
-    fn finalize(&self) {
+    drop {
         unsafe {
             rustrt::rust_destroy_little_lock(self.l);
         }

branches/try/src/libcore/rand.rs

@@ -365,10 +365,7 @@ impl Rng {
 
 struct RandRes {
     rng: *rust_rng,
-}
-
-impl Drop for RandRes {
-    fn finalize(&self) {
+    drop {
         unsafe {
             rustrt::rand_free(self.rng);
         }

branches/try/src/libcore/run.rs

@@ -248,10 +248,7 @@ pub fn start_program(prog: &str, args: &[~str]) -> Program {
     }
     struct ProgRes {
         r: ProgRepr,
-    }
-
-    impl Drop for ProgRes {
-        fn finalize(&self) {
+        drop {
             unsafe {
                 // FIXME #4943: This is bad.
                 destroy_repr(cast::transmute(&self.r));

branches/try/src/libcore/str.rs

@@ -2362,7 +2362,7 @@ pub trait OwnedStr {
     fn push_char(&mut self, c: char);
 }
 
-impl OwnedStr for ~str {
+pub impl OwnedStr for ~str {
     fn push_str(&mut self, v: &str) {
         push_str(self, v);
     }

branches/try/src/libcore/task/spawn.rs

@@ -308,11 +308,8 @@ struct TCB {
     mut ancestors: AncestorList,
     is_main:       bool,
     notifier:      Option<AutoNotify>,
-}
-
-impl Drop for TCB {
     // Runs on task exit.
-    fn finalize(&self) {
+    drop {
         unsafe {
             // If we are failing, the whole taskgroup needs to die.
             if rt::rust_task_is_unwinding(self.me) {
@@ -356,10 +353,7 @@ fn TCB(me: *rust_task, tasks: TaskGroupArc, ancestors: AncestorList,
 struct AutoNotify {
     notify_chan: Chan<TaskResult>,
     mut failed:  bool,
-}
-
-impl Drop for AutoNotify {
-    fn finalize(&self) {
+    drop {
         let result = if self.failed { Failure } else { Success };
         self.notify_chan.send(result);
     }

branches/try/src/libcore/to_bytes.rs

@@ -170,7 +170,7 @@ impl IterBytes for char {
 pub mod x32 {
     use to_bytes::{Cb, IterBytes};
 
-    impl IterBytes for uint {
+    pub impl IterBytes for uint {
         #[inline(always)]
         pure fn iter_bytes(&self, lsb0: bool, f: Cb) {
             (*self as u32).iter_bytes(lsb0, f)
@@ -182,7 +182,7 @@ pub mod x32 {
 pub mod x64 {
     use to_bytes::{Cb, IterBytes};
 
-    impl IterBytes for uint {
+    pub impl IterBytes for uint {
         #[inline(always)]
         pure fn iter_bytes(&self, lsb0: bool, f: Cb) {
             (*self as u64).iter_bytes(lsb0, f)