remove borrowck workarounds from the containers
minor automatic whitespace fixes
auto merge of #6292 : thestinger/rust/cleanup, r=brson