diff options
| author | bors <bors@rust-lang.org> | 2018-10-20 11:22:48 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-10-20 11:22:48 +0000 |
| commit | ca2639e82ec4a18d7359efbfb555ea69dd644c97 (patch) | |
| tree | 3dfa59589214b0157714150a785dd9cc4ccdc240 /src/libsyntax/source_map.rs | |
| parent | 94273f4d8e463cac45486328294bb1c2bbc10170 (diff) | |
| parent | d28aed6dc45ffccc790469cb04f3f775ddb2283a (diff) | |
| download | rust-ca2639e82ec4a18d7359efbfb555ea69dd644c97.tar.gz rust-ca2639e82ec4a18d7359efbfb555ea69dd644c97.zip | |
Auto merge of #55014 - ljedrz:lazyboye_unwraps, r=matthewjasper
Prefer unwrap_or_else to unwrap_or in case of function calls/allocations The contents of `unwrap_or` are evaluated eagerly, so it's not a good pick in case of function calls and allocations. This PR also changes a few `unwrap_or`s with `unwrap_or_default`. An added bonus is that in some cases this change also reveals if the object it's called on is an `Option` or a `Result` (based on whether the closure takes an argument).
Diffstat (limited to 'src/libsyntax/source_map.rs')
| -rw-r--r-- | src/libsyntax/source_map.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libsyntax/source_map.rs b/src/libsyntax/source_map.rs index 5054f18b020..17586a442da 100644 --- a/src/libsyntax/source_map.rs +++ b/src/libsyntax/source_map.rs @@ -937,7 +937,8 @@ impl SourceMap { } else { format!("{}<", &snippet[..offset]) }; - new_snippet.push_str(&self.span_to_snippet(span).unwrap_or("T".to_string())); + new_snippet.push_str( + &self.span_to_snippet(span).unwrap_or_else(|_| "T".to_string())); new_snippet.push('>'); return Some((sugg_span, new_snippet)); |