diff options
| author | LingMan <LingMan@users.noreply.github.com> | 2021-01-11 20:45:33 +0100 |
|---|---|---|
| committer | LingMan <LingMan@users.noreply.github.com> | 2021-01-14 19:23:59 +0100 |
| commit | a56bffb4f9d6f7791b2fa40412bd3e0549d76cc3 (patch) | |
| tree | 23875d16475aea0b37a608f0ca704a3016c1f0e4 /compiler/rustc_span/src/source_map/tests.rs | |
| parent | d03fe84169d50a4b96cdef7b2f862217ab634055 (diff) | |
| download | rust-a56bffb4f9d6f7791b2fa40412bd3e0549d76cc3.tar.gz rust-a56bffb4f9d6f7791b2fa40412bd3e0549d76cc3.zip | |
Use Option::map_or instead of `.map(..).unwrap_or(..)`
Diffstat (limited to 'compiler/rustc_span/src/source_map/tests.rs')
| -rw-r--r-- | compiler/rustc_span/src/source_map/tests.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_span/src/source_map/tests.rs b/compiler/rustc_span/src/source_map/tests.rs index b8459eee4ec..3f22829b049 100644 --- a/compiler/rustc_span/src/source_map/tests.rs +++ b/compiler/rustc_span/src/source_map/tests.rs @@ -107,7 +107,7 @@ fn t7() { fn span_from_selection(input: &str, selection: &str) -> Span { assert_eq!(input.len(), selection.len()); let left_index = selection.find('~').unwrap() as u32; - let right_index = selection.rfind('~').map(|x| x as u32).unwrap_or(left_index); + let right_index = selection.rfind('~').map_or(left_index, |x| x as u32); Span::with_root_ctxt(BytePos(left_index), BytePos(right_index + 1)) } |