From 698f8c2f01ea549d77d7dc3338a12e04c11057b9 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 14:02:58 +0200 Subject: Adding upstream version 1.64.0+dfsg1. Signed-off-by: Daniel Baumann --- src/tools/clippy/tests/ui/option_map_or_none.fixed | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 src/tools/clippy/tests/ui/option_map_or_none.fixed (limited to 'src/tools/clippy/tests/ui/option_map_or_none.fixed') diff --git a/src/tools/clippy/tests/ui/option_map_or_none.fixed b/src/tools/clippy/tests/ui/option_map_or_none.fixed new file mode 100644 index 000000000..04bfac773 --- /dev/null +++ b/src/tools/clippy/tests/ui/option_map_or_none.fixed @@ -0,0 +1,26 @@ +// run-rustfix + +#![allow(clippy::bind_instead_of_map)] + +fn main() { + let opt = Some(1); + let r: Result = Ok(1); + let bar = |_| Some(1); + + // Check `OPTION_MAP_OR_NONE`. + // Single line case. + let _: Option = opt.map(|x| x + 1); + // Multi-line case. + #[rustfmt::skip] + let _: Option = opt.map(|x| x + 1); + // function returning `Option` + let _: Option = opt.and_then(bar); + let _: Option = opt.and_then(|x| { + let offset = 0; + let height = x; + Some(offset + height) + }); + + // Check `RESULT_MAP_OR_INTO_OPTION`. + let _: Option = r.ok(); +} -- cgit v1.2.3