Skip to content

Commit

Permalink
Auto merge of #49850 - alexcrichton:moreinline, r=sfackler
Browse files Browse the repository at this point in the history
core: Inline `From<AllocErr> for CollectionAllocErr`

This shows up in allocations of vectors and such, so no need for it to not be
inlined!
  • Loading branch information
bors committed Apr 14, 2018
2 parents 21dae95 + 2e73e76 commit bd40cbb
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions src/libcore/alloc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down

1 comment on commit bd40cbb

@sailfish009
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

before:

Finished release [optimized] target(s) in 129.28 secs
Build completed successfully in 0:42:32

after:

Assembling stage1 compiler (i686-pc-windows-gnu)
Building stage1 std artifacts (i686-pc-windows-gnu -> i686-pc-windows-gnu)
error: process didn't exit successfully: C:/msys32/work/rust/build\bootstrap/debug/rustc -vV (exit code: 3221225785)
command did not execute successfully: "C:/msys32/work/rust/build\i686-pc-windows-gnu\stage0/bin\cargo.exe" "build" "--target" "i686-pc-windows-gnu" "-j" "4" "--release" "--features" "panic-unwind jemalloc backtrace" "--manifest-path" "C:/msys32/work/rust\src/libstd/Cargo.toml" "--message-format" "json"
expected success, got: exit code: 101
thread 'main' panicked at 'cargo must succeed', bootstrap\compile.rs:1085:9
note: Run with RUST_BACKTRACE=1 for a backtrace.
failed to run: C:/msys32/work/rust/build/bootstrap/debug/bootstrap build
Build completed unsuccessfully in 0:21:27

Please sign in to comment.