Fix a couple warnings

[rust.git] / src / lib.rs

diff --git a/src/lib.rs b/src/lib.rs
index 5a02b514812c894c70b635242ac2549b23da3275..9672f16eddc2829c4cf79bee425d2e131ed03563 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -2,27 +2,28 @@
 #![feature(plugin_registrar)]
 #![feature(rustc_private)]
 #![allow(unknown_lints)]
-#![feature(borrow_state)]
+#![allow(missing_docs_in_private_items)]
 
 extern crate rustc_plugin;
 use rustc_plugin::Registry;
 
 extern crate clippy_lints;
 
-pub use clippy_lints::*;
-
 #[plugin_registrar]
 pub fn plugin_registrar(reg: &mut Registry) {
-    if reg.sess.lint_store.borrow_state() == std::cell::BorrowState::Unused && reg.sess.lint_store.borrow().get_lint_groups().iter().any(|&(s, _, _)| s == "clippy") {
-        reg.sess.struct_warn("running cargo clippy on a crate that also imports the clippy plugin").emit();
-    } else {
-        register_plugins(reg);
+    if let Ok(lint_store) = reg.sess.lint_store.try_borrow() {
+        if lint_store.get_lint_groups().iter().any(|&(s, _, _)| s == "clippy") {
+            reg.sess.struct_warn("running cargo clippy on a crate that also imports the clippy plugin").emit();
+            return;
+        }
     }
+
+    clippy_lints::register_plugins(reg);
 }
 
 // only exists to let the dogfood integration test works.
 // Don't run clippy as an executable directly
-#[allow(dead_code, print_stdout)]
+#[allow(dead_code)]
 fn main() {
     panic!("Please use the cargo-clippy executable");
 }