FromStr moved to std::str
Update for ast changes