---

yaml
---
r: 51614
b: refs/heads/incoming
c: 12df654
h: refs/heads/master
v: v3

Author: huonw

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 8eb2bab100b42f0ba751552d8eff00eb2134c55a
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/incoming: 441313fc0ca635be18d1175e7dc265ab9ffa9d7d
+refs/heads/incoming: 12df65470fb8c5d57fb4f94d37557daa6282173f
 refs/heads/dist-snap: 8b98e5a296d95c5e832db0756828e5bec31c6f50
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/core.rc

@@ -51,7 +51,6 @@ Implicitly, all crates behave as if they included the following prologue:
 #[warn(vecs_implicitly_copyable)];
 #[deny(non_camel_case_types)];
 #[allow(deprecated_mutable_fields)];
-#[deny(deprecated_self)];
 #[allow(deprecated_drop)];
 
 // On Linux, link to the runtime with -lrt.

branches/incoming/src/libcore/repr.rs

@@ -24,7 +24,6 @@ use managed;
 use ptr;
 use reflect;
 use reflect::{MovePtr, MovePtrAdaptor, align};
-use str;
 use sys;
 use to_str::ToStr;
 use vec::UnboxedVecRepr;

branches/incoming/src/libcore/vec.rs

@@ -2547,7 +2547,6 @@ impl<A:Clone> Clone for ~[A] {
 #[cfg(test)]
 mod tests {
     use option::{None, Option, Some};
-    use option;
     use sys;
     use vec::*;
     use cmp::*;

branches/incoming/src/libfuzzer/fuzzer.rc

@@ -25,7 +25,6 @@
 #[allow(non_camel_case_types)];
 #[allow(deprecated_mode)];
 #[allow(deprecated_pattern)];
-#[deny(deprecated_self)];
 
 extern mod core(vers = "0.6");
 extern mod std(vers = "0.6");

branches/incoming/src/librust/rust.rc

@@ -12,8 +12,6 @@
 // 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)];
-
 #[link(name = "rust",
        vers = "0.6",
        uuid = "4a24da33-5cc8-4037-9352-2cbe9bd9d27c",

branches/incoming/src/librustc/driver/driver.rs

@@ -25,7 +25,6 @@ use util::common::time;
 use util::ppaux;
 
 use core::int;
-use core::io::WriterUtil;
 use core::io;
 use core::os;
 use core::str;

branches/incoming/src/librustc/middle/kind.rs

@@ -56,8 +56,6 @@ use syntax::{visit, ast_util};
 // primitives in the stdlib are explicitly annotated to only take sendable
 // types.
 
-use core::hashmap::linear::LinearSet;
-
 pub static try_adding: &'static str = "Try adding a move";
 
 pub type rval_map = HashMap<node_id, ()>;

branches/incoming/src/librustc/middle/trans/tvec.rs

@@ -27,7 +27,6 @@ use middle::ty;
 use util::common::indenter;
 use util::ppaux::ty_to_str;
 
-use core::option::None;
 use core::uint;
 use core::vec;
 use syntax::ast;
@@ -414,54 +413,30 @@ pub fn write_content(bcx: block,
                         return bcx;
                     }
 
-                    let elem = unpack_datum!(bcx, {
+                    let tmpdatum = unpack_datum!(bcx, {
                         expr::trans_to_datum(bcx, element)
                     });
 
-                    let next_bcx = sub_block(bcx, ~"expr_repeat: while next");
-                    let loop_bcx = loop_scope_block(bcx, next_bcx, None, ~"expr_repeat", None);
-                    let cond_bcx = scope_block(loop_bcx, None, ~"expr_repeat: loop cond");
-                    let set_bcx = scope_block(loop_bcx, None, ~"expr_repeat: body: set");
-                    let inc_bcx = scope_block(loop_bcx, None, ~"expr_repeat: body: inc");
-                    Br(bcx, loop_bcx.llbb);
-
-                    let loop_counter = {
-                        // i = 0
-                        let i = alloca(loop_bcx, T_i64());
-                        Store(loop_bcx, C_i64(0), i);
-
-                        Br(loop_bcx, cond_bcx.llbb);
-                        i
-                    };
-
-                    { // i < count
-                        let lhs = Load(cond_bcx, loop_counter);
-                        let rhs = C_integral(T_i64(), count as u64, lib::llvm::False);
-                        let cmp_lr = ICmp(cond_bcx, lib::llvm::IntULT, lhs, rhs);
-                        let zext = ZExt(cond_bcx, cmp_lr, T_i8());
-                        let cond_val = ICmp(cond_bcx, lib::llvm::IntNE, zext, C_u8(0));
-
-                        CondBr(cond_bcx, cond_val, set_bcx.llbb, next_bcx.llbb);
-                    }
-
-                    { // v[i] = elem
-                        let i = Load(set_bcx, loop_counter);
-                        let lleltptr = InBoundsGEP(set_bcx, lldest, [i]);
-                        let set_bcx = elem.copy_to(set_bcx, INIT, lleltptr);
+                    let mut temp_cleanups = ~[];
 
-                        Br(set_bcx, inc_bcx.llbb);
+                    for uint::range(0, count) |i| {
+                        let lleltptr = GEPi(bcx, lldest, [i]);
+                        if i < count - 1 {
+                            // Copy all but the last one in.
+                            bcx = tmpdatum.copy_to(bcx, INIT, lleltptr);
+                        } else {
+                            // Move the last one in.
+                            bcx = tmpdatum.move_to(bcx, INIT, lleltptr);
+                        }
+                        add_clean_temp_mem(bcx, lleltptr, vt.unit_ty);
+                        temp_cleanups.push(lleltptr);
                     }
 
-                    { // i += 1
-                        let i = Load(inc_bcx, loop_counter);
-                        let plusone = Add(inc_bcx, i, C_i64(1));
-                        Store(inc_bcx, plusone, loop_counter);
-
-                        Br(inc_bcx, cond_bcx.llbb);
+                    for vec::each(temp_cleanups) |cleanup| {
+                        revoke_clean(bcx, *cleanup);
                     }
 
-                    return next_bcx;
-
+                    return bcx;
                 }
             }
         }

branches/incoming/src/librustc/rustc.rc

@@ -24,7 +24,6 @@
 #[allow(non_camel_case_types)];
 #[allow(deprecated_mode)];
 #[warn(deprecated_pattern)];
-#[deny(deprecated_self)];
 
 #[no_core];
 

branches/incoming/src/librustdoc/rustdoc.rc

@@ -22,7 +22,6 @@
 #[no_core];
 
 #[allow(non_implicitly_copyable_typarams)];
-#[deny(deprecated_self)];
 
 extern mod core(vers = "0.6");
 extern mod std(vers = "0.6");

branches/incoming/src/librustdoc/trim_pass.rs

@@ -18,8 +18,6 @@ is interpreted as the brief description.
 use pass::Pass;
 use text_pass;
 
-use core::str;
-
 pub fn mk_pass() -> Pass {
     text_pass::mk_pass(~"trim", |s| s.trim().to_owned() )
 }

branches/incoming/src/librusti/rusti.rc

@@ -22,7 +22,6 @@
 
 #[allow(vecs_implicitly_copyable,
         non_implicitly_copyable_typarams)];
-#[deny(deprecated_self)];
 
 extern mod core(vers = "0.6");
 extern mod std(vers = "0.6");

branches/incoming/src/librustpkg/rustpkg.rc

@@ -20,7 +20,6 @@
 #[no_core];
 #[allow(vecs_implicitly_copyable,
         non_implicitly_copyable_typarams)];
-#[deny(deprecated_self)];
 
 extern mod core(vers = "0.6");
 extern mod std(vers = "0.6");

branches/incoming/src/libstd/std.rc

@@ -28,7 +28,6 @@ not required in or otherwise suitable for the core library.
 
 #[allow(vecs_implicitly_copyable)];
 #[deny(non_camel_case_types)];
-#[deny(deprecated_self)];
 #[allow(deprecated_mutable_fields)];
 
 #[no_core];