---

yaml
---
r: 139000
b: refs/heads/try2
c: d8094f8
h: refs/heads/master
v: v3

Author: xenocons

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

branches/try2/RELEASES.txt

@@ -1,90 +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, replaced with `Clone`?
-      * `std::map` removed, replaced with `core::hashmap`
-
-   * 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
-      * Types with owned pointers or custom destructors 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
-      * Added big integers to `std::bigint`
-      * Removed `core::oldcomm` module
-      * Added pipe-based `core::comm` module
-      * Numeric traits have been reorganized under `core::num`
-      * `vec::slice` finally returns a slice
-      * `debug!` and friends don't require a format string, e.g. `debug!(Foo)`
-      * Containers reorganized around traits in `core::container`
-      * `core::dvec` removed, `~[T]` is a drop-in replacement
-      * `core::send_map` renamed to `core::hashmap`
-      * `std::treemap` reimplemented as an owned balanced tree
-      * `std::deque` and `std::smallintmap` reimplemented as owned containers
-      * `core::trie` added as a fast ordered map for integer keys
-      * Set types added to `core::hashmap`, `core::trie` and `std::treemap`
-
-   * 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/doc/rust.md

@@ -212,7 +212,7 @@ do drop
 else enum extern
 false fn for
 if impl
-let loop
+let log loop
 match mod mut
 priv pub pure
 ref return
@@ -805,20 +805,21 @@ Use declarations support a number of "convenience" notations:
 An example of `use` declarations:
 
 ~~~~
+use foo = core::info;
 use core::float::sin;
 use core::str::{slice, to_upper};
 use core::option::Some;
 
 fn main() {
-    // Equivalent to 'info!(core::float::sin(1.0));'
-    info!(sin(1.0));
+    // Equivalent to 'log(core::info, core::float::sin(1.0));'
+    log(foo, sin(1.0));
 
-    // Equivalent to 'info!(core::option::Some(1.0));'
-    info!(Some(1.0));
+    // Equivalent to 'log(core::info, core::option::Some(1.0));'
+    log(info, Some(1.0));
 
-    // Equivalent to
-    // 'info!(core::str::to_upper(core::str::slice("foo", 0, 1)));'
-    info!(to_upper(slice("foo", 0, 1)));
+    // Equivalent to 'log(core::info,
+    //                    core::str::to_upper(core::str::slice("foo", 0, 1)));'
+    log(info, to_upper(slice("foo", 0, 1)));
 }
 ~~~~
 
@@ -888,10 +889,10 @@ declared, in an angle-bracket-enclosed, comma-separated list following
 the function name.
 
 ~~~~ {.xfail-test}
