Auto merge of #3347 - ibabushkin:master, r=alexcrichton

Reordered rustc arguments.

This adresses #3276 .

Some tests I can't run locally might still fail, I'm fixing those.

The core change is rather trivial, simply reorder some existing code, and update tests to match the new results.