Fixes for change introduced by https://github.com/rust-lang/rust/pull/23860#290

Merged

DaGenix merged 7 commits intoDaGenix:masterfrom rustyhorde:master

Apr 4, 2015

+167-146

Commits on Mar 31, 2015

fixed immutable borrow of mutable issue
Jason Ozias
committed

Commits on Apr 2, 2015

Merge remote-tracking branch 'upstream/master'
Jason Ozias
committed

Commits on Apr 3, 2015

Merge remote-tracking branch 'upstream/master'
Jason Ozias
committed
Fixes for rust-lang/rust#23860
Jason Ozias
committed
fixed immutable borrow of mutable issue
Jason Ozias
committed
Fixes for rust-lang/rust#23860
Jason Ozias
committed
Merge branch 'master' of github.com:rustyhorde/rust-crypto
Jason Ozias
committed