about summary refs log tree commit diff
path: root/src/test/incremental/thinlto
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-06-01 14:05:57 +0000
committerbors <bors@rust-lang.org>2018-06-01 14:05:57 +0000
commitf91323129000b20a5e3590d03fb3775bf73d5082 (patch)
treec12498e4adf33d56729251c28fdf96e5ed37c913 /src/test/incremental/thinlto
parent577a5b2703d97e5408664e409f35768944360fea (diff)
parentb945be71e87f99f7578a039a541aeae6de8b6020 (diff)
downloadrust-f91323129000b20a5e3590d03fb3775bf73d5082.tar.gz
rust-f91323129000b20a5e3590d03fb3775bf73d5082.zip
Auto merge of #51264 - glandium:oom, r=alexcrichton
Make the OOM hook return `()` rather than `!`

Per discussion in https://github.com/rust-lang/rust/issues/51245#issuecomment-393651083

This allows more flexibility in what can be done with the API. This also
splits `rtabort!` into `dumb_print` happening in the default hook and
`abort_internal`, happening in the actual oom handler after calling the
hook. Registering an empty function thus makes the oom handler not print
anything but still abort.

Cc: @alexcrichton
Diffstat (limited to 'src/test/incremental/thinlto')
0 files changed, 0 insertions, 0 deletions