---

yaml
---
r: 93805
b: refs/heads/try
c: d97ce15
h: refs/heads/master
i:
  93803: 3de76d8
v: v3

Author: thestinger

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 0da105a8b7b6b1e0568e8ff20f6ff4b13cc7ecc2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
-refs/heads/try: a9b1dcf24a28a11b33e796a94098226711bb2716
+refs/heads/try: d97ce15c14f4298cae65e63f6b1b516bb346b066
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/librustc/front/feature_gate.rs

@@ -141,11 +141,9 @@ impl Visitor<()> for Context {
             },
             ast::ty_box(_) => {
                 self.gate_feature("managed_boxes", t.span,
-                                  "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.");
+                                  "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.");
             }
             _ => {}
         }

branches/try/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);
-        }
-    }
 }

branches/try/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!()
 }