about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-04-21 21:14:53 +0000
committerbors <bors@rust-lang.org>2018-04-21 21:14:53 +0000
commitaa7ce896f2c41550f7f6cf3dadb21bacc69cc912 (patch)
tree421b5b857e218551788d71342af7e7d7abb7cde0 /src/liballoc
parent699eb95ae3dae023cddca85facf6660b196bd0d1 (diff)
parent42b6d4653a2ad22be695760aba3514fc64c18d66 (diff)
downloadrust-aa7ce896f2c41550f7f6cf3dadb21bacc69cc912.tar.gz
rust-aa7ce896f2c41550f7f6cf3dadb21bacc69cc912.zip
Auto merge of #50121 - pnkfelix:revert-stabilization-of-never-type-et-al, r=alexcrichton
Revert stabilization of never_type (!) et al

Fix #49691

I *think* this correctly adopts @nikomatsakis 's desired fix of:
 * reverting stabilization of `!` and `TryFrom`, and
 * returning to the previous fallback semantics (i.e. it is once again dependent on whether the crate has opted into `#[feature(never_type)]`,
 * **without** attempting to put back in the previous future-proofing warnings regarding the change in fallback semantics.

(I'll be away from computers for a week starting now, so any updates to this PR should be either pushed into it, or someone else should adopt the task of polishing this fix and put up their own PR.)
Diffstat (limited to 'src/liballoc')
0 files changed, 0 insertions, 0 deletions