Update hammer.rs to be compatible with the current rust master