Auto merge of #21647 - alfie:suffix-medium, r=alexcrichton

diff --cc src/liballoc/boxed_test.rs
Simple merge

diff --cc src/librustc/metadata/encoder.rs
Simple merge

diff --cc src/librustc/middle/astencode.rs
Simple merge

diff --cc src/librustc/middle/mem_categorization.rs
Simple merge

diff --cc src/librustc/middle/ty.rs
Simple merge

diff --cc src/librustc/util/ppaux.rs
Simple merge

diff --cc src/librustc_trans/trans/base.rs
Simple merge