git.lizzy.rs Git - rust.git/commit

]> git.lizzy.rs Git - rust.git/commit

projects / rust.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 08176a3 5392373)

author	bors <bors@rust-lang.org>
	Sun, 31 Aug 2014 19:55:51 +0000 (19:55 +0000)
committer	bors <bors@rust-lang.org>
	Sun, 31 Aug 2014 19:55:51 +0000 (19:55 +0000)
commit	5dfb7a6ec1c1b7827a1f019b276c4d959cf2d71e
tree	05786d52abbbe15e26582f035238081023edbe36	tree \| snapshot
parent	08176a356124322dfe9ec33b7846a517fc7ae532	commit \| diff
parent	539237372a81c377ace29519381a8e09bfa6c451	commit \| diff

auto merge of #16809 : nick29581/rust/dst-bug-3, r=alexcrichton

This corrects a rebasing error. Also adds a test so it won't happen again.

r?

src/libsyntax/parse/parser.rs

Empowering everyone to build reliable and efficient software.