Auto merge of #5280 - klausi:clippy-191-trvials, r=matklad
authorbors <bors@rust-lang.org>
Thu, 5 Apr 2018 09:22:15 +0000 (09:22 +0000)
committerbors <bors@rust-lang.org>
Thu, 5 Apr 2018 09:22:15 +0000 (09:22 +0000)
chore(clippy): Simplify minor stuff found by clippy

Executed clippy 0.0.191, fixed the trivial stuff.
Filed https://github.com/rust-lang-nursery/rust-clippy/issues/2615 for all the format_err!() false positives.

1  2 
src/cargo/core/resolver/mod.rs

Simple merge