wojtek/musichoard
1
0
Fork 0
Code Issues 12 Pull Requests Actions Packages Projects 1 Releases 2 Wiki Activity

Simplify merge_opts

Browse Source
This commit is contained in:
Wojciech Kozlowski 2023-05-21 22:28:09 +02:00
parent 4eefbd93ad
commit 2e8f88b7a1
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib.rs
View File

@ -335,11 +335,9 @@ trait Merge {
fn merge(self, other: Self) -> Self; fn merge(self, other: Self) -> Self;
fn merge_opts<T>(this: Option<T>, other: Option<T>) -> Option<T> { fn merge_opts<T>(this: Option<T>, other: Option<T>) -> Option<T> {
match (this, other) { match &this {
(Some(t), Some(_)) => Some(t), Some(_) => this,
(Some(t), None) => Some(t), None => other,
(None, Some(o)) => Some(o),
(None, None) => None,
} }
} }