auto merge of #10567 : sanxiyn/rust/bytepos, r=alexcrichton

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

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

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

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

diff --cc src/libsyntax/print/pprust.rs
Simple merge