---

yaml
---
r: 50654
b: refs/heads/try
c: 67b0f3d
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 5f13e9ccc2e3328d4cd8ca49f84e6840dd998346
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: f7a2371c176663d59062ec5158f39faecba45768
-refs/heads/try: 9c32de59acc898746806053acee0674fda3d15da
+refs/heads/try: 67b0f3d5b2d88ea9b5c0a667fc3dbdf794e5c054
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/RELEASES.txt

@@ -10,8 +10,7 @@ Version 0.6 (March 2013)
       * Remove `static` keyword
       * Static method syntax
       * `as Trait`
-      * `copy` removed, replaced with `Clone`?
-      * `std::map` removed, replaced with `core::hashmap`
+      * `copy` removed?
 
    * Syntax changes
       * The self type parameter in traits is now spelled `Self`
@@ -39,8 +38,7 @@ Version 0.6 (March 2013)
       * Trait implementations no longer support visibility modifiers
 
    * Semantic changes
-      * Types with owned pointers or custom destructors move by default,
-        eliminating the `move` keyword
+      * 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
@@ -59,19 +57,16 @@ Version 0.6 (March 2013)
         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)`
-      * 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'

branches/try/mk/tests.mk

@@ -386,6 +386,10 @@ ifeq ($(CFG_GDB),)
 CTEST_DISABLE_debuginfo = "no gdb found"
 endif
 
+ifeq ($(CFG_OSTYPE),apple-darwin)
+CTEST_DISABLE_debuginfo = "gdb on darwing needs root"
+endif
+
 define DEF_CTEST_VARS
 
 # All the per-stage build rules you might want to call from the

branches/try/src/compiletest/runtest.rs

@@ -225,6 +225,15 @@ actual:\n\
 }
 
 fn run_debuginfo_test(config: config, props: TestProps, testfile: &Path) {
+    // do not optimize debuginfo tests
+    let config = match config.rustcflags {
+        Some(flags) => config {
+            rustcflags: Some(str::replace(flags, ~"-O", ~"")),
+            .. config
+        },
+        None => config
+    };
+
     // compile test file (it shoud have 'compile-flags:-g' in the header)
     let mut ProcRes = compile_test(config, props, testfile);
     if ProcRes.status != 0 {
@@ -267,8 +276,8 @@ fn run_debuginfo_test(config: config, props: TestProps, testfile: &Path) {
             }
         }
         if i != num_check_lines {
-            fatal(fmt!("line not found in debugger output: %s",
-                       props.check_lines[i]));
+            fatal_ProcRes(fmt!("line not found in debugger output: %s"
+                               props.check_lines[i]), ProcRes);
         }
     }
 }

branches/try/src/librust/rust.rc

@@ -9,8 +9,8 @@
 // except according to those terms.
 
 // rust - central access to other rust tools
-// XXX: Make commands run and test emit proper file endings on winds
-// XXX: Make run only accept source that emits an executable
+// FIXME #2238 Make commands run and test emit proper file endings on winds
+// FIXME #2238 Make run only accept source that emits an executable
 
 #[deny(deprecated_self)];
 

branches/try/src/librustc/middle/trans/base.rs

@@ -867,7 +867,7 @@ pub fn in_lpad_scope_cx(bcx: block, f: &fn(+si: &mut scope_info)) {
     let mut bcx = bcx;
     loop {
         {
-            // XXX: Borrow check bug workaround.
+            // FIXME #4280: Borrow check bug workaround.
             let kind: &mut block_kind = &mut *bcx.kind;
             match *kind {
                 block_scope(ref mut inf) => {
@@ -1272,7 +1272,7 @@ pub fn cleanup_and_leave(bcx: block,
         }
 
         {
-            // XXX: Borrow check bug workaround.
+            // FIXME #4280: Borrow check bug workaround.
             let kind: &mut block_kind = &mut *cur.kind;
             match *kind {
               block_scope(ref mut inf) if !inf.cleanups.is_empty() => {
@@ -1850,8 +1850,7 @@ pub fn trans_enum_variant(ccx: @CrateContext,
     };
     let fcx = new_fn_ctxt_w_id(ccx, ~[], llfndecl, variant.node.id, None,
                                param_substs, None);
-    // XXX: Bad copy.
-    let raw_llargs = create_llargs_for_fn_args(fcx, no_self, copy fn_args);
+    let raw_llargs = create_llargs_for_fn_args(fcx, no_self, fn_args);
     let ty_param_substs = match param_substs {
       Some(ref substs) => /*bad*/copy substs.tys,
       None => ~[]