Unbreak 'rustc --help'
auto merge of #5609 : Kimundi/rust/incoming, r=catamorphism