Improve the error message for missing else clauses in if expressions
auto merge of #18015 : jakub-/rust/issue-4201, r=pcwalton

Closes #4201.