diff options
| author | bors <bors@rust-lang.org> | 2016-10-21 20:29:25 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-21 20:29:25 -0700 |
| commit | f136e9e2995c7682ab0c89a93cc197a246eaea81 (patch) | |
| tree | 061aaed5771f060ee9c6dd415b17a9228adcec7b /src/liballoc_system | |
| parent | a6fa57291b2a4e94da00cb078fb7f9f3366bc9cb (diff) | |
| parent | 1c2d2235c976a14c4e17e9d258e3e0a500078409 (diff) | |
| download | rust-f136e9e2995c7682ab0c89a93cc197a246eaea81.tar.gz rust-f136e9e2995c7682ab0c89a93cc197a246eaea81.zip | |
Auto merge of #37337 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 10 pull requests - Successful merges: #37043, #37209, #37211, #37219, #37244, #37253, #37286, #37297, #37309, #37314 - Failed merges:
Diffstat (limited to 'src/liballoc_system')
| -rw-r--r-- | src/liballoc_system/lib.rs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/liballoc_system/lib.rs b/src/liballoc_system/lib.rs index dacafe771ed..b380ba180f4 100644 --- a/src/liballoc_system/lib.rs +++ b/src/liballoc_system/lib.rs @@ -221,11 +221,7 @@ mod imp { HEAP_REALLOC_IN_PLACE_ONLY, ptr as LPVOID, size as SIZE_T) as *mut u8; - if new.is_null() { - old_size - } else { - size - } + if new.is_null() { old_size } else { size } } else { old_size } |