auto merge of #10032 : thestinger/rust/snapshot, r=huonw

Author: bors

src/etc/combine-tests.py

@@ -40,7 +40,7 @@ def scrub(b):
 i = 0
 c.write("// AUTO-GENERATED FILE: DO NOT EDIT\n")
 c.write("#[link(name=\"run_pass_stage2\", vers=\"0.1\")];\n")
-c.write("#[feature(globs, macro_rules, struct_variant)];\n")
+c.write("#[feature(globs, macro_rules, struct_variant, managed_boxes)];\n")
 for t in stage2_tests:
     p = os.path.join(run_pass, t)
     p = p.replace("\\", "\\\\")
@@ -52,7 +52,7 @@ def scrub(b):
 
 d = open("tmp/run_pass_stage2_driver.rs", "w")
 d.write("// AUTO-GENERATED FILE: DO NOT EDIT\n")
-d.write("#[feature(globs)];\n")
+d.write("#[feature(globs, managed_boxes)];\n")
 d.write("extern mod extra;\n")
 d.write("extern mod run_pass_stage2;\n")
 d.write("use run_pass_stage2::*;\n")

src/etc/extract-tests.py

@@ -63,7 +63,7 @@
 #[ allow(unused_variable) ];\n
 #[ allow(dead_assignment) ];\n
 #[ allow(unused_mut) ];\n
