Resolve some minor parsing bugs#4439

calebcartwright merged 2 commits into

rust-lang:masterrust-lang/rustfmt:masterfrom

calebcartwright:parsing-fixescalebcartwright/rustfmt:parsing-fixesCopy head branch name to clipboard