diff --git a/cranelift/bforest/src/lib.rs b/cranelift/bforest/src/lib.rs index bc79ffc7d0..dc44eabc39 100644 --- a/cranelift/bforest/src/lib.rs +++ b/cranelift/bforest/src/lib.rs @@ -23,8 +23,7 @@ clippy::float_arithmetic, clippy::mut_mut, clippy::nonminimal_bool, - clippy::option_map_unwrap_or, - clippy::option_map_unwrap_or_else, + clippy::map_unwrap_or, clippy::print_stdout, clippy::unicode_not_nfc, clippy::use_self diff --git a/cranelift/codegen/shared/src/lib.rs b/cranelift/codegen/shared/src/lib.rs index 4a0cf24873..9b4cb941ed 100644 --- a/cranelift/codegen/shared/src/lib.rs +++ b/cranelift/codegen/shared/src/lib.rs @@ -12,8 +12,7 @@ clippy::float_arithmetic, clippy::mut_mut, clippy::nonminimal_bool, - clippy::option_map_unwrap_or, - clippy::option_map_unwrap_or_else, + clippy::map_unwrap_or, clippy::print_stdout, clippy::unicode_not_nfc, clippy::use_self diff --git a/cranelift/codegen/src/lib.rs b/cranelift/codegen/src/lib.rs index 1c5fd6c18b..e3be3e0aaf 100644 --- a/cranelift/codegen/src/lib.rs +++ b/cranelift/codegen/src/lib.rs @@ -31,8 +31,7 @@ clippy::float_arithmetic, clippy::mut_mut, clippy::nonminimal_bool, - clippy::option_map_unwrap_or, - clippy::option_map_unwrap_or_else, + clippy::map_unwrap_or, clippy::unicode_not_nfc, clippy::use_self ) diff --git a/cranelift/entity/src/lib.rs b/cranelift/entity/src/lib.rs index 241c03c7ed..3baba3a1d5 100644 --- a/cranelift/entity/src/lib.rs +++ b/cranelift/entity/src/lib.rs @@ -39,9 +39,8 @@ clippy::float_arithmetic, clippy::mut_mut, clippy::nonminimal_bool, - clippy::option_map_unwrap_or, - clippy::option_map_unwrap_or_else, - clippy::print_stdout, + clippy::map_unwrap_or, + clippy::clippy::print_stdout, clippy::unicode_not_nfc, clippy::use_self ) diff --git a/cranelift/filetests/src/lib.rs b/cranelift/filetests/src/lib.rs index affd21e3c4..fbf5340bdf 100644 --- a/cranelift/filetests/src/lib.rs +++ b/cranelift/filetests/src/lib.rs @@ -16,9 +16,8 @@ warn( clippy::mut_mut, clippy::nonminimal_bool, - clippy::option_map_unwrap_or, - clippy::option_map_unwrap_or_else, - clippy::unicode_not_nfc, + clippy::map_unwrap_or, + clippy::clippy::unicode_not_nfc, clippy::use_self ) )] diff --git a/cranelift/frontend/src/lib.rs b/cranelift/frontend/src/lib.rs index d28cb53cdf..40bd27bfbc 100644 --- a/cranelift/frontend/src/lib.rs +++ b/cranelift/frontend/src/lib.rs @@ -172,9 +172,8 @@ clippy::float_arithmetic, clippy::mut_mut, clippy::nonminimal_bool, - clippy::option_map_unwrap_or, - clippy::option_map_unwrap_or_else, - clippy::print_stdout, + clippy::map_unwrap_or, + clippy::clippy::print_stdout, clippy::unicode_not_nfc, clippy::use_self ) diff --git a/cranelift/module/src/lib.rs b/cranelift/module/src/lib.rs index dc16198d5e..cc927fed7f 100644 --- a/cranelift/module/src/lib.rs +++ b/cranelift/module/src/lib.rs @@ -11,9 +11,8 @@ clippy::float_arithmetic, clippy::mut_mut, clippy::nonminimal_bool, - clippy::option_map_unwrap_or, - clippy::option_map_unwrap_or_else, - clippy::print_stdout, + clippy::map_unwrap_or, + clippy::clippy::print_stdout, clippy::unicode_not_nfc, clippy::use_self ) diff --git a/cranelift/native/src/lib.rs b/cranelift/native/src/lib.rs index 903fbb3522..668a1934bf 100644 --- a/cranelift/native/src/lib.rs +++ b/cranelift/native/src/lib.rs @@ -16,9 +16,8 @@ clippy::float_arithmetic, clippy::mut_mut, clippy::nonminimal_bool, - clippy::option_map_unwrap_or, - clippy::option_map_unwrap_or_else, - clippy::print_stdout, + clippy::map_unwrap_or, + clippy::clippy::print_stdout, clippy::unicode_not_nfc, clippy::use_self ) diff --git a/cranelift/object/src/lib.rs b/cranelift/object/src/lib.rs index 1b9b677e89..9e1dbf11bc 100644 --- a/cranelift/object/src/lib.rs +++ b/cranelift/object/src/lib.rs @@ -17,9 +17,8 @@ clippy::float_arithmetic, clippy::mut_mut, clippy::nonminimal_bool, - clippy::option_map_unwrap_or, - clippy::option_map_unwrap_or_else, - clippy::print_stdout, + clippy::map_unwrap_or, + clippy::clippy::print_stdout, clippy::unicode_not_nfc, clippy::use_self ) diff --git a/cranelift/preopt/src/lib.rs b/cranelift/preopt/src/lib.rs index 027460bc59..bb24d75254 100644 --- a/cranelift/preopt/src/lib.rs +++ b/cranelift/preopt/src/lib.rs @@ -11,9 +11,8 @@ clippy::float_arithmetic, clippy::mut_mut, clippy::nonminimal_bool, - clippy::option_map_unwrap_or, - clippy::option_map_unwrap_or_else, - clippy::print_stdout, + clippy::map_unwrap_or, + clippy::clippy::print_stdout, clippy::unicode_not_nfc, clippy::use_self ) diff --git a/cranelift/reader/src/lib.rs b/cranelift/reader/src/lib.rs index 0e3d77e1e5..4dbb0e9a8e 100644 --- a/cranelift/reader/src/lib.rs +++ b/cranelift/reader/src/lib.rs @@ -18,9 +18,8 @@ clippy::float_arithmetic, clippy::mut_mut, clippy::nonminimal_bool, - clippy::option_map_unwrap_or, - clippy::option_map_unwrap_or_else, - clippy::print_stdout, + clippy::map_unwrap_or, + clippy::clippy::print_stdout, clippy::unicode_not_nfc, clippy::use_self ) diff --git a/cranelift/serde/src/clif-json.rs b/cranelift/serde/src/clif-json.rs index 34f97cc971..2dedf7dbdc 100644 --- a/cranelift/serde/src/clif-json.rs +++ b/cranelift/serde/src/clif-json.rs @@ -15,9 +15,8 @@ clippy::float_arithmetic, clippy::mut_mut, clippy::nonminimal_bool, - clippy::option_map_unwrap_or, - clippy::option_map_unwrap_or_else, - clippy::unicode_not_nfc, + clippy::map_unwrap_or, + clippy::clippy::unicode_not_nfc, clippy::use_self ) )] diff --git a/cranelift/simplejit/src/lib.rs b/cranelift/simplejit/src/lib.rs index 682dcaecb6..cb933bae51 100644 --- a/cranelift/simplejit/src/lib.rs +++ b/cranelift/simplejit/src/lib.rs @@ -15,9 +15,8 @@ clippy::float_arithmetic, clippy::mut_mut, clippy::nonminimal_bool, - clippy::option_map_unwrap_or, - clippy::option_map_unwrap_or_else, - clippy::print_stdout, + clippy::map_unwrap_or, + clippy::clippy::print_stdout, clippy::unicode_not_nfc, clippy::use_self ) diff --git a/cranelift/src/clif-util.rs b/cranelift/src/clif-util.rs index 7904ffeb43..481401614c 100644 --- a/cranelift/src/clif-util.rs +++ b/cranelift/src/clif-util.rs @@ -6,9 +6,8 @@ clippy::float_arithmetic, clippy::mut_mut, clippy::nonminimal_bool, - clippy::option_map_unwrap_or, - clippy::option_map_unwrap_or_else, - clippy::unicode_not_nfc, + clippy::map_unwrap_or, + clippy::clippy::unicode_not_nfc, clippy::use_self ) )] diff --git a/cranelift/umbrella/src/lib.rs b/cranelift/umbrella/src/lib.rs index 46582c9555..afb9f8ae0e 100644 --- a/cranelift/umbrella/src/lib.rs +++ b/cranelift/umbrella/src/lib.rs @@ -15,9 +15,8 @@ clippy::float_arithmetic, clippy::mut_mut, clippy::nonminimal_bool, - clippy::option_map_unwrap_or, - clippy::option_map_unwrap_or_else, - clippy::print_stdout, + clippy::map_unwrap_or, + clippy::clippy::print_stdout, clippy::unicode_not_nfc, clippy::use_self ) diff --git a/cranelift/wasm/src/lib.rs b/cranelift/wasm/src/lib.rs index 748ccc211c..3e6d4401a1 100644 --- a/cranelift/wasm/src/lib.rs +++ b/cranelift/wasm/src/lib.rs @@ -20,9 +20,8 @@ clippy::float_arithmetic, clippy::mut_mut, clippy::nonminimal_bool, - clippy::option_map_unwrap_or, - clippy::option_map_unwrap_or_else, - clippy::print_stdout, + clippy::map_unwrap_or, + clippy::clippy::print_stdout, clippy::unicode_not_nfc, clippy::use_self ) diff --git a/crates/environ/src/lib.rs b/crates/environ/src/lib.rs index bbf521d28d..f21c48c2fb 100644 --- a/crates/environ/src/lib.rs +++ b/crates/environ/src/lib.rs @@ -16,9 +16,8 @@ clippy::float_arithmetic, clippy::mut_mut, clippy::nonminimal_bool, - clippy::option_map_unwrap_or, - clippy::option_map_unwrap_or_else, - clippy::print_stdout, + clippy::map_unwrap_or, + clippy::clippy::print_stdout, clippy::unicode_not_nfc, clippy::use_self ) diff --git a/crates/jit/src/lib.rs b/crates/jit/src/lib.rs index faa3e8150c..12afa41849 100644 --- a/crates/jit/src/lib.rs +++ b/crates/jit/src/lib.rs @@ -13,9 +13,8 @@ clippy::float_arithmetic, clippy::mut_mut, clippy::nonminimal_bool, - clippy::option_map_unwrap_or, - clippy::option_map_unwrap_or_else, - clippy::print_stdout, + clippy::map_unwrap_or, + clippy::clippy::print_stdout, clippy::unicode_not_nfc, clippy::use_self ) diff --git a/crates/obj/src/lib.rs b/crates/obj/src/lib.rs index 5db5bb071d..6f006f9ac9 100644 --- a/crates/obj/src/lib.rs +++ b/crates/obj/src/lib.rs @@ -15,9 +15,8 @@ clippy::float_arithmetic, clippy::mut_mut, clippy::nonminimal_bool, - clippy::option_map_unwrap_or, - clippy::option_map_unwrap_or_else, - clippy::print_stdout, + clippy::map_unwrap_or, + clippy::clippy::print_stdout, clippy::unicode_not_nfc, clippy::use_self ) diff --git a/crates/runtime/src/lib.rs b/crates/runtime/src/lib.rs index fab65ae7c4..62ec822370 100644 --- a/crates/runtime/src/lib.rs +++ b/crates/runtime/src/lib.rs @@ -13,9 +13,8 @@ clippy::float_arithmetic, clippy::mut_mut, clippy::nonminimal_bool, - clippy::option_map_unwrap_or, - clippy::option_map_unwrap_or_else, - clippy::print_stdout, + clippy::map_unwrap_or, + clippy::clippy::print_stdout, clippy::unicode_not_nfc, clippy::use_self ) diff --git a/crates/wasi-common/src/lib.rs b/crates/wasi-common/src/lib.rs index 058f02d7a3..3034aca346 100644 --- a/crates/wasi-common/src/lib.rs +++ b/crates/wasi-common/src/lib.rs @@ -14,9 +14,8 @@ clippy::float_arithmetic, clippy::mut_mut, clippy::nonminimal_bool, - clippy::option_map_unwrap_or, - clippy::option_map_unwrap_or_else, - clippy::unicode_not_nfc, + clippy::map_unwrap_or, + clippy::clippy::unicode_not_nfc, clippy::use_self ) )] diff --git a/crates/wasi-common/winx/src/lib.rs b/crates/wasi-common/winx/src/lib.rs index 4df1e5bbe9..6130f28ff6 100644 --- a/crates/wasi-common/winx/src/lib.rs +++ b/crates/wasi-common/winx/src/lib.rs @@ -13,9 +13,8 @@ clippy::float_arithmetic, clippy::mut_mut, clippy::nonminimal_bool, - clippy::option_map_unwrap_or, - clippy::option_map_unwrap_or_else, - clippy::unicode_not_nfc, + clippy::map_unwrap_or, + clippy::clippy::unicode_not_nfc, clippy::use_self ) )] diff --git a/crates/wast/src/lib.rs b/crates/wast/src/lib.rs index 1b136d9776..ca38818045 100644 --- a/crates/wast/src/lib.rs +++ b/crates/wast/src/lib.rs @@ -6,7 +6,7 @@ #![cfg_attr(feature = "clippy", plugin(clippy(conf_file = "../../clippy.toml")))] #![cfg_attr( feature = "cargo-clippy", - allow(clippy::new_without_default, clippy::new_without_default_derive) + allow(clippy::new_without_default, clippy::new_without_default) )] #![cfg_attr( feature = "cargo-clippy", @@ -14,8 +14,7 @@ clippy::float_arithmetic, clippy::mut_mut, clippy::nonminimal_bool, - clippy::option_map_unwrap_or, - clippy::option_map_unwrap_or_else, + clippy::map_unwrap_or, clippy::print_stdout, clippy::unicode_not_nfc, clippy::use_self diff --git a/src/lib.rs b/src/lib.rs index f3fe629852..b7eaaa8a09 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -17,8 +17,7 @@ clippy::float_arithmetic, clippy::mut_mut, clippy::nonminimal_bool, - clippy::option_map_unwrap_or, - clippy::option_map_unwrap_or_else, + clippy::map_unwrap_or, clippy::unicode_not_nfc, clippy::use_self )