rollup merge of #20656: japaric/at-clean

diff --cc src/libcollections/btree/map.rs
Simple merge

diff --cc src/libcore/iter.rs
Simple merge

diff --cc src/libcore/ops.rs
Simple merge

diff --cc src/libcore/slice.rs
Simple merge

diff --cc src/libserialize/serialize.rs
Simple merge