Use opt.take() instead of mem::replace(opt, None)#55472