-#[ feature(macro_rules, globs, struct_variant) ];\n
+#[ feature(macro_rules, globs, struct_variant, managed_boxes) ];\n
 """ + block
             if xfail:
                 block = "// xfail-test\n" + block

src/libextra/extra.rs

@@ -33,7 +33,7 @@ Rust extras are part of the standard Rust distribution.
 #[license = "MIT/ASL2"];
 #[crate_type = "lib"];
 
-#[feature(macro_rules, globs)];
+#[feature(macro_rules, globs, managed_boxes)];
 
 #[deny(non_camel_case_types)];
 #[deny(missing_doc)];

src/librustc/front/feature_gate.rs

@@ -138,8 +138,7 @@ impl Visitor<()> for Context {
                                    experimental and likely to be removed");
 
             },
-            // NOTE: enable after snapshot
-            ast::ty_box(_) if false => {
+            ast::ty_box(_) => {
                 self.gate_feature("managed_boxes", t.span, "The managed box syntax may be replaced \
                                                             by a library type, and a garbage \
                                                             collector is not yet implemented. \

src/librustc/rustc.rs

@@ -17,7 +17,7 @@
 #[license = "MIT/ASL2"];
 #[crate_type = "lib"];
 
-#[feature(macro_rules, globs, struct_variant)];
+#[feature(macro_rules, globs, struct_variant, managed_boxes)];
 
 // Rustc tasks always run on a fixed_stack_segment, so code in this
 // module can call C functions (in particular, LLVM functions) with

src/librustdoc/rustdoc.rs

@@ -17,7 +17,7 @@
 #[license = "MIT/ASL2"];
 #[crate_type = "lib"];
 
-#[feature(globs, struct_variant)];
+#[feature(globs, struct_variant, managed_boxes)];
 
 extern mod syntax;
 extern mod rustc;

src/librustpkg/rustpkg.rs

@@ -18,7 +18,7 @@
 #[license = "MIT/ASL2"];
 #[crate_type = "lib"];
 
-#[feature(globs)];
+#[feature(globs, managed_boxes)];
 
 extern mod extra;
 extern mod rustc;

src/libstd/std.rs

@@ -61,7 +61,7 @@ they contained the following prologue:
       html_favicon_url = "http://www.rust-lang.org/favicon.ico",
       html_root_url = "http://static.rust-lang.org/doc/master")];
 
-#[feature(macro_rules, globs, asm)];
+#[feature(macro_rules, globs, asm, managed_boxes)];
 
 // Don't link to std. We are std.
 #[no_std];

src/libstd/unstable/intrinsics.rs

@@ -410,9 +410,7 @@ extern "rust-intrinsic" {
     pub fn fabsf32(x: f32) -> f32;
     pub fn fabsf64(x: f64) -> f64;
 
-    #[cfg(not(stage0))]
     pub fn copysignf32(x: f32, y: f32) -> f32;
-    #[cfg(not(stage0))]
     pub fn copysignf64(x: f64, y: f64) -> f64;
 
     pub fn floorf32(x: f32) -> f32;
@@ -424,19 +422,13 @@ extern "rust-intrinsic" {
     pub fn truncf32(x: f32) -> f32;
     pub fn truncf64(x: f64) -> f64;
 
-    #[cfg(not(stage0))]
     pub fn rintf32(x: f32) -> f32;
-    #[cfg(not(stage0))]
     pub fn rintf64(x: f64) -> f64;
 
-    #[cfg(not(stage0))]
     pub fn nearbyintf32(x: f32) -> f32;
-    #[cfg(not(stage0))]
     pub fn nearbyintf64(x: f64) -> f64;
 
-    #[cfg(not(stage0))]
     pub fn roundf32(x: f32) -> f32;
-    #[cfg(not(stage0))]
     pub fn roundf64(x: f64) -> f64;
 
     pub fn ctpop8(x: i8) -> i8;

src/libsyntax/syntax.rs

@@ -20,7 +20,7 @@
 #[license = "MIT/ASL2"];
 #[crate_type = "lib"];
 
-#[feature(macro_rules, globs)];
+#[feature(macro_rules, globs, managed_boxes)];
 
 extern mod extra;
 

src/snapshots.txt

@@ -1,3 +1,11 @@
+S 2013-10-22 ae0905a
+  freebsd-x86_64 6e9d81c160963308c2bf7886fae6726274b365ed
+  linux-i386 1c449504aa04c0345ad09f5bcb5a57b9656d11c3
+  linux-x86_64 ab649598e9af2ab3c38179e6229ea8cc4be6e338
+  macos-i386 28d4a2e8495a981e86e0c57fce05bcfc15ba656d
+  macos-x86_64 9506a3d746c1d1cc1befc5c9556f1653fee25f85
+  winnt-i386 6038235d3a2284beb7be8e80631ec6b6952df8ab
+
 S 2013-10-21 6e6981c
   freebsd-x86_64 7f630581d0e881483272140e84bc2f494daf6204
   linux-i386 5c754455610013bbe448e8f6ef8ba1a05b167919

src/test/auxiliary/cci_nested_lib.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#[feature(managed_boxes)];
+
 pub struct Entry<A,B> {
     key: A,
     value: B

src/test/auxiliary/crate-method-reexport-grrrrrrr2.rs

@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#[feature(managed_boxes)];
 #[link(name = "crate_method_reexport_grrrrrrr2")];
 
 pub use name_pool::add;

src/test/auxiliary/issue-2380.rs

@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#[feature(managed_boxes)];
 #[link(name = "a", vers = "0.0")];
 #[crate_type = "lib"];
 

src/test/auxiliary/issue-2631-a.rs

@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#[feature(managed_boxes)];
 #[link(name = "req")];
 #[crate_type = "lib"];
 

src/test/bench/shootout-fasta.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-
+#[feature(managed_boxes)];
 
 /* -*- mode: rust; indent-tabs-mode: nil -*-
  * Implementation of 'fasta' benchmark from

src/test/bench/sudoku.rs

@@ -10,6 +10,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#[feature(managed_boxes)];
+
 extern mod extra;
 
 use std::io::{ReaderUtil, WriterUtil};

src/test/bench/task-perf-alloc-unwind.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#[feature(managed_boxes)];
+
 extern mod extra;
 
 use extra::list::{List, Cons, Nil};

src/test/compile-fail/autoderef-full-lval.rs

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

src/test/compile-fail/borrowck-assign-to-subfield.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() {
     struct A {
         a: int,

src/test/compile-fail/borrowck-mut-deref-comp.rs

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

src/test/compile-fail/borrowck-object-lifetime.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#[feature(managed_boxes)];
+
 trait Foo {
     fn borrowed<'a>(&'a self) -> &'a ();
 }

src/test/compile-fail/borrowck-object-mutability.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#[feature(managed_boxes)];
+
 trait Foo {
     fn borrowed(&self);
     fn borrowed_mut(&mut self);

src/test/compile-fail/box-static-bound.rs

@@ -1,3 +1,5 @@
+#[feature(managed_boxes)];
+
 fn f<T>(x: T) -> @T {
     @x  //~ ERROR value may contain borrowed pointers
 }

src/test/compile-fail/cast-immutable-mutable-trait.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#[feature(managed_boxes)];
+
 trait T {
     fn foo(@mut self);
 }

src/test/compile-fail/class-cast-to-trait.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#[feature(managed_boxes)];
+
 trait noisy {
   fn speak(&self);
 }

src/test/compile-fail/drop-on-non-struct.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#[feature(managed_boxes)];
+
 type Foo = @[u8];
 
 impl Drop for Foo {   //~ ERROR the Drop trait may only be implemented

src/test/compile-fail/estr-subtyping.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#[feature(managed_boxes)];
+
 fn wants_box(x: @str) { }
 fn wants_uniq(x: ~str) { }
 fn wants_slice(x: &str) { }

src/test/compile-fail/evec-subtyping.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#[feature(managed_boxes)];
+
 fn wants_box(x: @[uint]) { }
 fn wants_uniq(x: ~[uint]) { }
 fn wants_three(x: [uint, ..3]) { }

src/test/compile-fail/fn-variance-1.rs

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

src/test/compile-fail/issue-2063-resource.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#[feature(managed_boxes)];
+
 // test that autoderef of a type like this does not
 // cause compiler to loop.  Note that no instances
 // of such a type could ever be constructed.

src/test/compile-fail/issue-2548.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#[feature(managed_boxes)];
+
 // A test case for #2548.
 
 struct foo {

src/test/compile-fail/issue-3668.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#[feature(managed_boxes)];
+
 struct P { child: Option<@mut P> }
 trait PTrait {
    fn getChildOption(&self) -> Option<@P>;

src/test/compile-fail/issue-5153.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#[feature(managed_boxes)];
+
 // error-pattern: type `@Foo:'static` does not implement any method in scope named `foo`
 
 trait Foo {

src/test/compile-fail/kindck-destructor-owned.rs

@@ -1,3 +1,5 @@
+#[feature(managed_boxes)];
+
 struct Foo {
     f: @mut int,
 }

src/test/compile-fail/kindck-nonsendable-1.rs

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

src/test/compile-fail/kindck-owned-trait-contains.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#[feature(managed_boxes)];
+
 trait repeat<A> { fn get(&self) -> A; }
 
 impl<A:Clone> repeat<A> for @A {

src/test/compile-fail/kindck-owned-trait.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#[feature(managed_boxes)];
+
 trait foo { fn foo(&self); }
 
 fn to_foo<T:Clone + foo>(t: T) -> @foo {

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

@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#[feature(managed_boxes)];
 #[forbid(heap_memory)];
 
 struct Foo {

src/test/compile-fail/lint-managed-heap-memory.rs

@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#[feature(managed_boxes)];
 #[forbid(managed_heap_memory)];
 
 struct Foo {

src/test/compile-fail/lub-in-args.rs

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