Update to master rustc

Extending #479 to use a `'static` shell instead of a `'a` shell.