Add match arm scopes and other scope fixes#60174

bors merged 11 commits into

rust-lang:masterrust-lang/rust:masterfrom

matthewjasper:add-match-arm-scopesmatthewjasper/rust:add-match-arm-scopesCopy head branch name to clipboard