Update for the changes of core::str