Auto merge of #49850 - alexcrichton:moreinline, r=sfackler

bors · bors · commit bd40cbbe1f42 · 2018-04-14T20:22:19.000Z
core: Inline `From&lt;AllocErr&gt; for CollectionAllocErr`

This shows up in allocations of vectors and such, so no need for it to not be
inlined!
diff --git 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
     }

Original file line number	Diff line number	Diff line change
`@@ -380,6 +380,7 @@ pub enum CollectionAllocErr {`
`380`	`380`
`381`	`381`	`#[unstable(feature = "try_reserve", reason = "new API", issue="48043")]`
`382`	`382`	`impl From<AllocErr> for CollectionAllocErr {`
	`383`	`+ #[inline]`
`383`	`384`	`fn from(AllocErr: AllocErr) -> Self {`
`384`	`385`	`CollectionAllocErr::AllocErr`
`385`	`386`	`}`