---

yaml
---
r: 92306
b: refs/heads/auto
c: 09bfb3b
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 460a966a588da1e947ae0873a28048203bd3c684
+refs/heads/auto: 09bfb3b47383d566a5bbf5aef9429e5c24a93b6d
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/etc/emacs/rust-mode.el

@@ -134,7 +134,7 @@
     "if" "impl" "in"
     "let" "loop"
     "match" "mod" "mut"
-    "priv" "pub"
+    "priv" "proc" "pub"
     "ref" "return"
     "self" "static" "struct" "super"
     "true" "trait" "type"

branches/auto/src/libextra/test.rs

@@ -1110,6 +1110,15 @@ impl BenchHarness {
         } else {
             n = 1_000_000 / self.ns_per_iter().max(&1);
         }
+        // if the first run took more than 1ms we don't want to just
+        // be left doing 0 iterations on every loop. The unfortunate
+        // side effect of not being able to do as many runs is
+        // automatically handled by the statistical analysis below
+        // (i.e. larger error bars).
+        if n == 0 { n = 1; }
+
+        debug!("Initial run took {} ns, iter count that takes 1ms estimated as {}",
+               self.ns_per_iter(), n);
 
         let mut total_run = 0;
         let samples : &mut [f64] = [0.0_f64, ..50];
@@ -1141,7 +1150,7 @@ impl BenchHarness {
             let now = precise_time_ns();
             let loop_run = now - loop_start;
 
-            // If we've run for 100ms an seem to have converged to a
+            // If we've run for 100ms and seem to have converged to a
             // stable median.
             if loop_run > 100_000_000 &&
                 summ.median_abs_dev_pct < 1.0 &&

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

@@ -77,6 +77,14 @@ impl Context {
         }
     }
 
+    fn gate_box(&self, span: Span) {
+        self.gate_feature("managed_boxes", 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.");
+    }
+
     fn has_feature(&self, feature: &str) -> bool {
         self.features.iter().any(|n| n.as_slice() == feature)
     }
@@ -172,17 +180,24 @@ impl Visitor<()> for Context {
                                    experimental and likely to be removed");
 
             },
-            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.");
-            }
+            ast::ty_box(_) => { self.gate_box(t.span); }
             _ => {}
         }
 
         visit::walk_ty(self, t, ());
     }
