Cleaned up driver.rs
Fix up mingw32 case
auto merge of #7157 : sstewartgallus/rust/master, r=brson

I did a little bit of cleanup work in driver.rs. It's not much but hey little steps.