Modified to compile with latest version of rust.

Should compile with no warnings and errors on the latest version of the rust source.