-fn iter<T>(seq: &[T], f: &fn(T)) {
+fn iter<T>(seq: &[T], f: fn(T)) {
     for seq.each |elt| { f(elt); }
 }
-fn map<T, U>(seq: &[T], f: &fn(T) -> U) -> ~[U] {
+fn map<T, U>(seq: &[T], f: fn(T) -> U) -> ~[U] {
     let mut acc = ~[];
     for seq.each |elt| { acc.push(f(elt)); }
     acc
@@ -989,7 +990,7 @@ output slot type would normally be. For example:
 
 ~~~~
 fn my_err(s: &str) -> ! {
-    info!(s);
+    log(info, s);
     fail!();
 }
 ~~~~
@@ -1181,8 +1182,8 @@ Traits are implemented for specific types through separate [implementations](#im
 # type BoundingBox = int;
 
 trait Shape {
-    fn draw(&self, Surface);
-    fn bounding_box(&self) -> BoundingBox;
+    fn draw(Surface);
+    fn bounding_box() -> BoundingBox;
 }
 ~~~~
 
@@ -1195,9 +1196,9 @@ These appear after the trait name, using the same syntax used in [generic functi
 
 ~~~~
 trait Seq<T> {
-   fn len(&self) -> uint;
-   fn elt_at(&self, n: uint) -> T;
-   fn iter(&self, &fn(T));
+   fn len() -> uint;
+   fn elt_at(n: uint) -> T;
+   fn iter(fn(T));
 }
 ~~~~
 
@@ -1209,7 +1210,7 @@ For example:
 
 ~~~~
 # type Surface = int;
-# trait Shape { fn draw(&self, Surface); }
+# trait Shape { fn draw(Surface); }
 
 fn draw_twice<T: Shape>(surface: Surface, sh: T) {
     sh.draw(surface);
@@ -1227,7 +1228,7 @@ to pointers to the trait name, used as a type.
 # impl Shape for int { }
 # let mycircle = 0;
 
-let myshape: @Shape = @mycircle as @Shape;
+let myshape: Shape = @mycircle as @Shape;
 ~~~~
 
 The resulting value is a managed box containing the value that was cast,
@@ -1271,8 +1272,8 @@ methods of the supertrait may be called on values of subtrait-bound type paramet
 Refering to the previous example of `trait Circle : Shape`:
 
 ~~~
-# trait Shape { fn area(&self) -> float; }
-# trait Circle : Shape { fn radius(&self) -> float; }
+# trait Shape { fn area() -> float; }
+# trait Circle : Shape { fn radius() -> float; }
 fn radius_times_area<T: Circle>(c: T) -> float {
     // `c` is both a Circle and a Shape
     c.radius() * c.area()
@@ -1282,10 +1283,10 @@ fn radius_times_area<T: Circle>(c: T) -> float {
 Likewise, supertrait methods may also be called on trait objects.
 
 ~~~ {.xfail-test}
-# trait Shape { fn area(&self) -> float; }
-# trait Circle : Shape { fn radius(&self) -> float; }
-# impl Shape for int { fn area(&self) -> float { 0.0 } }
-# impl Circle for int { fn radius(&self) -> float { 0.0 } }
+# trait Shape { fn area() -> float; }
+# trait Circle : Shape { fn radius() -> float; }
+# impl Shape for int { fn area() -> float { 0.0 } }
+# impl Circle for int { fn radius() -> float { 0.0 } }
 # let mycircle = 0;
 
 let mycircle: Circle = @mycircle as @Circle;
@@ -1302,7 +1303,7 @@ Implementations are defined with the keyword `impl`.
 # struct Point {x: float, y: float};
 # type Surface = int;
 # struct BoundingBox {x: float, y: float, width: float, height: float};
-# trait Shape { fn draw(&self, Surface); fn bounding_box(&self) -> BoundingBox; }
+# trait Shape { fn draw(Surface); fn bounding_box() -> BoundingBox; }
 # fn do_draw_circle(s: Surface, c: Circle) { }
 
 struct Circle {
@@ -1311,8 +1312,8 @@ struct Circle {
 }
 
 impl Shape for Circle {
-    fn draw(&self, s: Surface) { do_draw_circle(s, *self); }
-    fn bounding_box(&self) -> BoundingBox {
+    fn draw(s: Surface) { do_draw_circle(s, self); }
+    fn bounding_box() -> BoundingBox {
         let r = self.radius;
         BoundingBox{x: self.center.x - r, y: self.center.y - r,
          width: 2.0 * r, height: 2.0 * r}
@@ -2073,7 +2074,7 @@ and moving values from the environment into the lambda expression's captured env
 An example of a lambda expression:
 
 ~~~~
-fn ten_times(f: &fn(int)) {
+fn ten_times(f: fn(int)) {
     let mut i = 0;
     while i < 10 {
         f(i);
@@ -2176,7 +2177,7 @@ If the `expr` is a [field expression](#field-expressions), it is parsed as thoug
 In this example, both calls to `f` are equivalent:
 
 ~~~~
-# fn f(f: &fn(int)) { }
+# fn f(f: fn(int)) { }
 # fn g(i: int) { }
 
 f(|j| g(j));
@@ -2396,6 +2397,58 @@ fn max(a: int, b: int) -> int {
 }
 ~~~~
 
+### Log expressions
+
+~~~~~~~~{.ebnf .gram}
+log_expr : "log" '(' level ',' expr ')' ;
+~~~~~~~~
+
+Evaluating a `log` expression may, depending on runtime configuration, cause a
+value to be appended to an internal diagnostic logging buffer provided by the
+runtime or emitted to a system console. Log expressions are enabled or
+disabled dynamically at run-time on a per-task and per-item basis. See
+[logging system](#logging-system).
+
+Each `log` expression must be provided with a *level* argument in
+addition to the value to log. The logging level is a `u32` value, where
+lower levels indicate more-urgent levels of logging. By default, the lowest
+four logging levels (`1_u32 ... 4_u32`) are predefined as the constants
+`error`, `warn`, `info` and `debug` in the `core` library.
+
+Additionally, the macros `error!`, `warn!`, `info!` and `debug!` are defined
+in the default syntax-extension namespace. These expand into calls to the
+logging facility composed with calls to the `fmt!` string formatting
+syntax-extension.
+
+The following examples all produce the same output, logged at the `error`
+logging level:
+
+~~~~
+# let filename = "bulbasaur";
+
+// Full version, logging a value.
+log(core::error, ~"file not found: " + filename);
+
+// Log-level abbreviated, since core::* is used by default.
+log(error, ~"file not found: " + filename);
+
+// Formatting the message using a format-string and fmt!
+log(error, fmt!("file not found: %s", filename));
+
+// Using the error! macro, that expands to the previous call.
+error!("file not found: %s", filename);
+~~~~
+
+A `log` expression is *not evaluated* when logging at the specified logging-level, module or task is disabled at runtime.
+This makes inactive `log` expressions very cheap;
+they should be used extensively in Rust code, as diagnostic aids,
+as they add little overhead beyond a single integer-compare and branch at runtime.
+
+Logging is presently implemented as a language built-in feature,
+as it makes use of compiler-provided, per-module data tables and flags.
+In the future, logging will move into a library, and will no longer be a core expression type.
+It is therefore recommended to use the macro forms of logging (`error!`, `debug!`, etc.) to minimize disruption in code that uses logging.
+
 
 # Type system
 
@@ -2678,11 +2731,11 @@ An example of an object type:
 
 ~~~~~~~~
 trait Printable {
-  fn to_str(&self) -> ~str;
+  fn to_str() -> ~str;
 }
 
 impl Printable for int {
-  fn to_str(&self) -> ~str { int::to_str(*self) }
+  fn to_str() -> ~str { int::to_str(self) }
 }
 
 fn print(a: @Printable) {
@@ -2702,7 +2755,7 @@ and the cast expression in `main`.
 Within the body of an item that has type parameter declarations, the names of its type parameters are types:
 
 ~~~~~~~
-fn map<A: Copy, B: Copy>(f: &fn(A) -> B, xs: &[A]) -> ~[B] {
+fn map<A: Copy, B: Copy>(f: fn(A) -> B, xs: &[A]) -> ~[B] {
    if xs.len() == 0 { return ~[]; }
    let first: B = f(xs[0]);
    let rest: ~[B] = map(f, xs.slice(1, xs.len()));
@@ -2721,11 +2774,11 @@ example, in:
 
 ~~~~~~~~
 trait Printable {
-  fn make_string(&self) -> ~str;
+  fn make_string() -> ~str;
 }
 
 impl Printable for ~str {
-  fn make_string(&self) -> ~str { copy *self }
+  fn make_string() -> ~str { copy self }
 }
 ~~~~~~~~
 
@@ -3096,7 +3149,7 @@ communication facilities.
 
 The runtime contains a system for directing [logging
 expressions](#log-expressions) to a logging console and/or internal logging
-buffers. Logging can be enabled per module.
+buffers. Logging expressions can be enabled per module.
 
 Logging output is enabled by setting the `RUST_LOG` environment
 variable.  `RUST_LOG` accepts a logging specification made up of a