auto merge of #4854 : thestinger/rust/oldmap, r=catamorphism

diff --cc src/libcargo/cargo.rc
Simple merge

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

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

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

diff --cc src/librustc/middle/typeck/coherence.rs
Simple merge

diff --cc src/libsyntax/parse/token.rs
Simple merge