Merge pull request #2681 from phansch/fix_latest_nightly_breakage

oli-obk · web-flow · commit 475959d90596 · 2018-04-19T08:28:10.000+02:00
Fix latest nightly breakage
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);
 }

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ extern crate clippy_lints;`
`12`	`12`
`13`	`13`	`#[plugin_registrar]`
`14`	`14`	`pub fn plugin_registrar(reg: &mut Registry) {`
`15`		`- if let Ok(lint_store) = reg.sess.lint_store.try_borrow() {`
	`15`	`+ reg.sess.lint_store.with_read_lock(\|lint_store\| {`
`16`	`16`	`for (lint, _, _) in lint_store.get_lint_groups() {`
`17`	`17`	`if lint == "clippy" {`
`18`	`18`	`reg.sess`
`@@ -21,7 +21,7 @@ pub fn plugin_registrar(reg: &mut Registry) {`
`21`	`21`	`return;`
`22`	`22`	`}`
`23`	`23`	`}`
`24`		`- }`
	`24`	`+ });`
`25`	`25`
`26`	`26`	`clippy_lints::register_plugins(reg);`
`27`	`27`	`}`