Revert "Revert "Update to rust master""

This reverts commit 332144c9d876e5df00235a72c0563b6b12473dcf.