Update to current `rustc` and `rust-sdl`.

* `rustc` `master` branch (`a6945f2`)
* `rust-sdl` `master` branch (`5c1ee3d`)
Make `if_map!` look-more idiomatic.