diff options
| author | bors <bors@rust-lang.org> | 2019-06-13 01:32:17 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-06-13 01:32:17 +0000 |
| commit | d8f50ab0ea6c529c24e575279acc72093caeb679 (patch) | |
| tree | 5d835ff63e67e12dd877cd2eefb3a84b2087283e /src/liballoc | |
| parent | 2887008e0ce0824be4e0e9562c22ea397b165c97 (diff) | |
| parent | af281d24ca6cf3e8fe74bb7629e93f144870f0f0 (diff) | |
| download | rust-d8f50ab0ea6c529c24e575279acc72093caeb679.tar.gz rust-d8f50ab0ea6c529c24e575279acc72093caeb679.zip | |
Auto merge of #61789 - Centril:rollup-hhyvopq, r=Centril
Rollup of 9 pull requests Successful merges: - #60376 (Stabilize Option::xor) - #61398 (Stabilize copy_within) - #61629 (Hygienize macros in the standard library) - #61675 (Include frame pointer for bare metal RISC-V targets) - #61750 (Fix x.py install) - #61761 (Add an alias for x86_64-sun-solaris target tuple) - #61762 (rustbuild: fix libtest_stamp) - #61763 (ci: fix ci stats upload condition) - #61776 (Fix typos in error_codes) Failed merges: r? @ghost
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/macros.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/liballoc/macros.rs b/src/liballoc/macros.rs index dd128e096f9..250c419c531 100644 --- a/src/liballoc/macros.rs +++ b/src/liballoc/macros.rs @@ -42,7 +42,7 @@ macro_rules! vec { ($($x:expr),*) => ( <[_]>::into_vec(box [$($x),*]) ); - ($($x:expr,)*) => (vec![$($x),*]) + ($($x:expr,)*) => ($crate::vec![$($x),*]) } // HACK(japaric): with cfg(test) the inherent `[T]::into_vec` method, which is |