Skip to content

Commit cf437a2

Browse files
author
blake2-ppc
committed
dlist: Remove extraneous unwrap in .pop_back_node()
1 parent 21adfd5 commit cf437a2

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/libextra/dlist.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,12 +185,12 @@ impl<T> DList<T> {
185185
/// Remove the last Node and return it, or None if the list is empty
186186
#[inline]
187187
fn pop_back_node(&mut self) -> Option<~Node<T>> {
188-
do self.list_tail.resolve().map_consume |tail| {
188+
do self.list_tail.resolve().map_consume_default(None) |tail| {
189189
self.length -= 1;
190190
self.list_tail = tail.prev;
191191
match tail.prev.resolve() {
192-
None => self.list_head.take_unwrap(),
193-
Some(tail_prev) => tail_prev.next.take_unwrap()
192+
None => self.list_head.take(),
193+
Some(tail_prev) => tail_prev.next.take()
194194
}
195195
}
196196
}

0 commit comments

Comments
 (0)