---

yaml
---
r: 23999
b: refs/heads/master
c: e653d49
h: refs/heads/master
i:
  23997: 16f7396
  23995: e30c999
  23991: 5caed02
  23983: 8cd1771
  23967: f64b096
  23935: 079d98f
v: v3

Author: pcwalton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: d53cfd225a4e2b671b2b40b71725394c24fb1761
+refs/heads/master: e653d493fb8df74bd0583c4f32c882a590135ef1
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/fuzzer/fuzzer.rc

@@ -4,6 +4,8 @@
 
 #[no_core];
 
+#[legacy_modes];
+
 #[allow(vecs_implicitly_copyable)];
 #[allow(non_camel_case_types)];
 

trunk/src/libcore/core.rc

@@ -31,6 +31,8 @@
 // Don't link to core. We are core.
 #[no_core];
 
+#[legacy_modes];
+
 #[warn(vecs_implicitly_copyable)];
 #[deny(non_camel_case_types)];
 

trunk/src/libstd/std.rc

@@ -10,6 +10,8 @@
 
 #[no_core];
 
+#[legacy_modes];
+
 #[allow(vecs_implicitly_copyable)];
 #[deny(non_camel_case_types)];
 

trunk/src/libsyntax/syntax.rc

@@ -8,6 +8,8 @@
 
 #[no_core];
 
+#[legacy_modes];
+
 #[allow(vecs_implicitly_copyable)];
 #[allow(non_camel_case_types)];
 

trunk/src/rustc/driver/driver.rs

