Drop newly uplifted clippy::option_env_unwrap

src/tools/clippy/clippy_lints/src/declared_lints.rs

@@ -495,7 +495,6 @@ pub(crate) static LINTS: &[&crate::LintInfo] = &[
     crate::operators::PTR_EQ_INFO,
     crate::operators::SELF_ASSIGNMENT_INFO,
     crate::operators::VERBOSE_BIT_MASK_INFO,
-    crate::option_env_unwrap::OPTION_ENV_UNWRAP_INFO,
     crate::option_if_let_else::OPTION_IF_LET_ELSE_INFO,
     crate::overflow_check_conditional::OVERFLOW_CHECK_CONDITIONAL_INFO,
     crate::panic_in_result_fn::PANIC_IN_RESULT_FN_INFO,

src/tools/clippy/clippy_lints/src/lib.rs

@@ -237,7 +237,6 @@ mod nonstandard_macro_braces;
 mod octal_escapes;
 mod only_used_in_recursion;
 mod operators;
-mod option_env_unwrap;
 mod option_if_let_else;
 mod overflow_check_conditional;
 mod panic_in_result_fn;
@@ -811,7 +810,6 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
             max_fn_params_bools,
         ))
     });
-    store.register_early_pass(|| Box::new(option_env_unwrap::OptionEnvUnwrap));
     let warn_on_all_wildcard_imports = conf.warn_on_all_wildcard_imports;
     store.register_late_pass(move |_| Box::new(wildcard_imports::WildcardImports::new(warn_on_all_wildcard_imports)));
     store.register_late_pass(|_| Box::<redundant_pub_crate::RedundantPubCrate>::default());

src/tools/clippy/clippy_lints/src/renamed_lints.rs

@@ -49,4 +49,5 @@ pub static RENAMED_LINTS: &[(&str, &str)] = &[
     ("clippy::temporary_cstring_as_ptr", "temporary_cstring_as_ptr"),
     ("clippy::unknown_clippy_lints", "unknown_lints"),
     ("clippy::unused_label", "unused_labels"),
+    ("clippy::option_env_unwrap", "incorrect_option_env_unwraps"),
 ];

src/tools/clippy/tests/ui/rename.fixed

@@ -45,6 +45,7 @@
 #![allow(temporary_cstring_as_ptr)]
 #![allow(unknown_lints)]
 #![allow(unused_labels)]
+#![allow(option_env_unwrap)]
 #![warn(clippy::almost_complete_range)]
 #![warn(clippy::disallowed_names)]
 #![warn(clippy::blocks_in_if_conditions)]
@@ -92,5 +93,6 @@
 #![warn(temporary_cstring_as_ptr)]
 #![warn(unknown_lints)]
 #![warn(unused_labels)]
+#![warn(incorrect_option_env_unwraps)]
 
 fn main() {}

src/tools/clippy/tests/ui/rename.rs

@@ -45,6 +45,7 @@
 #![allow(temporary_cstring_as_ptr)]
 #![allow(unknown_lints)]
 #![allow(unused_labels)]
+#![allow(option_env_unwrap)]
 #![warn(clippy::almost_complete_letter_range)]
 #![warn(clippy::blacklisted_name)]
 #![warn(clippy::block_in_if_condition_expr)]
@@ -92,5 +93,6 @@
 #![warn(clippy::temporary_cstring_as_ptr)]
 #![warn(clippy::unknown_clippy_lints)]
 #![warn(clippy::unused_label)]
+#![warn(clippy::incorrect_option_env_unwraps)]
 
 fn main() {}