---

yaml
---
r: 46969
b: refs/heads/try
c: 13fe167
h: refs/heads/master
i:
  46967: 5e01573
v: v3

Author: Nick Desaulniers

[refs]

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

branches/try/doc/rust.md

@@ -686,15 +686,15 @@ mod math {
     type complex = (f64, f64);
     fn sin(f: f64) -> f64 {
         ...
-# die!();
+# fail!();
     }
     fn cos(f: f64) -> f64 {
         ...
-# die!();
+# fail!();
     }
     fn tan(f: f64) -> f64 {
         ...
-# die!();
+# fail!();
     }
 }
 ~~~~~~~~
@@ -986,7 +986,7 @@ output slot type would normally be. For example:
 ~~~~
 fn my_err(s: &str) -> ! {
     log(info, s);
-    die!();
+    fail!();
 }
 ~~~~
 
@@ -1004,7 +1004,7 @@ were declared without the `!` annotation, the following code would not
 typecheck:
 
 ~~~~
-# fn my_err(s: &str) -> ! { die!() }
+# fn my_err(s: &str) -> ! { fail!() }
 
 fn f(i: int) -> int {
    if i == 42 {
@@ -2284,9 +2284,9 @@ enum List<X> { Nil, Cons(X, @List<X>) }
 let x: List<int> = Cons(10, @Cons(11, @Nil));
 
 match x {
-    Cons(_, @Nil) => die!(~"singleton list"),
+    Cons(_, @Nil) => fail!(~"singleton list"),
     Cons(*)       => return,
-    Nil           => die!(~"empty list")
+    Nil           => fail!(~"empty list")
 }
 ~~~~
 
@@ -2323,7 +2323,7 @@ match x {
         return;
     }
     _ => {
-        die!();
+        fail!();
     }
 }
 ~~~~
@@ -2411,7 +2411,7 @@ guard may refer to the variables bound within the pattern they follow.
 let message = match maybe_digit {
   Some(x) if x < 10 => process_digit(x),
   Some(x) => process_other(x),
-  None => die!()
+  None => fail!()
 };
 ~~~~
 

branches/try/doc/tutorial-macros.md

@@ -218,7 +218,7 @@ match x {
                 // complicated stuff goes here
                 return result + val;
             },
-            _ => die!(~"Didn't get good_2")
+            _ => fail!(~"Didn't get good_2")
         }
     }
     _ => return 0 // default value
