auto merge of #5483 : pcwalton/rust/static-syntax, r=graydon

r? @nikomatsakis

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

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

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