Update for rustc changes
Update sorting to work with new rustc