---

yaml
---
r: 31453
b: refs/heads/dist-snap
c: dbbaa50
h: refs/heads/master
i:
  31451: e8a5403
v: v3

Author: graydon

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: c60a6b93fbb11751dfb411ee2909fa85644fe76f
+refs/heads/dist-snap: dbbaa50290ed7c97154bbc44e7bd73937a9dcb5e
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/cargo/cargo.rc

@@ -7,7 +7,6 @@
 // indent-tabs-mode: nil
 // c-basic-offset: 4
 // buffer-file-coding-system: utf-8-unix
-// compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
 // End:
 
 #[link(name = "cargo",
@@ -19,7 +18,15 @@
 
 #[no_core];
 
-#[warn(no_non_implicitly_copyable_typarams,no_vecs_not_implicitly_copyable)];
+
+// NB: transitional for stage0:
+#[allow(unrecognized_lint)];
+#[warn(no_unrecognized_warning)];
+#[warn(no_non_implicitly_copyable_typarams,
+       no_vecs_not_implicitly_copyable)];
+// The new version:
+#[allow(vecs_implicitly_copyable,
+        non_implicitly_copyable_typarams)];
 
 use core(vers = "0.3");
 use std(vers = "0.3");

branches/dist-snap/src/compiletest/compiletest.rc

@@ -2,7 +2,12 @@
 
 #[no_core];
 
+// NB: transitional for stage0:
+#[allow(unrecognized_lint)];
+#[warn(no_unrecognized_warning)];
 #[warn(no_vecs_not_implicitly_copyable)];
+// The new version:
+#[allow(vecs_implicitly_copyable)];
 
 use core(vers = "0.3");
 use std(vers = "0.3");

branches/dist-snap/src/fuzzer/fuzzer.rc

@@ -4,7 +4,12 @@
 
 #[no_core];
 
+// NB: transitional for stage0:
+#[allow(unrecognized_lint)];
+#[warn(no_unrecognized_warning)];
 #[warn(no_vecs_not_implicitly_copyable)];
+// The new version:
+#[allow(vecs_implicitly_copyable)];
 
 use core(vers = "0.3");
 use std(vers = "0.3");
@@ -17,5 +22,4 @@ import core::*;
 // indent-tabs-mode: nil
 // c-basic-offset: 4
 // buffer-file-coding-system: utf-8-unix
-// compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
 // End:

branches/dist-snap/src/libcore/core.rc

@@ -31,7 +31,12 @@
 // Don't link to core. We are core.
 #[no_core];
 
+// NB: transitional for stage0:
+#[allow(unrecognized_lint)];
+#[warn(no_unrecognized_warning)];
 #[warn(no_vecs_not_implicitly_copyable)];
+// The new version:
+#[allow(vecs_implicitly_copyable)];
 
 export int, i8, i16, i32, i64;
 export uint, u8, u16, u32, u64;

branches/dist-snap/src/libstd/std.rc

@@ -10,7 +10,12 @@
 
 #[no_core];
 
+// NB: transitional for stage0:
+#[allow(unrecognized_lint)];
+#[warn(no_unrecognized_warning)];
 #[warn(no_vecs_not_implicitly_copyable)];
+// The new version:
+#[allow(vecs_implicitly_copyable)];
 
 use core(vers = "0.3");
 import core::*;

branches/dist-snap/src/libstd/test.rs

@@ -328,7 +328,9 @@ fn get_concurrency() -> uint {
     else { threads * sched_overcommit }
 }
 
+// NB: transitional duplication here.
 #[warn(no_non_implicitly_copyable_typarams)]
