diff --git a/src/core/collection/musicbrainz.rs b/src/core/collection/musicbrainz.rs index d6c4d02..575778a 100644 --- a/src/core/collection/musicbrainz.rs +++ b/src/core/collection/musicbrainz.rs @@ -47,13 +47,9 @@ pub enum MbRefOption { impl MbRefOption { pub fn or(self, optb: MbRefOption) -> MbRefOption { - match self { - opta @ MbRefOption::Some(_) => opta, - opta @ MbRefOption::CannotHaveMbid => match optb { - MbRefOption::Some(_) => optb, - MbRefOption::CannotHaveMbid | MbRefOption::None => opta, - }, - MbRefOption::None => optb, + match (&self, &optb) { + (MbRefOption::Some(_), _) | (MbRefOption::CannotHaveMbid, MbRefOption::None) => self, + _ => optb, } }