New upstream version 1.44.1+dfsg1

[rustc.git] / src / liballoc / macros.rs

diff --git a/src/liballoc/macros.rs b/src/liballoc/macros.rs
index 422d3486f92b29cc860cc33f4868590c7562f5e7..e163a166b498fceab4aa669f23d3069f76195629 100644 (file)
--- a/src/liballoc/macros.rs
+++ b/src/liballoc/macros.rs
@@ -36,13 +36,15 @@
 #[stable(feature = "rust1", since = "1.0.0")]
 #[allow_internal_unstable(box_syntax)]
 macro_rules! vec {
+    () => (
+        $crate::vec::Vec::new()
+    );
     ($elem:expr; $n:expr) => (
         $crate::vec::from_elem($elem, $n)
     );
-    ($($x:expr),*) => (
-        <[_]>::into_vec(box [$($x),*])
+    ($($x:expr),+ $(,)?) => (
+        <[_]>::into_vec(box [$($x),+])
     );
-    ($($x:expr,)*) => ($crate::vec![$($x),*])
 }
 
 // HACK(japaric): with cfg(test) the inherent `[T]::into_vec` method, which is
@@ -51,6 +53,9 @@ macro_rules! vec {
 // NB see the slice::hack module in slice.rs for more information
 #[cfg(test)]
 macro_rules! vec {
+    () => (
+        $crate::vec::Vec::new()
+    );
     ($elem:expr; $n:expr) => (
         $crate::vec::from_elem($elem, $n)
     );