Merge pull request #2681 from phansch/fix_latest_nightly_breakage

Fix latest nightly breakage
rust-lang · Apr 19, 2018 · 475959d · 475959d
2 parents f84cc2c + a854874
commit 475959d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -12,7 +12,7 @@ extern crate clippy_lints;
 
 #[plugin_registrar]
 pub fn plugin_registrar(reg: &mut Registry) {
-    if let Ok(lint_store) = reg.sess.lint_store.try_borrow() {
+    reg.sess.lint_store.with_read_lock(|lint_store| {
         for (lint, _, _) in lint_store.get_lint_groups() {
             if lint == "clippy" {
                 reg.sess
@@ -21,7 +21,7 @@ pub fn plugin_registrar(reg: &mut Registry) {
                 return;
             }
         }
-    }
+    });
 
     clippy_lints::register_plugins(reg);
 }