---

yaml
---
r: 47646
b: refs/heads/incoming
c: 4699ac6
h: refs/heads/master
v: v3

Author: Nick Desaulniers

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/incoming: 7103ca95ac8e92fd32ab65321cd443a7233a48e0
+refs/heads/incoming: 4699ac67c6b48331852f3960430a3c8cfcaf7b90
 refs/heads/dist-snap: 8b98e5a296d95c5e832db0756828e5bec31c6f50
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/AUTHORS.txt

@@ -29,6 +29,7 @@ Benjamin Peterson <[email protected]>
 Bilal Husain <[email protected]>
 Bill Fallon <[email protected]>
 Brendan Eich <[email protected]>
+Brendan Zabarauskas <[email protected]>
 Brian Anderson <[email protected]>
 Brian J. Burg <[email protected]>
 Brian Leibig <[email protected]>
@@ -80,6 +81,7 @@ Jeff Muizelaar <[email protected]>
 Jeff Olson <[email protected]>
 Jeffrey Yasskin <[email protected]>
 Jens Nockert <[email protected]>
+Jesse Jones <[email protected]>
 Jesse Ruderman <[email protected]>
 Jim Blandy <[email protected]>
 Jimmy Lu <[email protected]>
@@ -105,6 +107,7 @@ Mahmut Bulut <[email protected]>
 Margaret Meyerhofer <[email protected]>
 Marijn Haverbeke <[email protected]>
 Mark Lacey <[email protected]>
+Mark Vian <[email protected]>
 Martin DeMello <[email protected]>
 Marvin Löbel <[email protected]>
 Matt Brubeck <[email protected]>
@@ -149,6 +152,7 @@ Tim Taubert <[email protected]>
 Tom Lee <[email protected]>
 Tomoki Aonuma <[email protected]>
 Tony Young <[email protected]>
+Trinick <[email protected]>
 Tycho Sci <[email protected]>
 Tyler Bindon <[email protected]>
 Viktor Dahl <[email protected]>

branches/incoming/configure

@@ -394,6 +394,7 @@ probe CFG_PDFLATEX         pdflatex
 probe CFG_XETEX            xetex
 probe CFG_LUATEX           luatex
 probe CFG_NODE             nodejs node
+probe CFG_GDB              gdb
 if [ "$CFG_OSTYPE" = "unknown-linux-gnu" ]
 then
     probe CFG_PAXCTL           paxctl /sbin/paxctl
@@ -619,6 +620,7 @@ do
     make_dir $h/test/bench
     make_dir $h/test/perf
     make_dir $h/test/pretty
+    make_dir $h/test/debug-info
     make_dir $h/test/doc-tutorial
     make_dir $h/test/doc-tutorial-ffi
     make_dir $h/test/doc-tutorial-macros

branches/incoming/doc/rust.md

@@ -202,13 +202,7 @@ grammar as double-quoted strings. Other tokens have exact rules given.
 
 ### Keywords
 
