---

yaml
---
r: 138579
b: refs/heads/try2
c: c623d21
h: refs/heads/master
i:
  138577: 84bcf14
  138575: 61869fd
v: v3

Author: nikomatsakis

[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: 269409f91231c4b1ea896844b820781d2cfab053
+refs/heads/try2: c623d21e388315df672951fcb8efb5000923ab3d
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/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/try2/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/try2/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/try2/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/try2/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/try2/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/try2/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/try2/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/try2/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/try2/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/try2/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/try2/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/try2/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/try2/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/try2/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/try2/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/try2/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,

branches/try2/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/try2/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/try2/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/try2/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)

branches/try2/src/libcore/to_str.rs

@@ -74,53 +74,10 @@ impl<A:ToStr,B:ToStr,C:ToStr> ToStr for (A, B, C) {
     }
 }
 
-impl<A:ToStr> ToStr for &[A] {
-    #[inline(always)]
-    pure fn to_str(&self) -> ~str {
-        unsafe {
-            // FIXME #4568
-            // Bleh -- not really unsafe
-            // push_str and push_char
-            let mut acc = ~"[", first = true;
-            for self.each |elt| {
-                unsafe {
-                    if first { first = false; }
-                    else { str::push_str(&mut acc, ~", "); }
-                    str::push_str(&mut acc, elt.to_str());
-                }
-            }
-            str::push_char(&mut acc, ']');
-            acc
-        }
-    }
-}
-
 impl<A:ToStr> ToStr for ~[A] {
     #[inline(always)]
     pure fn to_str(&self) -> ~str {
         unsafe {
-            // FIXME #4568
-            // Bleh -- not really unsafe
-            // push_str and push_char
-            let mut acc = ~"[", first = true;
-            for self.each |elt| {
-                unsafe {
-                    if first { first = false; }
-                    else { str::push_str(&mut acc, ~", "); }
-                    str::push_str(&mut acc, elt.to_str());
-                }
-            }
-            str::push_char(&mut acc, ']');
-            acc
-        }
-    }
-}
-
-impl<A:ToStr> ToStr for @[A] {
-    #[inline(always)]
-    pure fn to_str(&self) -> ~str {
-        unsafe {
-            // FIXME #4568
             // Bleh -- not really unsafe
             // push_str and push_char
             let mut acc = ~"[", first = true;

branches/try2/src/libcore/vec.rs

@@ -209,6 +209,16 @@ pub pure fn build_sized_opt<A>(size: Option<uint>,
     build_sized(size.get_or_default(4), builder)
 }
 
+/// Produces a mut vector from an immutable vector.
+pub pure fn cast_to_mut<T>(v: ~[T]) -> ~[mut T] {
+    unsafe { ::cast::transmute(v) }
+}
+
+/// Produces an immutable vector from a mut vector.
+pub pure fn cast_from_mut<T>(v: ~[mut T]) -> ~[T] {
+    unsafe { ::cast::transmute(v) }
+}
+
 // Accessors
 
 /// Returns the first element of a vector
@@ -264,10 +274,9 @@ pub pure fn slice<T>(v: &r/[T], start: uint, end: uint) -> &r/[T] {
 
 /// Return a slice that points into another slice.
 #[inline(always)]
-pub pure fn mut_slice<T>(v: &r/mut [T],
-                         start: uint,
-                         end: uint)
-                      -> &r/mut [T] {
+pub pure fn mut_slice<T>(v: &r/[mut T], start: uint,
+                         end: uint) -> &r/[mut T] {
+
     assert (start <= end);
     assert (end <= len(v));
     do as_mut_buf(v) |p, _len| {
@@ -281,10 +290,8 @@ pub pure fn mut_slice<T>(v: &r/mut [T],
 
 /// Return a slice that points into another slice.
 #[inline(always)]
-pub pure fn const_slice<T>(v: &r/[const T],
-                           start: uint,
-                           end: uint)
-                        -> &r/[const T] {
+pub pure fn const_slice<T>(v: &r/[const T], start: uint,
+                      end: uint) -> &r/[const T] {
     assert (start <= end);
     assert (end <= len(v));
     do as_const_buf(v) |p, _len| {
@@ -3330,6 +3337,28 @@ mod tests {
         let _x = windowed (0u, ~[1u,2u,3u,4u,5u,6u]);
     }
 
+    #[test]
+    fn cast_to_mut_no_copy() {
+        unsafe {
+            let x = ~[1, 2, 3];
+            let addr = raw::to_ptr(x);
+            let x_mut = cast_to_mut(x);
+            let addr_mut = raw::to_ptr(x_mut);
+            assert addr == addr_mut;
+        }
+    }
+
+    #[test]
+    fn cast_from_mut_no_copy() {
+        unsafe {
+            let x = ~[mut 1, 2, 3];
+            let addr = raw::to_ptr(x);
+            let x_imm = cast_from_mut(x);
+            let addr_imm = raw::to_ptr(x_imm);
+            assert addr == addr_imm;
+        }
+    }
+
     #[test]
     fn test_unshift() {
         let mut x = ~[1, 2, 3];