---

yaml
---
r: 22219
b: refs/heads/snap-stage3
c: 24fbf88
h: refs/heads/master
i:
  22217: fc7558f
  22215: d4170d1
v: v3

Author: catamorphism

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: e480e19694b234ba3eca20748947a4e47e805341
+refs/heads/snap-stage3: 24fbf88230f37d63bb236569d6a9600ad9560f6f
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/rustc/middle/lint.rs

@@ -683,7 +683,8 @@ fn check_fn_deprecated_modes(tcx: ty::ctxt, fn_ty: ty::t, decl: ast::fn_decl,
                        mode_to_str(arg_ast.mode));
                 match arg_ast.mode {
                     ast::expl(ast::by_copy) => {
-                        /* always allow by-copy */
+                        // This should warn, but we can't yet
+                        // since it's still used. -- tjc
                     }
 
                     ast::expl(_) => {
@@ -694,14 +695,16 @@ fn check_fn_deprecated_modes(tcx: ty::ctxt, fn_ty: ty::t, decl: ast::fn_decl,
                     }
 
                     ast::infer(_) => {
-                        let kind = ty::type_kind(tcx, arg_ty.ty);
-                        if !ty::kind_is_safe_for_default_mode(kind) {
-                            tcx.sess.span_lint(
-                                deprecated_mode, id, id,
-                                span,
-                                fmt!("argument %d uses the default mode \
-                                      but shouldn't",
-                                     counter));
+                        if tcx.legacy_modes {
+                            let kind = ty::type_kind(tcx, arg_ty.ty);
+                            if !ty::kind_is_safe_for_default_mode(kind) {
+                                tcx.sess.span_lint(
+                                    deprecated_mode, id, id,
+                                    span,
+                                    fmt!("argument %d uses the default mode \
+                                          but shouldn't",
+                                         counter));
+                            }
                         }
                     }
                 }