Fix sample program to compile in modern rust
Merge branch 'master' of https://github.com/mozilla/rust
Remove trailing whitespace
auto merge of #4827 : mcpherrinm/rust/master, r=catamorphism

It seems to me the library needs more work to be done, but having a non-compilable sample program seems like bad news.