Auto merge of #4907 - krishna-veerareddy:fix-clippy-build, r=phansch

bors · bors · commit c62396dbf442 · 2019-12-17T09:00:51.000Z
Fix clippy build failure

Clippy build fails because the feature `result_map_or` has been stabilized in v1.41.0 but we still have an explicit feature attribute for it.

changelog: none
diff --git a/clippy_lints/src/lib.rs b/clippy_lints/src/lib.rs
@@ -12,7 +12,6 @@
 #![cfg_attr(feature = "deny-warnings", deny(warnings))]
 #![feature(crate_visibility_modifier)]
 #![feature(concat_idents)]
-#![feature(result_map_or)]
 
 // FIXME: switch to something more ergonomic here, once available.
 // (Currently there is no way to opt into sysroot crates without `extern crate`.)
diff --git a/src/driver.rs b/src/driver.rs
@@ -1,5 +1,4 @@
 #![cfg_attr(feature = "deny-warnings", deny(warnings))]
-#![feature(result_map_or)]
 #![feature(rustc_private)]
 
 // FIXME: switch to something more ergonomic here, once available.

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`#![cfg_attr(feature = "deny-warnings", deny(warnings))]`
`2`		`-#![feature(result_map_or)]`
`3`	`2`	`#![feature(rustc_private)]`
`4`	`3`
`5`	`4`	`// FIXME: switch to something more ergonomic here, once available.`