Minor fixes for code style consistency
undo inline for better readability
auto merge of #200 : thiagopnts/cargo/master, r=alexcrichton

As I've been looking around cargo's source I ended up making some changes to keep the code style more consistent.