]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #32244 - Amanieu:compare_exchange_result, r=alexcrichton
authorbors <bors@rust-lang.org>
Sat, 19 Mar 2016 19:25:34 +0000 (12:25 -0700)
committerbors <bors@rust-lang.org>
Sat, 19 Mar 2016 19:25:34 +0000 (12:25 -0700)
Change compare_exchange to return a Result<T, T>

As per the discussion in #31767

I also changed the feature name from `extended_compare_and_swap` to `compare_exchange`.

r? @alexcrichton

1  2 
src/libcore/intrinsics.rs
src/librustc_trans/trans/intrinsic.rs
src/librustc_typeck/check/intrinsic.rs

Simple merge
Simple merge