atris/rust — pull request #1 by nikomatsakis (2012-09-27 02:41:21+00:00)
Title: Dk broken branch

Atris: I took a look at your problem. It seems like you just needed to bring yourself up-to-date with the latest repo. To that end, I did a merge from the mozilla/incoming branch. Everything seems to build now (except for that error with having too many parameters). So that you won't have to repeat the work I already did, here is a pull request with the merged code.

Note that I would suggest you continue to merge from incoming (`git merge mozilla/incoming`) rather than to rebase. The reason is that it seems you already did a merge and attempting to do rebasing after merging leads to strange conflicts.