Follow the latest changes

See also:
- mozilla/rust#12791
- mozilla/rust#12756
- mozilla/rust#12896