---

yaml
---
r: 60849
b: refs/heads/auto
c: 2bed5dc
h: refs/heads/master
i:
  60847: e894f8f
v: v3

Author: graydon

[refs]

@@ -14,6 +14,6 @@ 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: aef1e10eba812b8144b0a4ac8d9b6e690c6e5ca7
+refs/heads/auto: 2bed5dc528c120e571a75ef77349cd3222ce4cd3
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/src/libextra/bitv.rs

@@ -1,4 +1,4 @@
-// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -13,6 +13,7 @@ use core::prelude::*;
 use core::cmp;
 use core::ops;
 use core::uint;
+use core::vec::from_elem;
 use core::vec;
 
 struct SmallBitv {

branches/auto/src/libextra/test.rs

@@ -1,4 +1,4 @@
-// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -24,11 +24,13 @@ use term;
 use core::comm::{stream, SharedChan};
 use core::either;
 use core::io;
+use core::num;
 use core::option;
 use core::result;
 use core::str;
 use core::task;
 use core::to_str::ToStr;
+use core::u64;
 use core::uint;
 use core::vec;
 

branches/auto/src/libextra/uv_global_loop.rs

@@ -1,4 +1,4 @@
-// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -16,7 +16,9 @@ use iotask = uv_iotask;
 use uv_iotask::{IoTask, spawn_iotask};
 
 use core::comm::Chan;
+use core::libc;
 use core::option::{Some, None};
+use core::str;
 use core::task::task;
 use core::unstable::global::{global_data_clone_create, global_data_clone};
 use core::unstable::weak_task::weaken_task;

branches/auto/src/librustc/back/link.rs

@@ -1,4 +1,4 @@
-// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -106,7 +106,9 @@ pub mod jit {
     use metadata::cstore;
 
     use core::cast;
+    use core::char;
     use core::libc::c_int;
+    use core::os;
     use core::ptr;
     use core::str;
 

branches/auto/src/librustc/back/passes.rs

@@ -1,4 +1,4 @@
-// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -12,7 +12,7 @@ use core::prelude::*;
 use core::str;
 use core::io;
 
-use driver::session::{OptLevel, No, Less, Aggressive};
+use driver::session::{OptLevel, No, Less, Default, Aggressive};
 use driver::session::{Session};
 use lib::llvm::{PassRef, ModuleRef,PassManagerRef,TargetDataRef};
 use lib::llvm::llvm;

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

@@ -421,7 +421,7 @@ pub fn check_durable(tcx: ty::ctxt, ty: ty::t, sp: span) -> bool {
         match ty::get(ty).sty {
           ty::ty_param(*) => {
             tcx.sess.span_err(sp, "value may contain borrowed \
-                                   pointers; use `'static` bound");
+                                   pointers; add `'static` bound");
           }
           _ => {
             tcx.sess.span_err(sp, "value may contain borrowed \

branches/auto/src/librustc/middle/trans/foreign.rs

@@ -34,6 +34,7 @@ use middle::ty;
 use middle::ty::FnSig;
 use util::ppaux::ty_to_str;
 
+use core::str;
 use core::uint;
 use core::vec;
 use syntax::codemap::span;

branches/auto/src/librustc/middle/trans/glue.rs

@@ -1,4 +1,4 @@
-// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -19,6 +19,7 @@ use back::link::*;
 use driver::session;
 use lib;
 use lib::llvm::{llvm, ValueRef, TypeRef, True};
+use lib::llvm::type_to_str;
 use middle::trans::adt;
 use middle::trans::base::*;
 use middle::trans::callee;

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

@@ -37,6 +37,7 @@ use core::to_bytes;
 use core::u32;
 use core::uint;
 use core::vec;
+use extra::smallintmap::SmallIntMap;
 use syntax::ast::*;
 use syntax::ast_util::is_local;
 use syntax::ast_util;

branches/auto/src/librustdoc/astsrv.rs

@@ -1,4 +1,4 @@
-// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -24,6 +24,7 @@ use parse;
 use core::cell::Cell;
 use core::comm::{stream, SharedChan, Port};
 use core::task;
+use core::vec;
 use rustc::driver::driver;
 use rustc::driver::session::Session;
 use rustc::driver::session::{basic_options, options};
@@ -32,8 +33,6 @@ use syntax::ast;
 use syntax::ast_map;
 use syntax;
 
-#[cfg(test)] use core::vec;
-
 pub struct Ctxt {
     ast: @ast::crate,
     ast_map: ast_map::map

branches/auto/src/librustdoc/extract.rs

@@ -1,4 +1,4 @@
-// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -16,6 +16,7 @@ use astsrv;
 use doc::ItemUtils;
 use doc;
 
+use core::local_data::local_data_get;
 use core::vec;
 use syntax::ast;
 use syntax::parse::token::{ident_interner};

branches/auto/src/librustdoc/markdown_writer.rs

@@ -1,4 +1,4 @@
-// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -17,6 +17,8 @@ use doc;
 use core::comm::*;
 use core::comm;
 use core::io;
+use core::libc;
+use core::os;
 use core::result;
 use core::run;
 use core::str;

branches/auto/src/librustdoc/unindent_pass.rs

@@ -1,4 +1,4 @@
-// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -22,6 +22,7 @@ middle of a line, and each of the following lines is indented.
 use core::prelude::*;
 
 use core::str;
+use core::task;
 use core::uint;
 use core::vec;
 use pass::Pass;

branches/auto/src/libstd/cell.rs

@@ -1,4 +1,4 @@
-// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -11,6 +11,7 @@
 //! A mutable, nullable memory location
 
 use cast::transmute_mut;
+use cmp;
 use prelude::*;
 use util::replace;
 

branches/auto/src/libstd/iterator.rs

@@ -20,6 +20,7 @@ implementing the `Iterator` trait.
 use cmp;
 use iter;
 use num::{Zero, One};
+use num;
 use prelude::*;
 
 /// An interface for dealing with "external iterators". These types of iterators

branches/auto/src/libstd/local_data.rs

@@ -1,4 +1,4 @@
-// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -29,8 +29,7 @@ magic.
 use prelude::*;
 
 use task::local_data_priv::{local_get, local_pop, local_modify, local_set, Handle};
-
-#[cfg(test)] use task;
+use task;
 
 /**
  * Indexes a task-local data slot. The function's code pointer is used for

branches/auto/src/libstd/rand/distributions.rs

@@ -21,6 +21,7 @@
 // could implement VIZIGNOR the ZIGNOR paper for more speed.
 
 use f64;
+use prelude::*;
 use rand::{Rng,Rand};
 
 mod ziggurat_tables;

branches/auto/src/libstd/rt/task.rs

@@ -20,6 +20,7 @@ use prelude::*;
 use rt::local::Local;
 use rt::logging::StdErrLogger;
 use super::local_heap::LocalHeap;
+use super::sched::Scheduler;
 
 pub struct Task {
     heap: LocalHeap,

branches/auto/src/libstd/task/mod.rs

@@ -1,4 +1,4 @@
-// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -37,22 +37,22 @@
 
 use prelude::*;
 
+use cast;
 use cell::Cell;
 use cmp::Eq;
 use comm::{stream, Chan, GenericChan, GenericPort, Port};
+use comm;
+use ptr;
 use result::Result;
 use result;
 use rt::{context, OldTaskContext};
 use task::rt::{task_id, sched_id};
+use task;
 use unstable::finally::Finally;
 use util::replace;
 use util;
 
-#[cfg(test)] use cast;
 #[cfg(test)] use comm::SharedChan;
-#[cfg(test)] use comm;
-#[cfg(test)] use ptr;
-#[cfg(test)] use task;
 
 mod local_data_priv;
 pub mod rt;

branches/auto/src/libstd/task/spawn.rs

@@ -1,4 +1,4 @@
-// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -79,6 +79,7 @@ use cast;
 use cell::Cell;
 use container::Map;
 use comm::{Chan, GenericChan};
+use comm;
 use ptr;
 use hashmap::HashSet;
 use task::local_data_priv::{local_get, local_set, OldHandle};
@@ -88,14 +89,13 @@ use task::{Failure, ManualThreads, PlatformThread, SchedOpts, SingleThreaded};
 use task::{Success, TaskOpts, TaskResult, ThreadPerCore, ThreadPerTask};
 use task::{ExistingScheduler, SchedulerHandle};
 use task::unkillable;
+use task;
 use uint;
 use util;
 use unstable::sync::{Exclusive, exclusive};
 use rt::local::Local;
 
 #[cfg(test)] use task::default_task_opts;
-#[cfg(test)] use comm;
-#[cfg(test)] use task;
 
 macro_rules! move_it (
     { $x:expr } => ( unsafe { let y = *ptr::to_unsafe_ptr(&($x)); y } )

branches/auto/src/libstd/trie.rs

@@ -10,6 +10,8 @@
 
 //! An ordered map and set for integer keys implemented as a radix trie
 
+use local_data;
+use os;
 use prelude::*;
 use uint;
 use util::{swap, replace};

branches/auto/src/libstd/unstable/mod.rs

@@ -1,4 +1,4 @@
-// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -14,6 +14,7 @@ use comm::{GenericChan, GenericPort};
 use comm;
 use libc;
 use prelude::*;
+use ptr;
 use task;
 
 pub mod at_exit;

branches/auto/src/libstd/util.rs

@@ -11,6 +11,7 @@
 //! Miscellaneous helpers for common patterns.
 
 use cast;
+use local_data;
 use ptr;
 use prelude::*;
 use unstable::intrinsics;

branches/auto/src/libsyntax/ext/pipes/ast_builder.rs

@@ -1,4 +1,4 @@
-// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -19,6 +19,7 @@ use ast::ident;
 use ast;
 use codemap::span;
 
+use core::str;
 use core::vec;
 
 // Transitional reexports so qquote can find the paths it is looking for

branches/auto/src/libsyntax/parse/parser.rs

@@ -92,6 +92,7 @@ use parse::{new_sub_parser_from_file, next_node_id, ParseSess};
 use opt_vec;
 use opt_vec::OptVec;
 
+use core::char;
 use core::either::Either;
 use core::either;
 use core::hashmap::HashSet;

branches/auto/src/libsyntax/parse/token.rs

@@ -1,4 +1,4 @@
-// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -19,9 +19,11 @@ use util::interner;
 use core::cast;
 use core::char;
 use core::cmp::Equiv;
+use core::hashmap::HashSet;
 use core::local_data;
 use core::str;
 use core::to_bytes;
+use core::vec;
 
 #[deriving(Encodable, Decodable, Eq)]
 pub enum binop {

branches/auto/src/test/compile-fail/kindck-owned-trait-scoped.rs

@@ -37,7 +37,7 @@ fn to_foo_2<T:Copy>(t: T) -> @foo {
     // Not OK---T may contain borrowed ptrs and it is going to escape
     // as part of the returned foo value
     struct F<T> { f: T }
-    @F {f:t} as @foo //~ ERROR value may contain borrowed pointers; use `'static` bound
+    @F {f:t} as @foo //~ ERROR value may contain borrowed pointers; add `'static` bound
 }
 
 fn to_foo_3<T:Copy + 'static>(t: T) -> @foo {

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

@@ -11,7 +11,7 @@
 trait foo { fn foo(&self); }
 
 fn to_foo<T:Copy + foo>(t: T) -> @foo {
-    @t as @foo //~ ERROR value may contain borrowed pointers; use `'static` bound
+    @t as @foo //~ ERROR value may contain borrowed pointers; add `'static` bound
 }
 
 fn to_foo2<T:Copy + foo + 'static>(t: T) -> @foo {