Fix a bug in Result::unwrap_err (and minor cleanup)#4243

catamorphism merged 2 commits intorust-lang:incomingrust-lang/rust:incomingfrom

erickt:incomingerickt/rust:incomingCopy head branch name to clipboard