From 22eb3193a62fa01e97bf53d5f5aa74ca8ea57a67 Mon Sep 17 00:00:00 2001 From: Christopher Chambers Date: Fri, 10 Apr 2015 23:06:34 -0500 Subject: Simplifications to statement macro handling. SmallVector::pop no longer worries about converting a Many repr downward to One or Zero. expand_stmt makes use of `if let` for style purposes. --- src/libsyntax/util/small_vector.rs | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) (limited to 'src/libsyntax/util') diff --git a/src/libsyntax/util/small_vector.rs b/src/libsyntax/util/small_vector.rs index c4b096d656f..6b864d52947 100644 --- a/src/libsyntax/util/small_vector.rs +++ b/src/libsyntax/util/small_vector.rs @@ -79,29 +79,7 @@ impl SmallVector { _ => unreachable!() } } - Many(..) => { - let mut many = mem::replace(&mut self.repr, Zero); - let item = - match many { - Many(ref mut vs) if vs.len() == 1 => { - // self.repr is already Zero - vs.pop() - }, - Many(ref mut vs) if vs.len() == 2 => { - let item = vs.pop(); - mem::replace(&mut self.repr, One(vs.pop().unwrap())); - item - }, - Many(ref mut vs) if vs.len() > 2 => { - let item = vs.pop(); - let rest = mem::replace(vs, vec!()); - mem::replace(&mut self.repr, Many(rest)); - item - }, - _ => unreachable!() - }; - item - } + Many(ref mut vs) => vs.pop(), } } -- cgit 1.4.1-3-g733a5