-The keywords in [crate files](#crate-files) are the following strings:
-
-~~~~~~~~ {.keyword}
-mod priv pub use
-~~~~~~~~
-
-The keywords in [source files](#source-files) are the following strings:
+The keywords are the following strings:
 
 ~~~~~~~~ {.keyword}
 as assert
@@ -1215,7 +1209,7 @@ to pointers to the trait name, used as a type.
 
 ~~~~
 # trait Shape { }
-# impl int: Shape { }
+# impl Shape for int { }
 # let mycircle = 0;
 
 let myshape: Shape = @mycircle as @Shape;
@@ -1239,7 +1233,7 @@ For example:
 trait Num {
     static pure fn from_int(n: int) -> Self;
 }
-impl float: Num {
+impl Num for float {
     static pure fn from_int(n: int) -> float { n as float }
 }
 let x: float = Num::from_int(42);
@@ -1275,8 +1269,8 @@ Likewise, supertrait methods may also be called on trait objects.
 ~~~ {.xfail-test}
 # trait Shape { fn area() -> float; }
 # trait Circle : Shape { fn radius() -> float; }
-# impl int: Shape { fn area() -> float { 0.0 } }
-# impl int: Circle { fn radius() -> float { 0.0 } }
+# 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;
@@ -1298,7 +1292,7 @@ Implementations are defined with the keyword `impl`.
 
 type Circle = {radius: float, center: Point};
 
-impl Circle: Shape {
+impl Shape for Circle {
     fn draw(s: Surface) { do_draw_circle(s, self); }
     fn bounding_box() -> BoundingBox {
         let r = self.radius;
@@ -1309,9 +1303,9 @@ impl Circle: Shape {
 ~~~~
 
 It is possible to define an implementation without referring to a trait.
-The methods in such an implementation can only be used statically
-(as direct calls on the values of the type that the implementation targets).
-In such an implementation, the type after the colon is omitted.
+The methods in such an implementation can only be used
+as direct calls on the values of the type that the implementation targets.
+In such an implementation, the trait type and `for` after `impl` are omitted.
 Such implementations are limited to nominal types (enums, structs),
 and the implementation must appear in the same module or a sub-module as the `self` type.
 
@@ -1326,10 +1320,10 @@ Implementation parameters are written after after the `impl` keyword.
 ~~~~
 # trait Seq<T> { }
 
-impl<T> ~[T]: Seq<T> {
+impl<T> Seq<T> for ~[T] {
    ...
 }
-impl u32: Seq<bool> {
+impl Seq<bool> for u32 {
    /* Treat the integer as a sequence of bits */
 }
 ~~~~
@@ -2807,7 +2801,7 @@ trait Printable {
   fn to_str() -> ~str;
 }
 
-impl int: Printable {
+impl Printable for int {
   fn to_str() -> ~str { int::to_str(self) }
 }
 
@@ -2850,7 +2844,7 @@ trait Printable {
   fn make_string() -> ~str;
 }
 
-impl ~str: Printable {
+impl Printable for ~str {
   fn make_string() -> ~str { copy self }
 }
 ~~~~~~~~

branches/incoming/doc/tutorial.md

@@ -1909,7 +1909,7 @@ struct TimeBomb {
     explosivity: uint
 }
 
-impl TimeBomb : Drop {
+impl Drop for TimeBomb {
     fn finalize(&self) {
         for iter::repeat(self.explosivity) {
             io::println("blam!");
@@ -1943,11 +1943,11 @@ and `&str`.
 
 ~~~~
 # trait Printable { fn print(&self); }
-impl int: Printable {
+impl Printable for int {
     fn print(&self) { io::println(fmt!("%d", *self)) }
 }
 
-impl &str: Printable {
+impl Printable for &str {
     fn print(&self) { io::println(*self) }
 }
 
@@ -1966,7 +1966,7 @@ trait Seq<T> {
     fn iter(&self, b: fn(v: &T));
 }
 
-impl<T> ~[T]: Seq<T> {
+impl<T> Seq<T> for ~[T] {
     fn len(&self) -> uint { vec::len(*self) }
     fn iter(&self, b: fn(v: &T)) {
         for vec::each(*self) |elt| { b(elt); }
@@ -1978,7 +1978,7 @@ The implementation has to explicitly declare the type parameter that
 it binds, `T`, before using it to specify its trait type. Rust
 requires this declaration because the `impl` could also, for example,
 specify an implementation of `Seq<int>`. The trait type (appearing
-after the colon in the `impl`) *refers* to a type, rather than
+between `impl` and `for`) *refers* to a type, rather than
 defining one.
 
 The type parameters bound by a trait are in scope in each of the
@@ -2000,7 +2000,7 @@ trait Eq {
 }
 
 // In an impl, `self` refers just to the value of the receiver
-impl int: Eq {
+impl Eq for int {
     fn equals(&self, other: &int) -> bool { *other == *self }
 }
 ~~~~
@@ -2021,10 +2021,10 @@ trait Shape { static fn new(area: float) -> Self; }
 struct Circle { radius: float }
 struct Square { length: float }
 
-impl Circle: Shape {
+impl Shape for Circle {
     static fn new(area: float) -> Circle { Circle { radius: sqrt(area / pi) } }
 }
-impl Square: Shape {
+impl Shape for Square {
     static fn new(area: float) -> Square { Square { length: sqrt(area) } }
 }
 
@@ -2084,7 +2084,7 @@ However, consider this function:
 
 ~~~~
 # type Circle = int; type Rectangle = int;
-# impl int: Drawable { fn draw(&self) {} }
+# impl Drawable for int { fn draw(&self) {} }
 # fn new_circle() -> int { 1 }
 trait Drawable { fn draw(&self); }
 
@@ -2120,9 +2120,8 @@ value to an object:
 # fn new_rectangle() -> Rectangle { true }
 # fn draw_all(shapes: &[@Drawable]) {}
 
-impl Circle: Drawable { fn draw(&self) { ... } }
-
-impl Rectangle: Drawable { fn draw(&self) { ... } }
+impl Drawable for Circle { fn draw(&self) { ... } }
+impl Drawable for Rectangle { fn draw(&self) { ... } }
 
 let c: @Circle = @new_circle();
 let r: @Rectangle = @new_rectangle();
@@ -2140,7 +2139,7 @@ for example, an `@Circle` may not be cast to an `~Drawable`.
 ~~~
 # type Circle = int; type Rectangle = int;
 # trait Drawable { fn draw(&self); }
-# impl int: Drawable { fn draw(&self) {} }
+# impl Drawable for int { fn draw(&self) {} }
 # fn new_circle() -> int { 1 }
 # fn new_rectangle() -> int { 2 }
 // A managed object
@@ -2180,10 +2179,10 @@ Now, we can implement `Circle` on a type only if we also implement `Shape`.
 # use float::sqrt;
 # fn square(x: float) -> float { x * x }
 struct CircleStruct { center: Point, radius: float }
-impl CircleStruct: Circle {
+impl Circle for CircleStruct {
     fn radius(&self) -> float { sqrt(self.area() / pi) }
 }
-impl CircleStruct: Shape {
+impl Shape for CircleStruct {
     fn area(&self) -> float { pi * square(self.radius) }
 }   
 ~~~~
@@ -2215,8 +2214,8 @@ Likewise, supertrait methods may also be called on trait objects.
 # use float::sqrt;
 # struct Point { x: float, y: float }
 # struct CircleStruct { center: Point, radius: float }
-# impl CircleStruct: Circle { fn radius(&self) -> float { sqrt(self.area() / pi) } }
-# impl CircleStruct: Shape { fn area(&self) -> float { pi * square(self.radius) } }
+# impl Circle for CircleStruct { fn radius(&self) -> float { sqrt(self.area() / pi) } }
+# impl Shape for CircleStruct { fn area(&self) -> float { pi * square(self.radius) } }
 
 let concrete = @CircleStruct{center:Point{x:3f,y:4f},radius:5f};
 let mycircle: Circle = concrete as @Circle;

branches/incoming/mk/tests.mk

@@ -103,7 +103,8 @@ cleantestlibs:
          -name '*.dSYM' -o    \
          -name '*.libaux' -o      \
          -name '*.out' -o     \
-         -name '*.err'        \
+         -name '*.err' -o     \
+	 -name '*.debugger.script' \
          | xargs rm -rf
 
 
@@ -170,6 +171,7 @@ check-stage$(1)-T-$(2)-H-$(3)-exec:     				\
 	check-stage$(1)-T-$(2)-H-$(3)-rpass-full-exec			\
         check-stage$(1)-T-$(2)-H-$(3)-crates-exec                      \
 	check-stage$(1)-T-$(2)-H-$(3)-bench-exec			\
+	check-stage$(1)-T-$(2)-H-$(3)-debuginfo-exec \
 	check-stage$(1)-T-$(2)-H-$(3)-doc-exec \
 	check-stage$(1)-T-$(2)-H-$(3)-pretty-exec
 
@@ -284,6 +286,7 @@ CFAIL_RC := $(wildcard $(S)src/test/compile-fail/*.rc)
 CFAIL_RS := $(wildcard $(S)src/test/compile-fail/*.rs)
 BENCH_RS := $(wildcard $(S)src/test/bench/*.rs)
 PRETTY_RS := $(wildcard $(S)src/test/pretty/*.rs)
+DEBUGINFO_RS := $(wildcard $(S)src/test/debug-info/*.rs)
 
 # perf tests are the same as bench tests only they run under
 # a performance monitor.
@@ -296,6 +299,7 @@ CFAIL_TESTS := $(CFAIL_RC) $(CFAIL_RS)
 BENCH_TESTS := $(BENCH_RS)
 PERF_TESTS := $(PERF_RS)
 PRETTY_TESTS := $(PRETTY_RS)
+DEBUGINFO_TESTS := $(DEBUGINFO_RS)
 
 CTEST_SRC_BASE_rpass = run-pass
 CTEST_BUILD_BASE_rpass = run-pass
@@ -327,6 +331,15 @@ CTEST_BUILD_BASE_perf = perf
 CTEST_MODE_perf = run-pass
 CTEST_RUNTOOL_perf = $(CTEST_PERF_RUNTOOL)
 
+CTEST_SRC_BASE_debuginfo = debug-info
+CTEST_BUILD_BASE_debuginfo = debug-info
+CTEST_MODE_debuginfo = debug-info
+CTEST_RUNTOOL_debuginfo = $(CTEST_RUNTOOL)
+
+ifeq ($(CFG_GDB),)
+CTEST_DISABLE_debuginfo = "no gdb found"
+endif
+
 define DEF_CTEST_VARS
 
 # All the per-stage build rules you might want to call from the
@@ -349,7 +362,7 @@ CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3) :=						\
         --rustc-path $$(HBIN$(1)_H_$(3))/rustc$$(X)			\
         --aux-base $$(S)src/test/auxiliary/                 \
         --stage-id stage$(1)-$(2)							\
-        --rustcflags "$$(CFG_RUSTC_FLAGS) --target=$(2)"	\
+       --rustcflags "$$(CFG_RUSTC_FLAGS) --target=$(2)"	\
         $$(CTEST_TESTARGS)
 
 CTEST_DEPS_rpass_$(1)-T-$(2)-H-$(3) = $$(RPASS_TESTS)
@@ -358,6 +371,7 @@ CTEST_DEPS_rfail_$(1)-T-$(2)-H-$(3) = $$(RFAIL_TESTS)
 CTEST_DEPS_cfail_$(1)-T-$(2)-H-$(3) = $$(CFAIL_TESTS)
 CTEST_DEPS_bench_$(1)-T-$(2)-H-$(3) = $$(BENCH_TESTS)
 CTEST_DEPS_perf_$(1)-T-$(2)-H-$(3) = $$(PERF_TESTS)
+CTEST_DEPS_debuginfo_$(1)-T-$(2)-H-$(3) = $$(DEBUGINFO_TESTS)
 
 endef
 
@@ -377,6 +391,8 @@ CTEST_ARGS$(1)-T-$(2)-H-$(3)-$(4) := \
 
 check-stage$(1)-T-$(2)-H-$(3)-$(4)-exec: $$(call TEST_OK_FILE,$(1),$(2),$(3),$(4))
 
+ifeq ($$(CTEST_DISABLE_$(4)),)
+
 $$(call TEST_OK_FILE,$(1),$(2),$(3),$(4)): \
 		$$(TEST_SREQ$(1)_T_$(2)_H_$(3)) \
                 $$(CTEST_DEPS_$(4)_$(1)-T-$(2)-H-$(3))
@@ -386,9 +402,20 @@ $$(call TEST_OK_FILE,$(1),$(2),$(3),$(4)): \
 		--logfile $$(call TEST_LOG_FILE,$(1),$(2),$(3),$(4)) \
                 && touch $$@
 
+else
+
+$$(call TEST_OK_FILE,$(1),$(2),$(3),$(4)): \
+		$$(TEST_SREQ$(1)_T_$(2)_H_$(3)) \
+                $$(CTEST_DEPS_$(4)_$(1)-T-$(2)-H-$(3))
+	@$$(call E, run $(4): $$<)
+	@$$(call E, warning: tests disabled: $$(CTEST_DISABLE_$(4)))
+	touch $$@
+
+endif
+
 endef
 
-CTEST_NAMES = rpass rpass-full rfail cfail bench perf
+CTEST_NAMES = rpass rpass-full rfail cfail bench perf debuginfo
 
 $(foreach host,$(CFG_TARGET_TRIPLES), \
  $(eval $(foreach target,$(CFG_TARGET_TRIPLES), \
@@ -496,6 +523,7 @@ TEST_GROUPS = \
 	cfail \
 	bench \
 	perf \
+	debuginfo \
 	doc \
 	$(foreach docname,$(DOC_TEST_NAMES),$(docname)) \
 	pretty \

branches/incoming/src/compiletest/common.rs

@@ -1,5 +1,5 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
+// 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
@@ -18,6 +18,7 @@ pub enum mode {
     mode_run_fail,
     mode_run_pass,
     mode_pretty,
+    mode_debug_info,
 }
 
 pub type config = {