auto merge of #8718 : bblum/rust/typeof, r=pcwalton

r? anybody

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

diff --cc src/libsyntax/ast.rs
Simple merge

diff --cc src/libsyntax/fold.rs
Simple merge

diff --cc src/libsyntax/oldvisit.rs
Simple merge

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

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

diff --cc src/libsyntax/visit.rs
Simple merge