Port to latest incoming and make compile on Mac at least for "rustc --lib"