auto merge of #9481 : jbclements/rust/minor-cleanup, r=cmr

Small stuff... might as well get it into the tree. One new test case, some issue # cleanup, remove some unused imports.

diff --cc src/libsyntax/parse/lexer.rs
Simple merge

diff --cc src/libsyntax/parse/parser.rs
Simple merge