Fix lifetime parameter shadowing on rust master
Merge pull request #89 from alexcrichton/update

Fix lifetime parameter shadowing on rust master