Test case fixes#6115

jbclements wants to merge 20 commits into

rust-lang:incomingrust-lang/rust:incomingfrom

jbclements:test-case-fixesjbclements/rust:test-case-fixesCopy head branch name to clipboard