auto merge of #7361 : brson/rust/incoming, r=brson

diff --cc src/etc/vim/syntax/rust.vim
Simple merge

diff --cc src/libextra/arc.rs
Simple merge

diff --cc src/libextra/future.rs
Simple merge

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

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

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

diff --cc src/libstd/os.rs
Simple merge

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

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