Update for rust RFC 52 changes