diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2015-12-18 13:43:45 +0530 |
|---|---|---|
| committer | Manish Goregaokar <manishsmail@gmail.com> | 2015-12-18 16:47:37 +0530 |
| commit | c2902965cb53d2afd09ea2ce7b3f9c314dc7b072 (patch) | |
| tree | 83b7c8e4e6118bfaa26d7be0d82923537c663bcf /src/librustc/lint | |
| parent | cb319fc84fa52773dd31ead8761b1c251e916e88 (diff) | |
| parent | ff0c74f7d47f5261ebda7cb3b9a637e0cfc69104 (diff) | |
| download | rust-c2902965cb53d2afd09ea2ce7b3f9c314dc7b072.tar.gz rust-c2902965cb53d2afd09ea2ce7b3f9c314dc7b072.zip | |
Rollup merge of #30384 - nrc:diagnostics, r=@nikomatsakis
Should make it possible to add JSON or HTML errors. Also tidies up a lot.
Diffstat (limited to 'src/librustc/lint')
| -rw-r--r-- | src/librustc/lint/context.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/librustc/lint/context.rs b/src/librustc/lint/context.rs index d7ac096b407..db22000fd9f 100644 --- a/src/librustc/lint/context.rs +++ b/src/librustc/lint/context.rs @@ -47,7 +47,7 @@ use rustc_front::hir; use rustc_front::util; use rustc_front::intravisit as hir_visit; use syntax::visit as ast_visit; -use syntax::diagnostic; +use syntax::errors; /// Information about the registered lints. /// @@ -167,7 +167,7 @@ impl LintStore { match (sess, from_plugin) { // We load builtin lints first, so a duplicate is a compiler bug. // Use early_error when handling -W help with no crate. - (None, _) => early_error(diagnostic::Auto, &msg[..]), + (None, _) => early_error(errors::ColorConfig::Auto, &msg[..]), (Some(sess), false) => sess.bug(&msg[..]), // A duplicate name from a plugin is a user error. @@ -191,7 +191,7 @@ impl LintStore { match (sess, from_plugin) { // We load builtin lints first, so a duplicate is a compiler bug. // Use early_error when handling -W help with no crate. - (None, _) => early_error(diagnostic::Auto, &msg[..]), + (None, _) => early_error(errors::ColorConfig::Auto, &msg[..]), (Some(sess), false) => sess.bug(&msg[..]), // A duplicate name from a plugin is a user error. |