Checkpoint after updating to rust master.  Does not build; currently exposes a rustc ICE.
Updates to build against current rustc version.

That is:
  rustc 0.12.0-pre (06727d472 2014-08-02 02:16:02 +0000)