@@ -260,7 +260,7 @@ macro_rules! biased_match (
 biased_match!((x)       ~ (good_1(g1, val)) else { return 0 };
               binds g1, val )
 biased_match!((g1.body) ~ (good_2(result) )
-                  else { die!(~"Didn't get good_2") };
+                  else { fail!(~"Didn't get good_2") };
               binds result )
 // complicated stuff goes here
 return result + val;
@@ -362,7 +362,7 @@ macro_rules! biased_match (
 # fn f(x: t1) -> uint {
 biased_match!(
     (x)       ~ (good_1(g1, val)) else { return 0 };
-    (g1.body) ~ (good_2(result) ) else { die!(~"Didn't get good_2") };
+    (g1.body) ~ (good_2(result) ) else { fail!(~"Didn't get good_2") };
     binds val, result )
 // complicated stuff goes here
 return result + val;

branches/try/doc/tutorial-tasks.md

@@ -313,7 +313,7 @@ of all tasks are intertwined: if one fails, so do all the others.
 # fn do_some_work() { loop { task::yield() } }
 # do task::try {
 // Create a child task that fails
-do spawn { die!() }
+do spawn { fail!() }
 
 // This will also fail because the task we spawned failed
 do_some_work();
@@ -337,7 +337,7 @@ let result: Result<int, ()> = do task::try {
     if some_condition() {
         calculate_result()
     } else {
-        die!(~"oops!");
+        fail!(~"oops!");
     }
 };
 assert result.is_err();
@@ -370,14 +370,14 @@ proceed). Hence, you will need different _linked failure modes_.
 ## Failure modes
 
 By default, task failure is _bidirectionally linked_, which means that if
-either task dies, it kills the other one.
+either task fails, it kills the other one.
 
 ~~~
 # fn sleep_forever() { loop { task::yield() } }
 # do task::try {
 do task::spawn {
     do task::spawn {
-        die!();  // All three tasks will die.
+        fail!();  // All three tasks will fail.
     }
     sleep_forever();  // Will get woken up by force, then fail
 }
@@ -386,7 +386,7 @@ sleep_forever();  // Will get woken up by force, then fail
 ~~~
 
 If you want parent tasks to be able to kill their children, but do not want a
-parent to die automatically if one of its child task dies, you can call
+parent to fail automatically if one of its child task fails, you can call
 `task::spawn_supervised` for _unidirectionally linked_ failure. The
 function `task::try`, which we saw previously, uses `spawn_supervised`
 internally, with additional logic to wait for the child task to finish
@@ -432,7 +432,7 @@ do task::spawn_supervised {
     // Intermediate task immediately exits
 }
 wait_for_a_while();
-die!();  // Will kill grandchild even if child has already exited
+fail!();  // Will kill grandchild even if child has already exited
 # };
 ~~~
 
@@ -446,10 +446,10 @@ other at all, using `task::spawn_unlinked` for _isolated failure_.
 let (time1, time2) = (random(), random());
 do task::spawn_unlinked {
     sleep_for(time2);  // Won't get forced awake
-    die!();
+    fail!();
 }
 sleep_for(time1);  // Won't get forced awake
-die!();
+fail!();
 // It will take MAX(time1,time2) for the program to finish.
 # };
 ~~~

branches/try/src/etc/licenseck.py

@@ -8,8 +8,7 @@
 # option. This file may not be copied, modified, or distributed
 # except according to those terms.
 
-license0 = """\
-// Copyright 2012-2013 The Rust Project Developers. See the
+license0 = """// Copyright 2012-2013 The Rust Project Developers. See the
 // COPYRIGHT file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -20,8 +19,7 @@
 // except according to those terms.
 """
 
-license1 = """\
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+license1 = """// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -32,8 +30,7 @@
 // except according to those terms.
 """
 
-license2 = """\
-// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+license2 = """// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -44,8 +41,7 @@
 // except according to those terms.
 """
 
-license3 = """\
-# Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+license3 = """# Copyright 2013 The Rust Project Developers. See the COPYRIGHT
 # file at the top-level directory of this distribution and at
 # http://rust-lang.org/COPYRIGHT.
 #
@@ -56,19 +52,7 @@
 # except according to those terms.
 """
 
-license4 = """\
-// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-"""
-
-licenses = [license0, license1, license2, license3, license4]
+licenses = [license0, license1, license2, license3]
 
 exceptions = [
     "rt/rust_android_dummy.cpp", # BSD, chromium

branches/try/src/libcore/bool.rs

@@ -74,7 +74,7 @@ pub fn all_values(blk: fn(v: bool)) {
 pub pure fn to_bit(v: bool) -> u8 { if v { 1u8 } else { 0u8 } }
 
 #[cfg(notest)]
-impl cmp::Eq for bool {
+impl bool : cmp::Eq {
     pure fn eq(&self, other: &bool) -> bool { (*self) == (*other) }
     pure fn ne(&self, other: &bool) -> bool { (*self) != (*other) }
 }

branches/try/src/libcore/char.rs

@@ -251,7 +251,7 @@ pub pure fn cmp(a: char, b: char) -> int {
 }
 
 #[cfg(notest)]
-impl Eq for char {
+impl char : Eq {
     pure fn eq(&self, other: &char) -> bool { (*self) == (*other) }
     pure fn ne(&self, other: &char) -> bool { (*self) != (*other) }
 }

branches/try/src/libcore/clone.rs

@@ -15,7 +15,7 @@ pub trait Clone {
     fn clone(&self) -> Self;
 }
 
-impl Clone for () {
+impl (): Clone {
     #[inline(always)]
     fn clone(&self) -> () { () }
 }

branches/try/src/libcore/condition.rs

@@ -84,7 +84,7 @@ struct Guard<T, U> {
     cond: &Condition<T, U>
 }
 
-impl<T, U> Drop for Guard<T, U> {
+impl<T, U> Guard<T, U> : Drop {
     fn finalize(&self) {
         unsafe {
             debug!("Guard: popping handler from TLS");

branches/try/src/libcore/dvec.rs

@@ -358,7 +358,7 @@ impl<A: Copy> DVec<A> {
     }
 }
 
-impl<A:Copy> Index<uint,A> for DVec<A> {
+impl<A:Copy> DVec<A>: Index<uint,A> {
     #[inline(always)]
     pure fn index(&self, idx: uint) -> A {
         self.get_elt(idx)

branches/try/src/libcore/hash.rs

@@ -59,7 +59,7 @@ pub trait HashUtil {
     pure fn hash() -> u64;
 }
 
-impl<A: Hash> HashUtil for A {
+impl <A: Hash> A: HashUtil {
     #[inline(always)]
     pure fn hash() -> u64 { self.hash_keyed(0,0) }
 }
@@ -74,7 +74,7 @@ pub trait Streaming {
     fn reset();
 }
 
-impl<A: IterBytes> Hash for A {
+impl <A: IterBytes> A: Hash {
     #[inline(always)]
     pure fn hash_keyed(k0: u64, k1: u64) -> u64 {
         unsafe {
@@ -187,7 +187,7 @@ fn SipState(key0: u64, key1: u64) -> SipState {
 }
 
 
-impl io::Writer for SipState {
+impl SipState : io::Writer {
 
     // Methods for io::writer
     #[inline(always)]
@@ -295,7 +295,7 @@ impl io::Writer for SipState {
     }
 }
 
-impl Streaming for &SipState {
+impl &SipState : Streaming {
 
     #[inline(always)]
     fn input(buf: &[const u8]) {

branches/try/src/libcore/hashmap.rs

@@ -240,7 +240,7 @@ pub mod linear {
         }
     }
 
-    impl<K: Hash IterBytes Eq, V> BaseIter<(&K, &V)> for LinearMap<K, V> {
+    impl <K: Hash IterBytes Eq, V> LinearMap<K, V>: BaseIter<(&K, &V)> {
         /// Visit all key-value pairs
         pure fn each(&self, blk: fn(&(&self/K, &self/V)) -> bool) {
             for uint::range(0, self.buckets.len()) |i| {
@@ -257,15 +257,15 @@ pub mod linear {
     }
 
 
-    impl<K: Hash IterBytes Eq, V> Container for LinearMap<K, V> {
+    impl <K: Hash IterBytes Eq, V> LinearMap<K, V>: Container {
         /// Return the number of elements in the map
         pure fn len(&self) -> uint { self.size }
 
         /// Return true if the map contains no elements
         pure fn is_empty(&self) -> bool { self.len() == 0 }
     }
 
-    impl<K: Hash IterBytes Eq, V> Mutable for LinearMap<K, V> {
+    impl <K: Hash IterBytes Eq, V> LinearMap<K, V>: Mutable {
         /// Clear the map, removing all key-value pairs.
         fn clear(&mut self) {
             for uint::range(0, self.buckets.len()) |idx| {
@@ -275,7 +275,7 @@ pub mod linear {
         }
     }
 
-    impl<K: Hash IterBytes Eq, V> Map<K, V> for LinearMap<K, V> {
+    impl <K: Hash IterBytes Eq, V> LinearMap<K, V>: Map<K, V> {
         /// Return true if the map contains a value for the specified key
         pure fn contains_key(&self, k: &K) -> bool {
             match self.bucket_for_key(k) {
@@ -443,7 +443,7 @@ pub mod linear {
         }
     }
 
-    impl<K: Hash IterBytes Eq, V: Eq> Eq for LinearMap<K, V> {
+    impl<K: Hash IterBytes Eq, V: Eq> LinearMap<K, V>: Eq {
         pure fn eq(&self, other: &LinearMap<K, V>) -> bool {
             if self.len() != other.len() { return false; }
 
@@ -464,13 +464,13 @@ pub mod linear {
         priv map: LinearMap<T, ()>
     }
 
-    impl<T: Hash IterBytes Eq> BaseIter<T> for LinearSet<T> {
+    impl <T: Hash IterBytes Eq> LinearSet<T>: BaseIter<T> {
         /// Visit all values in order
         pure fn each(&self, f: fn(&T) -> bool) { self.map.each_key(f) }
         pure fn size_hint(&self) -> Option<uint> { Some(self.len()) }
     }
 
-    impl<T: Hash IterBytes Eq> Eq for LinearSet<T> {
+    impl <T: Hash IterBytes Eq> LinearSet<T>: Eq {
         pure fn eq(&self, other: &LinearSet<T>) -> bool {
             self.map == other.map
         }
@@ -479,20 +479,20 @@ pub mod linear {
         }
     }
 
-    impl<T: Hash IterBytes Eq> Container for LinearSet<T> {
+    impl <T: Hash IterBytes Eq> LinearSet<T>: Container {
         /// Return the number of elements in the set
         pure fn len(&self) -> uint { self.map.len() }
 
         /// Return true if the set contains no elements
         pure fn is_empty(&self) -> bool { self.map.is_empty() }
     }
 
-    impl<T: Hash IterBytes Eq> Mutable for LinearSet<T> {
+    impl <T: Hash IterBytes Eq> LinearSet<T>: Mutable {
         /// Clear the set, removing all values.
         fn clear(&mut self) { self.map.clear() }
     }
 
-    impl<T: Hash IterBytes Eq> Set<T> for LinearSet<T> {
+    impl <T: Hash IterBytes Eq> LinearSet<T>: Set<T> {
         /// Return true if the set contains a value
         pure fn contains(&self, value: &T) -> bool {
             self.map.contains_key(value)