Refactor time.rs to make the code logic the same as others.

Refactor time.rs to make the code logic the same as others. #670