Miscellaneous const-related fixes#147642

camelid wants to merge 2 commits intorust-lang:masterrust-lang/rust:masterfrom

camelid:misc-const-fixescamelid/rust:misc-const-fixesCopy head branch name to clipboard