]> git.lizzy.rs Git - rust.git/commitdiff
projects / rust.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 08176a3 5392373)
auto merge of #16809 : nick29581/rust/dst-bug-3, r=alexcrichton
authorbors <bors@rust-lang.org>
Sun, 31 Aug 2014 19:55:51 +0000 (19:55 +0000)
committerbors <bors@rust-lang.org>
Sun, 31 Aug 2014 19:55:51 +0000 (19:55 +0000)
This corrects a rebasing error. Also adds a test so it won't happen again.

r?

1  2 
src/libsyntax/parse/parser.rs patch | diff1 | diff2 | blob | history

diff --cc src/libsyntax/parse/parser.rs
Simple merge
Empowering everyone to build reliable and efficient software.