From 728a2418cb34e577c2013dcc14d31c6b2d3d5432 Mon Sep 17 00:00:00 2001 From: Krishna Veera Reddy Date: Mon, 16 Dec 2019 22:29:05 -0800 Subject: [PATCH] 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. --- clippy_lints/src/lib.rs | 1 - src/driver.rs | 1 - 2 files changed, 2 deletions(-) diff --git a/clippy_lints/src/lib.rs b/clippy_lints/src/lib.rs index 736ff30c81a..bae4eebf850 100644 --- 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 index fda304afcbe..4cdff783788 100644 --- 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.