+#[allow(non_implicitly_copyable_typarams)]
 fn filter_tests(opts: test_opts,
                 tests: ~[test_desc]) -> ~[test_desc] {
     let mut filtered = copy tests;

branches/dist-snap/src/libsyntax/syntax.rc

@@ -8,7 +8,12 @@
 
 #[no_core];
 
+// NB: transitional for stage0:
+#[allow(unrecognized_lint)];
+#[warn(no_unrecognized_warning)];
 #[warn(no_vecs_not_implicitly_copyable)];
+// The new version:
+#[allow(vecs_implicitly_copyable)];
 
 use core(vers = "0.3");
 use std(vers = "0.3");

branches/dist-snap/src/rustc/driver/driver.rs

@@ -158,7 +158,7 @@ fn compile_upto(sess: session, cfg: ast::crate_cfg,
     crate = time(time_passes, ~"core injection", ||
         front::core_inject::maybe_inject_libcore_ref(sess, crate));
 
-    time(time_passes, ~"building warning settings table", ||
+    time(time_passes, ~"building lint settings table", ||
         lint::build_settings_crate(sess, crate));
 
     let ast_map = time(time_passes, ~"ast indexing", ||
@@ -418,17 +418,28 @@ fn build_session_options(match: getopts::match,
     let parse_only = opt_present(match, ~"parse-only");
     let no_trans = opt_present(match, ~"no-trans");
 
-    let lint_flags = vec::append(getopts::opt_strs(match, ~"W"),
-                                 getopts::opt_strs(match, ~"warn"));
+    let lint_levels = [lint::allow, lint::warn,
+                       lint::deny, lint::forbid];
+    let mut lint_opts = ~[];
     let lint_dict = lint::get_lint_dict();
-    let lint_opts = do vec::map(lint_flags) |flag| {
-        alt lint::lookup_lint(lint_dict, flag) {
-          (flag, none) {
-            early_error(demitter, #fmt("unknown warning: %s", flag))
-          }
-          (_, some(x)) { x }
+    for lint_levels.each |level| {
+        let level_name = lint::level_to_str(level);
+        let level_short = level_name.substr(0,1).to_upper();
+        let flags = vec::append(getopts::opt_strs(match, level_short),
+                                getopts::opt_strs(match, level_name));
+        for flags.each |lint_name| {
+            let lint_name = str::replace(lint_name, ~"-", ~"_");
+            alt lint_dict.find(lint_name) {
+              none {
+                early_error(demitter, #fmt("unknown %s flag: %s",
+                                           level_name, lint_name));
+              }
+              some(lint) {
+                vec::push(lint_opts, (lint.lint, level));
+              }
+            }
         }
-    };
+    }
 
     let mut debugging_opts = 0u;
     let debug_flags = getopts::opt_strs(match, ~"Z");
@@ -540,7 +551,7 @@ fn build_session_(sopts: @session::options,
         sopts.maybe_sysroot,
         sopts.target_triple,
         sopts.addl_lib_search_paths);
-    let warning_settings = lint::mk_warning_settings();
+    let lint_settings = lint::mk_lint_settings();
     session_(@{targ_cfg: target_cfg,
                opts: sopts,
                cstore: cstore,
@@ -553,7 +564,7 @@ fn build_session_(sopts: @session::options,
                filesearch: filesearch,
                mut building_library: false,
                working_dir: os::getcwd(),
-               warning_settings: warning_settings})
+               lint_settings: lint_settings})
 }
 
 fn parse_pretty(sess: session, &&name: ~str) -> pp_mode {
@@ -582,6 +593,9 @@ fn opts() -> ~[getopts::opt] {
           optopt(~"sysroot"), optopt(~"target"),
 
           optmulti(~"W"), optmulti(~"warn"),
+          optmulti(~"A"), optmulti(~"allow"),
+          optmulti(~"D"), optmulti(~"deny"),
+          optmulti(~"F"), optmulti(~"forbid"),
 
           optmulti(~"Z"),
 

branches/dist-snap/src/rustc/driver/rustc.rs

@@ -1,5 +1,10 @@
 #[no_core];
+// NB: transitional for stage0:
+#[allow(unrecognized_lint)];
+#[warn(no_unrecognized_warning)];
 #[warn(no_vecs_not_implicitly_copyable)];
+// The new version:
+#[allow(vecs_implicitly_copyable)];
 
 use core(vers = "0.3");
 use std(vers = "0.3");
@@ -66,10 +71,12 @@ Options:
                        (see http://sources.redhat.com/autobook/autobook/
                        autobook_17.html for detail)
 
-    -W <foo>           enable warning <foo>
-    -W no-<foo>        disable warning <foo>
-    -W err-<foo>       enable warning <foo> as an error
-    -W help            Print available warnings and default settings
+    -(W|A|D|F) help    Print available 'lint' checks and default settings
+
+    -W <foo>           warn about <foo> by default
+    -A <foo>           allow <foo> by default
+    -D <foo>           deny <foo> by default
+    -F <foo>           forbid <foo> (deny, and deny all overrides)
 
     -Z help            list internal options for debugging rustc
 
@@ -84,7 +91,7 @@ fn describe_warnings() {
     fn padded(max: uint, s: ~str) -> ~str {
         str::from_bytes(vec::from_elem(max - s.len(), ' ' as u8)) + s
     }
-    io::println(#fmt("\nAvailable warnings:\n"));
+    io::println(#fmt("\nAvailable lint checks:\n"));
     io::println(#fmt("    %s  %7.7s  %s",
                      padded(max_key, ~"name"), ~"default", ~"meaning"));
     io::println(#fmt("    %s  %7.7s  %s\n",
@@ -93,9 +100,12 @@ fn describe_warnings() {
         let k = str::replace(k, ~"_", ~"-");
         io::println(#fmt("    %s  %7.7s  %s",
                          padded(max_key, k),
-                         alt v.default { lint::warn { ~"warn" }
-                                        lint::error { ~"error" }
-                                        lint::ignore { ~"ignore" } },
+                         alt v.default {
+                             lint::allow { ~"allow" }
+                             lint::warn { ~"warn" }
+                             lint::deny { ~"deny" }
+                             lint::forbid { ~"forbid" }
+                         },
                          v.desc));
     }
     io::println(~"");

branches/dist-snap/src/rustc/driver/session.rs

@@ -101,7 +101,7 @@ type session_ = {targ_cfg: @config,
                  filesearch: filesearch::filesearch,
                  mut building_library: bool,
                  working_dir: ~str,
-                 warning_settings: lint::warning_settings};
+                 lint_settings: lint::lint_settings};
 
 enum session {
     session_(@session_)
@@ -153,16 +153,18 @@ impl session for session {
     fn span_lint_level(level: lint::level,
                        sp: span, msg: ~str) {
         alt level {
-          lint::ignore { }
+          lint::allow { }
           lint::warn { self.span_warn(sp, msg); }
-          lint::error { self.span_err(sp, msg); }
+          lint::deny | lint::forbid {
+            self.span_err(sp, msg);
+          }
         }
     }
     fn span_lint(lint_mode: lint::lint,
                  expr_id: ast::node_id, item_id: ast::node_id,
                  span: span, msg: ~str) {
-        let level = lint::get_warning_settings_level(
-            self.warning_settings, lint_mode, expr_id, item_id);
+        let level = lint::get_lint_settings_level(
+            self.lint_settings, lint_mode, expr_id, item_id);
         self.span_lint_level(level, span, msg);
     }
     fn next_node_id() -> ast::node_id {