@@ -206,7 +206,7 @@ fn compile_upto(sess: session, cfg: ast::crate_cfg,
         middle::region::determine_rp_in_crate(sess, ast_map, def_map, crate));
 
     let ty_cx = ty::mk_ctxt(sess, def_map, ast_map, freevars,
-                            region_map, rp_set, move lang_items);
+                            region_map, rp_set, move lang_items, crate);
 
     let (method_map, vtable_map) = time(time_passes, ~"typechecking", ||
                                         typeck::check_crate(ty_cx,

trunk/src/rustc/driver/rustc.rs

@@ -1,6 +1,7 @@
 #[no_core];
 #[allow(vecs_implicitly_copyable)];
 #[allow(non_camel_case_types)];
+#[legacy_modes];
 
 extern mod core(vers = "0.4");
 extern mod std(vers = "0.4");

trunk/src/rustc/middle/lint.rs

@@ -13,7 +13,7 @@ use syntax::ast_util::{path_to_ident};
 use syntax::print::pprust::{expr_to_str, mode_to_str, pat_to_str};
 export lint, ctypes, unused_imports, while_true, path_statement, old_vecs;
 export unrecognized_lint, non_implicitly_copyable_typarams;
-export vecs_implicitly_copyable, implicit_copies;
+export vecs_implicitly_copyable, implicit_copies, legacy_modes;
 export level, allow, warn, deny, forbid;
 export lint_dict, get_lint_dict, level_to_str;
 export get_lint_level, get_lint_settings_level;
@@ -59,6 +59,8 @@ enum lint {
     owned_heap_memory,
     heap_memory,
 
+    legacy_modes,
+
     // FIXME(#3266)--make liveness warnings lintable
     // unused_variable,
     // dead_assignment
@@ -179,6 +181,11 @@ fn get_lint_dict() -> lint_dict {
            desc: ~"use of any structural records",
            default: allow}),
 
+        (~"legacy modes",
+         @{lint: legacy_modes,
+           desc: ~"allow legacy modes",
+           default: forbid}),
+
         /* FIXME(#3266)--make liveness warnings lintable
         (~"unused_variable",
          @{lint: unused_variable,

trunk/src/rustc/middle/ty.rs

@@ -319,6 +319,7 @@ type ctxt =
       interner: HashMap<intern_key, t_box>,
       mut next_id: uint,
       vecs_implicitly_copyable: bool,
+      legacy_modes: bool,
       cstore: metadata::cstore::cstore,
       sess: session::session,
       def_map: resolve::DefMap,
@@ -827,7 +828,19 @@ fn mk_ctxt(s: session::session,
            freevars: freevars::freevar_map,
            region_map: middle::region::region_map,
            region_paramd_items: middle::region::region_paramd_items,
-           +lang_items: middle::lang_items::LanguageItems) -> ctxt {
+           +lang_items: middle::lang_items::LanguageItems,
+           crate: @ast::crate) -> ctxt {
+    let mut legacy_modes = false;
+    for crate.node.attrs.each |attribute| {
+        match attribute.node.value.node {
+            ast::meta_word(w) if w == ~"legacy_modes" => {
+                legacy_modes = true;
+                break;
+            }
+            _ => {}
+        }
+    }
+
     let interner = map::HashMap();
     let vecs_implicitly_copyable =
         get_lint_level(s.lint_settings.default_settings,
@@ -836,6 +849,7 @@ fn mk_ctxt(s: session::session,
       interner: interner,
       mut next_id: 0u,
       vecs_implicitly_copyable: vecs_implicitly_copyable,
+      legacy_modes: legacy_modes,
       cstore: s.cstore,
       sess: s,
       def_map: dm,
@@ -1075,9 +1089,14 @@ pure fn mach_sty(cfg: @session::config, t: t) -> sty {
     }
 }
 
-fn default_arg_mode_for_ty(ty: ty::t) -> ast::rmode {
-    if ty::type_is_immediate(ty) { ast::by_val }
-    else { ast::by_ref }
+fn default_arg_mode_for_ty(tcx: ctxt, ty: ty::t) -> ast::rmode {
+    if ty::type_is_immediate(ty) {
+        ast::by_val
+    } else if tcx.legacy_modes {
+        ast::by_ref
+    } else {
+        ast::by_copy
+    }
 }
 
 // Returns the narrowest lifetime enclosing the evaluation of the expression

trunk/src/rustc/middle/typeck/astconv.rs

@@ -432,7 +432,8 @@ fn ty_of_arg<AC: ast_conv, RS: region_scope Copy Owned>(
               // tables in tcx but should never fail, because nothing else
               // will have been unified with m yet:
               _ => {
-                let m1 = ast::expl(ty::default_arg_mode_for_ty(ty));
+                let m1 = ast::expl(ty::default_arg_mode_for_ty(self.tcx(),
+                                                               ty));
                 result::get(ty::unify_mode(
                     self.tcx(),
                     ty::expected_found {expected: m1,

trunk/src/rustc/middle/typeck/check/writeback.rs

@@ -145,7 +145,7 @@ fn visit_expr(e: @ast::expr, wbcx: wb_ctxt, v: wb_vt) {
             match (r_ty, input.mode) {
               (Some(t), ast::infer(_)) => {
                 let tcx = wbcx.fcx.ccx.tcx;
-                let m_def = ty::default_arg_mode_for_ty(t);
+                let m_def = ty::default_arg_mode_for_ty(tcx, t);
                 ty::set_default_mode(tcx, input.mode, m_def);
               }
               _ => ()

trunk/src/rustc/rustc.rc

@@ -11,6 +11,8 @@
 
 #[no_core];
 
+#[legacy_modes];
+
 #[allow(vecs_implicitly_copyable)];
 #[allow(non_camel_case_types)];
 // #[warn(deprecated_pattern)];

trunk/src/rustc/util/ppaux.rs

@@ -258,7 +258,7 @@ fn ty_to_str(cx: ctxt, typ: t) -> ~str {
           ast::infer(_) => ~"",
           ast::expl(m) => {
             if !ty::type_needs_infer(ty) &&
-                m == ty::default_arg_mode_for_ty(ty) {
+                m == ty::default_arg_mode_for_ty(cx, ty) {
                 ~""
             } else {
                 mode_to_str(ast::expl(m))

trunk/src/rustdoc/rustdoc.rc

@@ -11,6 +11,8 @@
 
 #[no_core];
 
+#[legacy_modes];
+
 #[allow(vecs_implicitly_copyable,
         non_implicitly_copyable_typarams)];
 #[allow(non_camel_case_types)];

trunk/src/test/auxiliary/cci_iter_lib.rs

@@ -1,4 +1,5 @@
 #[link(name="cci_iter_lib", vers="0.0")];
+#[legacy_modes];
 
 #[inline]
 fn iter<T>(v: ~[T], f: fn(T)) {

trunk/src/test/auxiliary/cci_nested_lib.rs

@@ -1,3 +1,5 @@
+#[legacy_modes];
+
 use dvec::DVec;
 
 type entry<A,B> = {key: A, value: B};
@@ -26,4 +28,4 @@ fn new_int_alist_2<B: Copy>() -> alist<int, B> {
     #[inline]
     fn eq_int(&&a: int, &&b: int) -> bool { a == b }
     return {eq_fn: eq_int, data: DVec()};
-}
+}

trunk/src/test/bench/graph500-bfs.rs

@@ -4,6 +4,8 @@ An implementation of the Graph500 Breadth First Search problem in Rust.
 
 */
 
+#[legacy_modes];
+
 extern mod std;
 use std::arc;
 use std::time;

trunk/src/test/bench/msgsend-pipes-shared.rs

@@ -10,6 +10,8 @@
 
 // xfail-pretty
 
+#[legacy_modes];
+
 extern mod std;
 use io::Writer;
 use io::WriterUtil;

trunk/src/test/bench/msgsend-pipes.rs

@@ -6,6 +6,8 @@
 
 // xfail-pretty
 
+#[legacy_modes];
+
 extern mod std;
 use io::Writer;
 use io::WriterUtil;

trunk/src/test/bench/shootout-k-nucleotide-pipes.rs

@@ -2,6 +2,8 @@
 
 // multi tasking k-nucleotide
 
+#[legacy_modes];
+
 extern mod std;
 use std::map;
 use std::map::HashMap;

trunk/src/test/bench/shootout-mandelbrot.rs

@@ -12,6 +12,8 @@
 //
 //  writes pbm image to output path
 
+#[legacy_modes];
+
 extern mod std;
 use io::WriterUtil;
 use std::map::HashMap;

trunk/src/test/bench/shootout-pfib.rs

@@ -10,6 +10,8 @@
 
 */
 
+#[legacy_modes];
+
 extern mod std;
 
 use std::{time, getopts};

trunk/src/test/bench/task-perf-word-count-generic.rs

@@ -10,6 +10,8 @@
 
 // xfail-pretty
 
+#[legacy_modes];
+
 extern mod std;
 
 use option = option;

trunk/src/test/compile-fail/borrowck-unchecked-with-borrow.rs

@@ -1,3 +1,7 @@
+// xfail-test
+// xfail-fast
+#[legacy_modes];
+
 fn impure(_i: int) {}
 
 // check that unchecked alone does not override borrowck:

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

@@ -1,3 +1,5 @@
+#[legacy_modes];
+
 fn takes_mut(&&x: @mut int) { }
 fn takes_const(&&x: @const int) { }
 fn takes_imm(&&x: @int) { }

trunk/src/test/compile-fail/issue-2587-2.rs

@@ -1,3 +1,5 @@
+#[legacy_modes];
+
 fn foo<T: Copy>(+_t: T) { fail; }
 
 fn bar<T>(+_t: T) { fail; }

trunk/src/test/compile-fail/mode-inference-fail.rs

@@ -1,3 +1,5 @@
+#[legacy_modes];
+
 // In this test, the mode gets inferred to ++ due to the apply_int(),
 // but then we get a failure in the generic apply().
 

trunk/src/test/compile-fail/pure-higher-order.rs

@@ -1,3 +1,5 @@
+#[legacy_modes];
+
 // Test rules governing higher-order pure fns.
 
 pure fn range(from: uint, to: uint, f: fn(uint)) {
@@ -45,4 +47,4 @@ fn print(i: uint) { error!("i=%u", i); }
 pure fn noop(_i: uint) {}
 
 fn main() {
-}
+}

trunk/src/test/compile-fail/regions-creating-enums.rs

@@ -1,3 +1,5 @@
+#[legacy_modes];
+
 enum ast {
     num(uint),
     add(&ast, &ast)
@@ -30,4 +32,4 @@ fn map_nums(x: &ast, f: fn(uint) -> uint) -> &ast {
     }
 }
 
-fn main() {}
+fn main() {}

trunk/src/test/run-pass-fulldeps/qquote.rs

@@ -1,5 +1,7 @@
 // xfail-pretty
 
+#[legacy_modes];
+
 extern mod std;
 extern mod syntax;
 

trunk/src/test/run-pass/argument-passing.rs

@@ -1,3 +1,5 @@
+#[legacy_modes];
+
 fn f1(a: {mut x: int}, &b: int, -c: int) -> int {
     let r = a.x + b + c;
     a.x = 0;

trunk/src/test/run-pass/assignability-trait.rs

@@ -2,6 +2,8 @@
 // making method calls, but only if there aren't any matches without
 // it.
 
+#[legacy_modes];
+
 trait iterable<A> {
     fn iterate(blk: fn(A) -> bool);
 }

trunk/src/test/run-pass/auto_serialize.rs

@@ -1,3 +1,5 @@
+#[legacy_modes];
+
 extern mod std;
 
 // These tests used to be separate files, but I wanted to refactor all

trunk/src/test/run-pass/block-iter-1.rs

@@ -1,3 +1,5 @@
+#[legacy_modes];
+
 fn iter_vec<T>(v: ~[T], f: fn(T)) { for v.each |x| { f(x); } }
 
 fn main() {

trunk/src/test/run-pass/block-iter-2.rs

@@ -1,3 +1,5 @@
+#[legacy_modes];
+
 fn iter_vec<T>(v: ~[T], f: fn(T)) { for v.each |x| { f(x); } }
 
 fn main() {

trunk/src/test/run-pass/cci_iter_exe.rs

@@ -1,6 +1,8 @@
 // xfail-fast - check-fast doesn't understand aux-build
 // aux-build:cci_iter_lib.rs
 
+#[legacy_modes];
+
 extern mod cci_iter_lib;
 
 fn main() {

trunk/src/test/run-pass/cci_nested_exe.rs

@@ -1,6 +1,8 @@
 // xfail-fast - check-fast doesn't understand aux-build
 // aux-build:cci_nested_lib.rs
 
+#[legacy_modes];
+
 extern mod cci_nested_lib;
 use cci_nested_lib::*;
 

trunk/src/test/run-pass/class-impl-very-parameterized-trait.rs

@@ -1,3 +1,5 @@
+#[legacy_modes];
+
 extern mod std;
 use std::map::*;