From c957c10678032e2992426dc69dada014f7a735c7 Mon Sep 17 00:00:00 2001 From: ConnorSkees <39542938+ConnorSkees@users.noreply.github.com> Date: Wed, 17 Jun 2020 05:49:23 -0400 Subject: [PATCH] simplify NeverEmptyVec::last, as suggested by @pickfire --- src/parse/common.rs | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/parse/common.rs b/src/parse/common.rs index dc2a1bf..d8bbaa5 100644 --- a/src/parse/common.rs +++ b/src/parse/common.rs @@ -18,17 +18,11 @@ impl NeverEmptyVec { } pub fn last(&self) -> &T { - match self.rest.last() { - Some(v) => v, - None => &self.first, - } + self.rest.last().unwrap_or(&self.first) } pub fn last_mut(&mut self) -> &mut T { - match self.rest.last_mut() { - Some(v) => v, - None => &mut self.first, - } + self.rest.last_mut().unwrap_or(&mut self.first) } pub fn push(&mut self, value: T) {