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

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
rust-lang · Dec 17, 2019 · c62396d · c62396d
2 parents f627ae2 + 728a241
commit c62396d
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 2 deletions.
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.