follow updated rust syntax
change tabs to spaces
update kill to compile on rust master