Refactored take_unwrap (libstd/option.rs)

Using pattern matching instead of is_some + unwrap
Fix a test that was missed in the liblog PR
auto merge of #12933 : edwardw/rust/fallout, r=huonw

The same test was missed in chan/port renaming PR #12815 and was fixed in #12880:

> This was missed because it is skipped on linux and windows, and the mac bots were moving at the time the PR landed.

It seems the same happened to the liblog PR.
auto merge of #12931 : aochagavia/rust/option-take_unwrap, r=cmr

Using pattern matching instead of is_some + unwrap