提交 55f81bce 编写于 作者: B Brian Anderson

rustc: Fix style of Lint enum

上级 520c82e0
......@@ -145,7 +145,7 @@ pub struct options {
llvm_args: ~[~str],
debuginfo: bool,
extra_debuginfo: bool,
lint_opts: ~[(lint::lint, lint::level)],
lint_opts: ~[(lint::Lint, lint::level)],
save_temps: bool,
output_type: back::link::OutputType,
// This is mutable for rustpkg, which updates search paths based on the
......@@ -214,7 +214,7 @@ pub struct Session_ {
building_library: Cell<bool>,
working_dir: Path,
lints: RefCell<HashMap<ast::NodeId,
~[(lint::lint, codemap::Span, ~str)]>>,
~[(lint::Lint, codemap::Span, ~str)]>>,
node_id: Cell<ast::NodeId>,
outputs: @RefCell<~[OutputStyle]>,
}
......@@ -268,7 +268,7 @@ pub fn unimpl(&self, msg: &str) -> ! {
self.span_diagnostic.handler().unimpl(msg)
}
pub fn add_lint(&self,
lint: lint::lint,
lint: lint::Lint,
id: ast::NodeId,
sp: Span,
msg: ~str) {
......@@ -443,12 +443,12 @@ pub fn collect_outputs(session: &Session,
Some(n) if "staticlib" == n => Some(OutputStaticlib),
Some(n) if "bin" == n => Some(OutputExecutable),
Some(_) => {
session.add_lint(lint::unknown_crate_type, ast::CRATE_NODE_ID,
session.add_lint(lint::UnknownCrateType, ast::CRATE_NODE_ID,
a.span, ~"invalid `crate_type` value");
None
}
_ => {
session.add_lint(lint::unknown_crate_type, ast::CRATE_NODE_ID,
session.add_lint(lint::UnknownCrateType, ast::CRATE_NODE_ID,
a.span, ~"`crate_type` requires a value");
None
}
......
......@@ -233,7 +233,7 @@ pub fn check_crate(sess: Session, crate: &ast::Crate) {
directive not necessary");
}
None => {
sess.add_lint(lint::unknown_features,
sess.add_lint(lint::UnknownFeatures,
ast::CRATE_NODE_ID,
mi.span,
~"unknown feature");
......
......@@ -15,7 +15,7 @@
use middle::ty;
use middle::typeck;
use middle::privacy;
use middle::lint::dead_code;
use middle::lint::DeadCode;
use std::hashmap::HashSet;
use syntax::ast;
......@@ -328,7 +328,7 @@ fn symbol_is_live(&mut self, id: ast::NodeId,
fn warn_dead_code(&mut self, id: ast::NodeId,
span: codemap::Span, ident: &ast::Ident) {
self.tcx.sess.add_lint(dead_code, id, span,
self.tcx.sess.add_lint(DeadCode, id, span,
format!("code is never used: `{}`",
token::ident_to_str(ident)));
}
......
此差异已折叠。
......@@ -103,7 +103,7 @@
*/
use middle::lint::{unused_variable, dead_assignment};
use middle::lint::{UnusedVariable, DeadAssignment};
use middle::pat_util;
use middle::ty;
use middle::typeck;
......@@ -1705,11 +1705,11 @@ pub fn warn_about_unused(&self,
};
if is_assigned {
self.tcx.sess.add_lint(unused_variable, id, sp,
self.tcx.sess.add_lint(UnusedVariable, id, sp,
format!("variable `{}` is assigned to, \
but never used", *name));
} else {
self.tcx.sess.add_lint(unused_variable, id, sp,
self.tcx.sess.add_lint(UnusedVariable, id, sp,
format!("unused variable: `{}`", *name));
}
}
......@@ -1727,7 +1727,7 @@ pub fn warn_about_dead_assign(&self,
if self.live_on_exit(ln, var).is_none() {
let r = self.should_warn(var);
for name in r.iter() {
self.tcx.sess.add_lint(dead_assignment, id, sp,
self.tcx.sess.add_lint(DeadAssignment, id, sp,
format!("value assigned to `{}` is never read", *name));
}
}
......
......@@ -13,7 +13,7 @@
use metadata::csearch;
use metadata::decoder::{DefLike, DlDef, DlField, DlImpl};
use middle::lang_items::LanguageItems;
use middle::lint::{unnecessary_qualification, unused_imports};
use middle::lint::{UnnecessaryQualification, UnusedImports};
use middle::pat_util::pat_bindings;
use syntax::ast::*;
......@@ -4735,7 +4735,7 @@ fn resolve_path(&mut self,
let def = self.resolve_module_relative_path(path, namespace);
match (def, unqualified_def) {
(Some((d, _)), Some((ud, _))) if d == ud => {
self.session.add_lint(unnecessary_qualification,
self.session.add_lint(UnnecessaryQualification,
id,
path.span,
~"unnecessary qualification");
......@@ -5557,7 +5557,7 @@ fn check_for_item_unused_imports(&self, vi: &ViewItem) {
match p.node {
ViewPathSimple(_, _, id) | ViewPathGlob(_, id) => {
if !self.used_imports.contains(&id) {
self.session.add_lint(unused_imports,
self.session.add_lint(UnusedImports,
id, p.span,
~"unused import");
}
......@@ -5566,7 +5566,7 @@ fn check_for_item_unused_imports(&self, vi: &ViewItem) {
ViewPathList(_, ref list, _) => {
for i in list.iter() {
if !self.used_imports.contains(&i.node.id) {
self.session.add_lint(unused_imports,
self.session.add_lint(UnusedImports,
i.node.id, i.span,
~"unused import");
}
......
......@@ -80,7 +80,7 @@
use middle::const_eval;
use middle::lang_items::{ExchangeHeapLangItem, GcLangItem};
use middle::lang_items::{ManagedHeapLangItem};
use middle::lint::unreachable_code;
use middle::lint::UnreachableCode;
use middle::pat_util::pat_id_map;
use middle::pat_util;
use middle::subst::Subst;
......@@ -3491,7 +3491,7 @@ pub fn check_block_with_expected(fcx: @FnCtxt,
}
_ => false
} {
fcx.ccx.tcx.sess.add_lint(unreachable_code, s_id, s.span,
fcx.ccx.tcx.sess.add_lint(UnreachableCode, s_id, s.span,
~"unreachable statement");
warned = true;
}
......@@ -3513,7 +3513,7 @@ pub fn check_block_with_expected(fcx: @FnCtxt,
},
Some(e) => {
if any_bot && !warned {
fcx.ccx.tcx.sess.add_lint(unreachable_code, e.id, e.span,
fcx.ccx.tcx.sess.add_lint(UnreachableCode, e.id, e.span,
~"unreachable expression");
}
check_expr_with_opt_hint(fcx, e, expected);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册