about summary refs log tree commit diff
path: root/src/libcore/alloc.rs
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2018-04-10 11:25:23 -0700
committerAlex Crichton <alex@alexcrichton.com>2018-04-13 07:00:03 -0700
commit2e73e76e732310ebefa7bde145f1da4ee6110443 (patch)
treecdfdd5ac8e259b5207560fc31e161fba3dc437f5 /src/libcore/alloc.rs
parent99d4886ead646da864cff7963f540a44acd4af05 (diff)
downloadrust-2e73e76e732310ebefa7bde145f1da4ee6110443.tar.gz
rust-2e73e76e732310ebefa7bde145f1da4ee6110443.zip
core: Inline `From<AllocErr> for CollectionAllocErr`
This shows up in allocations of vectors and such, so no need for it to not be
inlined!
Diffstat (limited to 'src/libcore/alloc.rs')
-rw-r--r--src/libcore/alloc.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libcore/alloc.rs b/src/libcore/alloc.rs
index 8f8849e32e6..22c67436378 100644
--- a/src/libcore/alloc.rs
+++ b/src/libcore/alloc.rs
@@ -380,6 +380,7 @@ pub enum CollectionAllocErr {
 
 #[unstable(feature = "try_reserve", reason = "new API", issue="48043")]
 impl From<AllocErr> for CollectionAllocErr {
+    #[inline]
     fn from(AllocErr: AllocErr) -> Self {
         CollectionAllocErr::AllocErr
     }