+
+    fn visit_expr(&mut self, e: @ast::Expr, _: ()) {
+        match e.node {
+            ast::ExprUnary(_, ast::UnBox(..), _) |
+            ast::ExprVstore(_, ast::ExprVstoreBox) |
+            ast::ExprVstore(_, ast::ExprVstoreMutBox) => {
+                self.gate_box(e.span);
+            }
+            _ => {}
+        }
+        visit::walk_expr(self, e, ());
+    }
 }
 
 pub fn check_crate(sess: Session, crate: &ast::Crate) {

branches/auto/src/librustc/middle/lint.rs

@@ -770,9 +770,21 @@ fn check_heap_type(cx: &Context, span: Span, ty: ty::t) {
         let mut n_uniq = 0;
         ty::fold_ty(cx.tcx, ty, |t| {
             match ty::get(t).sty {
-              ty::ty_box(_) => n_box += 1,
-              ty::ty_uniq(_) => n_uniq += 1,
-              _ => ()
+                ty::ty_box(_) | ty::ty_estr(ty::vstore_box) |
+                ty::ty_evec(_, ty::vstore_box) |
+                ty::ty_trait(_, _, ty::BoxTraitStore, _, _) => {
+                    n_box += 1;
+                }
+                ty::ty_uniq(_) | ty::ty_estr(ty::vstore_uniq) |
+                ty::ty_evec(_, ty::vstore_uniq) |
+                ty::ty_trait(_, _, ty::UniqTraitStore, _, _) => {
+                    n_uniq += 1;
+                }
+                ty::ty_closure(ref c) if c.sigil == ast::OwnedSigil => {
+                    n_uniq += 1;
+                }
+
+                _ => ()
             };
             t
         });

branches/auto/src/librustdoc/clean.rs

@@ -73,9 +73,7 @@ pub struct Crate {
 
 impl Clean<Crate> for visit_ast::RustdocVisitor {
     fn clean(&self) -> Crate {
-        use syntax::attr::{find_linkage_metas, last_meta_item_value_str_by_name};
-        let maybe_meta = last_meta_item_value_str_by_name(
-                                find_linkage_metas(self.attrs), "name");
+        use syntax::attr::find_pkgid;
         let cx = local_data::get(super::ctxtkey, |x| *x.unwrap());
 
         let mut externs = HashMap::new();
@@ -84,10 +82,9 @@ impl Clean<Crate> for visit_ast::RustdocVisitor {
         });
 
         Crate {
-            name: match maybe_meta {
-                Some(x) => x.to_owned(),
-                None => fail!("rustdoc requires a \\#[link(name=\"foo\")] \
-                                crate attribute"),
+            name: match find_pkgid(self.attrs) {
+                Some(n) => n.name,
+                None => fail!("rustdoc requires a `pkgid` crate attribute"),
             },
             module: Some(self.module.clean()),
             externs: externs,

branches/auto/src/librustpkg/util.rs

@@ -300,7 +300,7 @@ pub fn compile_input(context: &BuildContext,
                                                  pkg_id.version.to_str()).to_managed());
 
         debug!("pkgid attr: {:?}", pkgid_attr);
-        crate.attrs = ~[attr::mk_attr(pkgid_attr)];
+        crate.attrs.push(attr::mk_attr(pkgid_attr));
     }
 
     debug!("calling compile_crate_from_input, workspace = {},

branches/auto/src/test/compile-fail/auto-ref-slice-plus-ref.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#[feature(managed_boxes)];
+
 fn main() {
 
     // Testing that method lookup does not automatically borrow

branches/auto/src/test/compile-fail/borrowck-loan-rcvr-overloaded-op.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#[feature(managed_boxes)];
+
 struct Point {
     x: int,
     y: int,

branches/auto/src/test/compile-fail/borrowck-loan-rcvr.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#[feature(managed_boxes)];
+
 struct point { x: int, y: int }
 
 trait methods {

branches/auto/src/test/compile-fail/borrowck-mut-boxed-vec.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#[feature(managed_boxes)];
+
 fn main() {
     let v = @mut [ 1, 2, 3 ];
     for _x in v.iter() {

branches/auto/src/test/compile-fail/issue-3763.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#[feature(managed_boxes)];
+
 mod my_mod {
     pub struct MyStruct {
         priv priv_field: int

branches/auto/src/test/compile-fail/lint-heap-memory.rs

@@ -19,6 +19,20 @@ struct Foo {
 struct Bar { x: ~int } //~ ERROR type uses owned
 
 fn main() {
-    let _x : Bar = Bar {x : ~10};
+    let _x : Bar = Bar {x : ~10}; //~ ERROR type uses owned
+
+    @2; //~ ERROR type uses managed
+    @[1]; //~ ERROR type uses managed
+    //~^ ERROR type uses managed
+    fn f(_: @Clone) {} //~ ERROR type uses managed
+    @""; //~ ERROR type uses managed
+    //~^ ERROR type uses managed
+
+    ~2; //~ ERROR type uses owned
+    ~[1]; //~ ERROR type uses owned
+    //~^ ERROR type uses owned
+    fn g(_: ~Clone) {} //~ ERROR type uses owned
+    ~""; //~ ERROR type uses owned
     //~^ ERROR type uses owned
+    proc() {}; //~ ERROR type uses owned
 }

branches/auto/src/test/compile-fail/moves-based-on-type-exprs.rs

@@ -1,6 +1,8 @@
 // Tests that references to move-by-default values trigger moves when
 // they occur as part of various kinds of expressions.
 
+#[feature(managed_boxes)];
+
 struct Foo<A> { f: A }
 fn guard(_s: ~str) -> bool {fail!()}
 fn touch<A>(_a: &A) {}

branches/auto/src/test/compile-fail/non-exhaustive-match.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#[feature(managed_boxes)];
+
 enum t { a, b, }
 
 fn main() {

branches/auto/src/test/compile-fail/occurs-check.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#[feature(managed_boxes)];
+
 fn main() {
     let f; //~ ERROR cyclic type of infinite size
     f = @f;

branches/auto/src/test/compile-fail/static-region-bound.rs

@@ -1,3 +1,5 @@
+#[feature(managed_boxes)];
+
 fn f<T:'static>(_: T) {}
 
 fn main() {

branches/auto/src/test/compile-fail/unique-unique-kind.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#[feature(managed_boxes)];
+
 fn f<T:Send>(_i: T) {
 }
 

branches/auto/src/test/debug-info/borrowed-struct.rs

@@ -45,6 +45,7 @@
 // debugger:print *unique_val_interior_ref_2
 // check:$10 = 26.5
 
+#[feature(managed_boxes)];
 #[allow(unused_variable)];
 
 struct SomeStruct {

branches/auto/src/test/debug-info/box.rs

@@ -24,6 +24,7 @@
 // debugger:print d->val
 // check:$4 = false
 
+#[feature(managed_boxes)];
 #[allow(unused_variable)];
 
 fn main() {

branches/auto/src/test/debug-info/boxed-struct.rs

@@ -27,6 +27,7 @@
 // debugger:print managed_dtor->val
 // check:$4 = {x = 33, y = 333, z = 3333, w = 33333}
 
+#[feature(managed_boxes)];
 #[allow(unused_variable)];
 
 struct StructWithSomePadding {

branches/auto/src/test/debug-info/destructured-local.rs

@@ -125,6 +125,7 @@
 // debugger:print *nn
 // check:$43 = 56
 
+#[feature(managed_boxes)];
 #[allow(unused_variable)];
 
 struct Struct {

branches/auto/src/test/debug-info/generic-method-on-generic-struct.rs

@@ -94,6 +94,8 @@
 // check:$21 = {-16, 16.5}
 // debugger:continue
 
+#[feature(managed_boxes)];
+
 struct Struct<T> {
     x: T
 }

branches/auto/src/test/debug-info/managed-enum.rs

@@ -25,7 +25,7 @@
 // check:$3 = {-9747455}
 
 #[allow(unused_variable)];
-#[feature(struct_variant)];
+#[feature(struct_variant, managed_boxes)];
 
 // The first element is to ensure proper alignment, irrespective of the machines word size. Since
 // the size of the discriminant value is machine dependent, this has be taken into account when

branches/auto/src/test/debug-info/method-on-enum.rs

@@ -94,6 +94,7 @@
 // check:$21 = -16
 // debugger:continue
 
+#[feature(managed_boxes)];
 #[feature(struct_variant)];
 
 enum Enum {

branches/auto/src/test/debug-info/method-on-generic-struct.rs

@@ -94,6 +94,8 @@
 // check:$21 = -16
 // debugger:continue
 
+#[feature(managed_boxes)];
+
 struct Struct<T> {
     x: T
 }

branches/auto/src/test/debug-info/method-on-struct.rs

@@ -94,6 +94,8 @@
 // check:$21 = -16
 // debugger:continue
 
+#[feature(managed_boxes)];
+
 struct Struct {
     x: int
 }

branches/auto/src/test/debug-info/method-on-trait.rs

@@ -94,6 +94,8 @@
 // check:$21 = -16
 // debugger:continue
 
+#[feature(managed_boxes)];
+
 struct Struct {
     x: int
 }

branches/auto/src/test/debug-info/method-on-tuple-struct.rs

@@ -94,6 +94,8 @@
 // check:$21 = -16
 // debugger:continue
 
+#[feature(managed_boxes)];
+
 struct TupleStruct(int, f64);
 
 impl TupleStruct {

branches/auto/src/test/debug-info/self-in-default-method.rs

@@ -94,6 +94,8 @@
 // check:$21 = -16
 // debugger:continue
 
+#[feature(managed_boxes)];
+
 struct Struct {
     x: int
 }

branches/auto/src/test/debug-info/self-in-generic-default-method.rs

@@ -94,6 +94,8 @@
 // check:$21 = {-16, 16.5}
 // debugger:continue
 
+#[feature(managed_boxes)];
+
 struct Struct {
     x: int
 }

branches/auto/src/test/debug-info/var-captured-in-nested-closure.rs

@@ -49,6 +49,7 @@
 // check:$14 = 8
 // debugger:continue
 
+#[feature(managed_boxes)];
 #[allow(unused_variable)];
 
 struct Struct {

branches/auto/src/test/debug-info/var-captured-in-stack-closure.rs

@@ -28,6 +28,7 @@
 // debugger:print managed->val
 // check:$6 = 7
 
+#[feature(managed_boxes)];
 #[allow(unused_variable)];
 
 struct Struct {

branches/auto/src/test/pretty/block-disambig.rs

@@ -12,6 +12,8 @@
 // previously ambiguous (e.g. 'if true { } *val;' gets parsed as a
 // binop)
 
+#[feature(managed_boxes)];
+
 fn test1() { let val = @0; { } *val; }
 
 fn test2() -> int { let val = @0; { } *val }