librustc: De-mut some of resolve and the pretty printer. rs=demuting