Improve text of Option.unwrap()

Fixes #9099
auto merge of #16579 : steveklabnik/rust/gh9099, r=pcwalton

Fixes #9099