diff options
| author | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2016-10-22 01:21:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-22 01:21:58 +0200 |
| commit | 686ff0c1690d8d04602a23f5293d1be7b4991303 (patch) | |
| tree | e2f4102a44fc39374d64735ce9704610208e07f2 /src/liballoc_system | |
| parent | 88d1cbdbab8af117884c935e2b8c07081efb85c9 (diff) | |
| parent | 54e320d4bce4a397d165739fda8329a0567b35c4 (diff) | |
| download | rust-686ff0c1690d8d04602a23f5293d1be7b4991303.tar.gz rust-686ff0c1690d8d04602a23f5293d1be7b4991303.zip | |
Rollup merge of #37211 - srinivasreddy:alt, r=nrc
run rustfmt on various folders
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 } |