rollup merge of #23580: nikomatsakis/pattern-and-overflow

diff --cc src/libcollections/string.rs
Simple merge

diff --cc src/librustc/middle/traits/select.rs
Simple merge