Improve recovery when users write where:#143065

bors merged 3 commits into

rust-lang:masterrust-lang/rust:masterfrom

compiler-errors:enum-recoverycompiler-errors/rust:enum-recoveryCopy head branch name to clipboard