---

yaml
---
r: 138936
b: refs/heads/try2
c: a21b43c
h: refs/heads/master
v: v3

Author: bstrie

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

branches/try2/RELEASES.txt

@@ -1,85 +1,8 @@
-Version 0.6 (March 2013)
+Version 0.6 (?)
 ---------------------------
 
-   * ~??? changes, numerous bugfixes
-
-   * TODO:
-      * Ord/Cmp
-      * Lifetime changes
-      * Implicit self
-      * Remove `static` keyword
-      * Static method syntax
-      * `as Trait`
-      * `copy` removed?
-
-   * Syntax changes
-      * The self type parameter in traits is now spelled `Self`
-      * Replaced the `Durable` trait with the `'static` lifetime
-      * The old closure type syntax with the trailing sigil has been
-        removed in favor of the more consistent leading sigil
-      * `super` is a keyword, and may be prefixed to paths
-      * Trait bounds are separated with `+` instead of whitespace
-      * Traits are implemented with `impl Trait for Type`
-        instead of `impl Type: Trait`
-      * The `export` keyword has finally been removed
-      * The `move` keyword has been removed (linear types move by default)
-      * The interior mutability qualifier on vectors, `[mut T]`, has been
-        removed. Use `&mut [T]`, etc.
-      * `mut` is no longer valid in `~mut T`. Use inherited mutability
-      * `fail` is no longer a keyword. Use `fail!()`
-      * `assert` is no longer a keyword. Use `assert!()`
-      * `log` is no longer a keyword. use `debug!`, etc.
-      * 1-tuples may be represented as `(T,)`
-      * Struct fields may no longer be `mut`. Use inherited mutability,
-        `@mut T`, `core::mut` or `core::cell`
-      * `extern mod { ... }` is no longer valid syntax for foreign
-        function modules. Use extern blocks: `extern { ... }`
-      * Newtype enums removed. Used tuple-structs.
-      * Trait implementations no longer support visibility modifiers
-
-   * Semantic changes
-      * Linear types move by default, eliminating the `move` keyword
-      * All foreign functions are considered unsafe
-      * &mut is now unaliasable
-      * Writes to borrowed @mut pointers are prevented dynamically
-      * () has size 0
-      * The name of the main function can be customized using #[main]
-      * The default type of an inferred closure is &fn instead of @fn
-      * Name resolution continues to be tweaked
-      * Method visibility is inherited from the implementation declaration
-
-   * Other language changes
-      * Structural records have been removed
-      * Many more types can be used in constants, including enums
-        `static lifetime pointers and vectors
-      * Pattern matching over vectors improved and expanded
-      * Typechecking of closure types has been overhauled to
-        improve inference and eliminate unsoundness
-
    * Libraries
-      * Lots of effort to organize the container API's around `core::container`
-      * `core::send_map` renamed to `core::hashmap`
-      * Added big integers to `std::bigint`
-      * Removed `core::oldcomm` module
-      * Added pipe-based `core::comm` module
-      * Reimplemented `std::treemap`
-      * Numeric traits have been reorganized under `core::num`
-      * `core::dvec` removed. Use `@mut ~[T]` or other language types
-      * `vec::slice` finally returns a slice
-      * `debug!` and friends don't require a format string, e.g. `debug!(Foo)`
-
-   * Tools
-      * Replaced the 'cargo' package manager with 'rustpkg'
-      * Added all-purpose 'rust' tool
-      * `rustc --test` now supports a benchmarks with the `#[bench]` attribute
-      * rustc now attempts to offer spelling suggestions
-
-   * Misc
-      * Improved support for ARM and Android
-      * Preliminary MIPS backend
-      * Improved foreign function ABI implementation for x86, x86_64
-      * Various and memory usage improvements
-      * Rust code may be embedded in foreign code under limited circumstances
+     * `core::send_map` renamed to `core::hashmap`
 
 Version 0.5 (December 2012)
 ---------------------------

branches/try2/src/libcore/core.rc

@@ -243,8 +243,7 @@ pub mod unicode;
 #[path = "num/cmath.rs"]
 pub mod cmath;
 pub mod stackwalk;
-#[path = "rt/mod.rs"]
-pub mod rt;
+
 
 // A curious inner-module that's not exported that contains the binding
 // 'core' so that macro-expanded references to core::error and such

branches/try2/src/libcore/option.rs

@@ -42,6 +42,7 @@ let unwrapped_msg = match msg {
 */
 
 use cmp::{Eq,Ord};
+use ops::Add;
 use kinds::Copy;
 use util;
 use num::Zero;
@@ -85,6 +86,18 @@ impl<T:Ord> Ord for Option<T> {
     }
 }
 
+impl<T: Copy + Add<T,T>> Add<Option<T>, Option<T>> for Option<T> {
+    #[inline(always)]
+    pure fn add(&self, other: &Option<T>) -> Option<T> {
+        match (*self, *other) {
+            (None, None) => None,
+            (_, None) => *self,
+            (None, _) => *other,
+            (Some(ref lhs), Some(ref rhs)) => Some(*lhs + *rhs)
+        }
+    }
+}
+
 #[inline(always)]
 pub pure fn get<T:Copy>(opt: Option<T>) -> T {
     /*!
@@ -130,27 +143,6 @@ pub pure fn get_ref<T>(opt: &r/Option<T>) -> &r/T {
     }
 }
 
-pub pure fn get_mut_ref<T>(opt: &r/mut Option<T>) -> &r/mut T {
-    /*!
-    Gets a mutable reference to the value inside an option.
-
-    # Failure
-
-    Fails if the value equals `None`
-
-    # Safety note
-
-    In general, because this function may fail, its use is discouraged
-    (calling `get` on `None` is akin to dereferencing a null pointer).
-    Instead, prefer to use pattern matching and handle the `None`
-    case explicitly.
-     */
-    match *opt {
-        Some(ref mut x) => x,
-        None => fail!(~"option::get_mut_ref none")
-    }
-}
-
 #[inline(always)]
 pub pure fn map<T, U>(opt: &r/Option<T>, f: &fn(x: &r/T) -> U) -> Option<U> {
     //! Maps a `some` value by reference from one type to another
@@ -385,23 +377,6 @@ pub impl<T> Option<T> {
     #[inline(always)]
     pure fn get_ref(&self) -> &self/T { get_ref(self) }
 
-    /**
-    Gets a mutable reference to the value inside an option.
-
-    # Failure
-
-    Fails if the value equals `None`
-
-    # Safety note
-
-    In general, because this function may fail, its use is discouraged
-    (calling `get` on `None` is akin to dereferencing a null pointer).
-    Instead, prefer to use pattern matching and handle the `None`
-    case explicitly.
-     */
-    #[inline(always)]
-    pure fn get_mut_ref(&mut self) -> &self/mut T { get_mut_ref(self) }
-
     /**
      * Gets the value out of an option without copying.
      *