Update to the last rust.

Option `map` method does not give a reference to the wrapped element any more.
It should be replaced by `as_ref().map`.