Expand tidy to prevent binaries from being checked

Closes #9621
auto merge of #9628 : alexcrichton/rust/tidy-binaries, r=thestinger

Closes #9621
rustpkg: Make test_rustpkg_test_output more permissive

test output may contain color codes, so check for several small strings
instead of one big one.
auto merge of #9640 : catamorphism/rust/rustpkg-test-fix, r=alexcrichton

r? @alexcrichton test output may contain color codes, so check for several small strings
instead of one big one.
FlatMap, a vector map for extra