Auto merge of #4531 - lukaslueg:springclean, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 26 Sep 2017 14:19:46 +0000 (14:19 +0000)
committerbors <bors@rust-lang.org>
Tue, 26 Sep 2017 14:19:46 +0000 (14:19 +0000)
Cleaning lints

More fixes and cleanups. There will be at least two more commits to come.


Trivial merge