Auto merge of #23512 - oli-obk:result_ok_unwrap, r=alexcrichton

because then the call to `unwrap()` will not print the error object.

diff --cc src/librustc/middle/astencode.rs
Simple merge

diff --cc src/libstd/fs/mod.rs
Simple merge

diff --cc src/libstd/sys/unix/timer.rs
Simple merge