Some constant/static updates.#867

Havvy merged 2 commits into

rust-lang:masterrust-lang/reference:masterfrom

ehuss:const-updatesehuss/reference:const-updatesCopy head branch name to clipboard