Merge pull request #3085 from mikerite/revert-98dbce

[rust.git] / src / lib.rs

diff --git a/src/lib.rs b/src/lib.rs
index 6ff15e2cd89024e7b106b62eb5113cd66bf1a79a..a7167ac10de4f4a599c28adef05934570d96e056 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,16 +1,15 @@
 // error-pattern:cargo-clippy
 #![feature(plugin_registrar)]
-#![feature(rust_2018_preview)]
 #![feature(rustc_private)]
-#![feature(macro_vis_matcher)]
+#![feature(tool_lints)]
 #![allow(unknown_lints)]
-#![allow(missing_docs_in_private_items)]
+#![allow(clippy::missing_docs_in_private_items)]
 #![warn(rust_2018_idioms)]
 
 use rustc_plugin::Registry;
 
 #[plugin_registrar]
-pub fn plugin_registrar(reg: &mut Registry) {
+pub fn plugin_registrar(reg: &mut Registry<'_>) {
     reg.sess.lint_store.with_read_lock(|lint_store| {
         for (lint, _, _) in lint_store.get_lint_groups() {
             reg.sess
@@ -25,7 +24,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.