Fix mistake cherry-pick on std.algorithm.swap

Introduced by: 84422029eb26ccea2cd97422c2e731792ae1e114