diff options
| author | bors <bors@rust-lang.org> | 2018-04-14 20:22:19 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-04-14 20:22:19 +0000 |
| commit | bd40cbbe1f42bfcc18a823dd46f584127f6578f2 (patch) | |
| tree | 12564adf00fb363bfd1f09cf8d2abd1bb3cacd27 | |
| parent | 21dae950bebab7376d2bcb92299861e6cd05299d (diff) | |
| parent | 2e73e76e732310ebefa7bde145f1da4ee6110443 (diff) | |
| download | rust-bd40cbbe1f42bfcc18a823dd46f584127f6578f2.tar.gz rust-bd40cbbe1f42bfcc18a823dd46f584127f6578f2.zip | |
Auto merge of #49850 - alexcrichton:moreinline, r=sfackler
core: Inline `From<AllocErr> for CollectionAllocErr` This shows up in allocations of vectors and such, so no need for it to not be inlined!
| -rw-r--r-- | src/libcore/alloc.rs | 1 |
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 } |