From 300282c09aa8e922699b4fc7e2c608b4f8d81719 Mon Sep 17 00:00:00 2001 From: togami2864 Date: Tue, 16 Nov 2021 02:53:35 +0900 Subject: [PATCH] fix fmt --- clippy_lints/src/methods/option_map_or_none.rs | 3 ++- tests/ui/option_map_or_none.fixed | 10 ++++------ tests/ui/option_map_or_none.rs | 10 ++++------ tests/ui/option_map_or_none.stderr | 12 ++++++------ 4 files changed, 16 insertions(+), 19 deletions(-) diff --git a/clippy_lints/src/methods/option_map_or_none.rs b/clippy_lints/src/methods/option_map_or_none.rs index ac2a5b70004..3a93d912e8c 100644 --- a/clippy_lints/src/methods/option_map_or_none.rs +++ b/clippy_lints/src/methods/option_map_or_none.rs @@ -11,7 +11,8 @@ use rustc_span::symbol::sym; use super::OPTION_MAP_OR_NONE; use super::RESULT_MAP_OR_INTO_OPTION; -/// The expression inside a closure may or may not have surrounding braces +// The expression inside a closure may or may not have surrounding braces +// which causes problems when generating a suggestion. fn reduce_unit_expression<'a>( cx: &LateContext<'_>, expr: &'a hir::Expr<'_>, diff --git a/tests/ui/option_map_or_none.fixed b/tests/ui/option_map_or_none.fixed index 9333cb89c9a..abaf88be8ca 100644 --- a/tests/ui/option_map_or_none.fixed +++ b/tests/ui/option_map_or_none.fixed @@ -4,16 +4,14 @@ fn main() { let opt = Some(1); - let bar = |_| { - Some(1) - }; + let bar = |_| Some(1); // Check `OPTION_MAP_OR_NONE`. // Single line case. - let _ :Option = opt.map(|x| x + 1); + let _: Option = opt.map(|x| x + 1); // Multi-line case. #[rustfmt::skip] - let _ :Option = opt.map(|x| x + 1); + let _: Option = opt.map(|x| x + 1); // function returning `Option` - let _ :Option = opt.and_then(bar); + let _: Option = opt.and_then(bar); } diff --git a/tests/ui/option_map_or_none.rs b/tests/ui/option_map_or_none.rs index 789531b7215..a63b63c4dc0 100644 --- a/tests/ui/option_map_or_none.rs +++ b/tests/ui/option_map_or_none.rs @@ -4,18 +4,16 @@ fn main() { let opt = Some(1); - let bar = |_| { - Some(1) - }; + let bar = |_| Some(1); // Check `OPTION_MAP_OR_NONE`. // Single line case. - let _ :Option = opt.map_or(None, |x| Some(x + 1)); + let _: Option = opt.map_or(None, |x| Some(x + 1)); // Multi-line case. #[rustfmt::skip] - let _ :Option = opt.map_or(None, |x| { + let _: Option = opt.map_or(None, |x| { Some(x + 1) }); // function returning `Option` - let _ :Option = opt.map_or(None, bar); + let _: Option = opt.map_or(None, bar); } diff --git a/tests/ui/option_map_or_none.stderr b/tests/ui/option_map_or_none.stderr index 560b767fba2..aec46cb005f 100644 --- a/tests/ui/option_map_or_none.stderr +++ b/tests/ui/option_map_or_none.stderr @@ -1,24 +1,24 @@ error: called `map_or(None, ..)` on an `Option` value. This can be done more directly by calling `map(..)` instead - --> $DIR/option_map_or_none.rs:13:26 + --> $DIR/option_map_or_none.rs:11:26 | -LL | let _ :Option = opt.map_or(None, |x| Some(x + 1)); +LL | let _: Option = opt.map_or(None, |x| Some(x + 1)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try using `map` instead: `opt.map(|x| x + 1)` | = note: `-D clippy::option-map-or-none` implied by `-D warnings` error: called `map_or(None, ..)` on an `Option` value. This can be done more directly by calling `map(..)` instead - --> $DIR/option_map_or_none.rs:16:26 + --> $DIR/option_map_or_none.rs:14:26 | -LL | let _ :Option = opt.map_or(None, |x| { +LL | let _: Option = opt.map_or(None, |x| { | __________________________^ LL | | Some(x + 1) LL | | }); | |_________________________^ help: try using `map` instead: `opt.map(|x| x + 1)` error: called `map_or(None, ..)` on an `Option` value. This can be done more directly by calling `and_then(..)` instead - --> $DIR/option_map_or_none.rs:20:26 + --> $DIR/option_map_or_none.rs:18:26 | -LL | let _ :Option = opt.map_or(None, bar); +LL | let _: Option = opt.map_or(None, bar); | ^^^^^^^^^^^^^^^^^^^^^ help: try using `and_then` instead: `opt.and_then(bar)` error: aborting due to 3 previous errors