From bbd67c9b78f41ddead23fd03ea5d8d613cb96b45 Mon Sep 17 00:00:00 2001 From: Michael Wright Date: Wed, 15 Aug 2018 08:11:07 +0200 Subject: Fix #2927 --- src/driver.rs | 6 ++++-- src/lib.rs | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/driver.rs b/src/driver.rs index e9e81bb88e3..659287daed5 100644 --- a/src/driver.rs +++ b/src/driver.rs @@ -96,7 +96,9 @@ pub fn main() { .span, ); registry.args_hidden = Some(Vec::new()); - clippy_lints::register_plugins(&mut registry); + + let conf = clippy_lints::read_conf(®istry); + clippy_lints::register_plugins(&mut registry, &conf); let rustc_plugin::registry::Registry { early_lint_passes, @@ -118,7 +120,7 @@ pub fn main() { for (name, to) in lint_groups { ls.register_group(Some(sess), true, name, to); } - clippy_lints::register_pre_expansion_lints(sess, &mut ls); + clippy_lints::register_pre_expansion_lints(sess, &mut ls, &conf); sess.plugin_llvm_passes.borrow_mut().extend(llvm_passes); sess.plugin_attributes.borrow_mut().extend(attributes); diff --git a/src/lib.rs b/src/lib.rs index 1123c968006..c2363fef907 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -25,7 +25,8 @@ pub fn plugin_registrar(reg: &mut Registry<'_>) { } }); - clippy_lints::register_plugins(reg); + let conf = clippy_lints::read_conf(reg); + clippy_lints::register_plugins(reg, &conf); } // only exists to let the dogfood integration test works. -- cgit 1.4.1-3-g733a5