]> git.lizzy.rs Git - rust.git/commit
auto merge of #12627 : alexcrichton/rust/issue-12623, r=brson
authorbors <bors@rust-lang.org>
Sat, 1 Mar 2014 08:36:35 +0000 (00:36 -0800)
committerbors <bors@rust-lang.org>
Sat, 1 Mar 2014 08:36:35 +0000 (00:36 -0800)
commitcb498cc40d78f8a9bce42b116abb3f4dd8d03335
treeb05531e2ff19c094db02ec0893524a21af92507b
parent567201e13be53d2d0e8dc4ea769ddf7b907c1ba3
parent0e1a860789896fd2e6331648f1268c5b2cdb3573
auto merge of #12627 : alexcrichton/rust/issue-12623, r=brson

This helps prevent the unfortunate interleavings found in #12623.
src/librustc/driver/driver.rs
src/librustc/lib.rs
src/libsyntax/parse/lexer.rs
src/libsyntax/parse/mod.rs