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

[rust.git] / src / lib.rs

diff --git a/src/lib.rs b/src/lib.rs
index 1123c968006ab82f70d370a5aecd55747f0d23e7..a7167ac10de4f4a599c28adef05934570d96e056 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,10 +1,9 @@
 // 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;
@@ -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.