This commit combines the move lifetime and move type suggestions so that when rustfix applies them they don't conflict with each other.