---

yaml
---
r: 89973
b: refs/heads/master
c: bf61641
h: refs/heads/master
i:
  89971: 1f74720
v: v3

Author: thestinger

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: cad1f89bb5f2b5bdbaa740f7b36d319374fc0b1a
+refs/heads/master: bf61641e9f30927d751d98b52f00a6685c79c347
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
 refs/heads/try: b160761e35efcd1207112b3b782c06633cf441a8

trunk/doc/tutorial.md

@@ -1320,8 +1320,7 @@ let z = x; // this moves `x` into `z`, rather than creating a new owner
 
 assert_eq!(*z.borrow(), [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
 
-// the variable is mutable, but not the contents of the box
-let mut a = Rc::new([10, 9, 8, 7, 6, 5, 4, 3, 2, 1]);
+let mut a = Rc::new([10, 9, 8, 7, 6, 5, 4, 3, 2, 1]); // the variable is mutable, but not the box
 a = z;
 ~~~
 

trunk/src/librustc/front/feature_gate.rs

@@ -141,9 +141,11 @@ impl Visitor<()> for Context {
             },
             ast::ty_box(_) => {
                 self.gate_feature("managed_boxes", t.span,
-                                  "The managed box syntax is being replaced by the `std::gc::Gc`
-                                  and `std::rc::Rc` types. Equivalent functionality to managed
-                                  trait objects will be implemented but is currently missing.");
+                                  "The managed box syntax will be replaced \
+                                  by a library type, and a garbage \
+                                  collector is not yet implemented. \
+                                  Consider using the `std::rc::Rc` type \
+                                  for reference counted pointers.");
             }
             _ => {}
         }

trunk/src/librustc/middle/trans/base.rs

@@ -2759,6 +2759,7 @@ pub fn declare_intrinsics(llmod: ModuleRef) -> HashMap<&'static str, ValueRef> {
          [i8p, Type::i8(), Type::i64(), Type::i32(), Type::i1()], Type::void());
 
     ifn!(intrinsics, "llvm.trap", [], Type::void());
+    ifn!(intrinsics, "llvm.debugtrap", [], Type::void());
     ifn!(intrinsics, "llvm.frameaddress", [Type::i32()], i8p);
 
     ifn!(intrinsics, "llvm.powi.f32", [Type::f32(), Type::i32()], Type::f32());

trunk/src/librustc/middle/trans/intrinsic.rs

@@ -228,6 +228,11 @@ pub fn trans_intrinsic(ccx: @mut CrateContext,
             Call(bcx, llfn, [], []);
             Unreachable(bcx);
         }
+        "breakpoint" => {
+            let llfn = bcx.ccx().intrinsics.get_copy(&("llvm.debugtrap"));
+            Call(bcx, llfn, [], []);
+            RetVoid(bcx);
+        }
         "size_of" => {
             let tp_ty = substs.tys[0];
             let lltp_ty = type_of::type_of(ccx, tp_ty);

trunk/src/librustc/middle/typeck/check/mod.rs

@@ -3968,7 +3968,8 @@ pub fn check_intrinsic_type(ccx: @mut CrateCtxt, it: @ast::foreign_item) {
 
     } else {
         match name {
-            "abort"  => (0, ~[], ty::mk_bot()),
+            "abort" => (0, ~[], ty::mk_bot()),
+            "breakpoint" => (0, ~[], ty::mk_nil()),
             "size_of" |
             "pref_align_of" | "min_align_of" => (1u, ~[], ty::mk_uint()),
             "init" => (1u, ~[], param(ccx, 0u)),

trunk/src/libstd/unstable/intrinsics.rs

@@ -176,6 +176,10 @@ extern "rust-intrinsic" {
     /// Abort the execution of the process.
     pub fn abort() -> !;
 
+    /// Execute a breakpoint trap, for inspection by a debugger.
+    #[cfg(not(stage0))]
+    pub fn breakpoint();
+
     /// Atomic compare and exchange, sequentially consistent.
     pub fn atomic_cxchg(dst: &mut int, old: int, src: int) -> int;
     /// Atomic compare and exchange, acquire ordering.

trunk/src/libstd/vec.rs

@@ -3862,10 +3862,10 @@ mod bench {
     }
 
     #[bench]
-    fn add(bh: &mut BenchHarness) {
+    fn add(b: &mut BenchHarness) {
         let xs: &[int] = [5, ..10];
         let ys: &[int] = [5, ..10];
-        do bh.iter() {
+        do b.iter() {
             xs + ys;
         }
     }
@@ -3885,72 +3885,4 @@ mod bench {
             xss.connect_vec(&0);
         }
     }
-
-    #[bench]
-    fn push(bh: &mut BenchHarness) {
-        let mut vec: ~[uint] = ~[0u];
-        do bh.iter() {
-            vec.push(0);
-        }
-    }
-
-    #[bench]
-    fn starts_with_same_vector(bh: &mut BenchHarness) {
-        let vec: ~[uint] = vec::from_fn(100, |i| i);
-        do bh.iter() {
-            vec.starts_with(vec);
-        }
-    }
-
-    #[bench]
-    fn starts_with_single_element(bh: &mut BenchHarness) {
-        let vec: ~[uint] = ~[0u];
-        do bh.iter() {
-            vec.starts_with(vec);
-        }
-    }
-
-    #[bench]
-    fn starts_with_diff_one_element_at_end(bh: &mut BenchHarness) {
-        let vec: ~[uint] = vec::from_fn(100, |i| i);
-        let mut match_vec: ~[uint] = vec::from_fn(99, |i| i);
-        match_vec.push(0);
-        do bh.iter() {
-            vec.starts_with(match_vec);
-        }
-    }
-
-    #[bench]
-    fn ends_with_same_vector(bh: &mut BenchHarness) {
-        let vec: ~[uint] = vec::from_fn(100, |i| i);
-        do bh.iter() {
-            vec.ends_with(vec);
-        }
-    }
-
-    #[bench]
-    fn ends_with_single_element(bh: &mut BenchHarness) {
-        let vec: ~[uint] = ~[0u];
-        do bh.iter() {
-            vec.ends_with(vec);
-        }
-    }
-
-    #[bench]
-    fn ends_with_diff_one_element_at_beginning(bh: &mut BenchHarness) {
-        let vec: ~[uint] = vec::from_fn(100, |i| i);
-        let mut match_vec: ~[uint] = vec::from_fn(100, |i| i);
-        match_vec[0] = 200;
-        do bh.iter() {
-            vec.starts_with(match_vec);
-        }
-    }
-
-    #[bench]
-    fn contains_last_element(bh: &mut BenchHarness) {
-        let vec: ~[uint] = vec::from_fn(100, |i| i);
-        do bh.iter() {
-                vec.contains(&99u);
-        }
-    }
 }

trunk/src/test/compile-fail/lint-unsafe-block.rs

@@ -10,20 +10,11 @@
 
 #[allow(unused_unsafe)];
 #[deny(unsafe_block)];
-#[feature(macro_rules)];
 
 unsafe fn allowed() {}
 
 #[allow(unsafe_block)] fn also_allowed() { unsafe {} }
 
-macro_rules! unsafe_in_macro {
-    () => {
-        unsafe {} //~ ERROR: usage of an `unsafe` block
-    }
-}
-
 fn main() {
     unsafe {} //~ ERROR: usage of an `unsafe` block
-
-    unsafe_in_macro!()
 }