From 6eaf1688f48a59c07783fd9be128b8a52cc30a43 Mon Sep 17 00:00:00 2001
From: ice_iix <ice_ix@protonmail.ch>
Date: Sat, 29 Sep 2018 23:11:47 -0700
Subject: [PATCH] Remove time crate in favor of std::time, removing last usage
 in main

Combined with these changes, which also convert to std::time:
https://github.com/iceiix/steven/commit/47aeb83da2a7ab15a2f500daeadfb95403c17b98 logo text
https://github.com/iceiix/steven/commit/2f861f815abbfa31ca00c691d83402f9c63290ab light updates
https://github.com/iceiix/steven/commit/9677f8ae9ca4ebd2b91ef27ad986486dfe59da7f server ping
---
 Cargo.lock  |  1 -
 Cargo.toml  |  1 -
 src/main.rs | 18 +++++++++---------
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3a3ab83..68ff6bf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -21,7 +21,6 @@ dependencies = [
  "steven_gl 0.0.1",
  "steven_resources 0.1.0",
  "steven_shared 0.0.1",
- "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
  "zip 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index 1f52c53..6cb9a5b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,7 +19,6 @@ serde_json = "0.7.0"
 flate2 = "0.2.13"
 zip = "0.1.16"
 image = "0.7.0"
-time = "0.1.34"
 rand = "0.3.14"
 rustc-serialize = "0.3.18"
 log = "0.3.5"
diff --git a/src/main.rs b/src/main.rs
index 5bd901d..ddffb7e 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -18,7 +18,7 @@
 extern crate sdl2;
 extern crate zip;
 extern crate image;
-extern crate time;
+use std::time::{Instant, Duration};
 extern crate byteorder;
 extern crate serde_json;
 extern crate openssl;
@@ -213,8 +213,8 @@ fn main() {
     let renderer = render::Renderer::new(resource_manager.clone());
     let mut ui_container = ui::Container::new();
 
-    let mut last_frame = time::now();
-    let frame_time = (time::Duration::seconds(1).num_nanoseconds().unwrap() as f64) / 60.0;
+    let mut last_frame = Instant::now();
+    let frame_time = 1e9f64 / 60.0;
 
     let mut screen_sys = screen::ScreenSystem::new();
     screen_sys.add_screen(Box::new(screen::Login::new(vars.clone())));
@@ -238,10 +238,10 @@ fn main() {
     let mut events = game.sdl.event_pump().unwrap();
     while !game.should_close {
 
-        let now = time::now();
-        let diff = now - last_frame;
+        let now = Instant::now();
+        let diff = now.duration_since(last_frame);
         last_frame = now;
-        let delta = (diff.num_nanoseconds().unwrap() as f64) / frame_time;
+        let delta = (diff.subsec_nanos() as f64) / frame_time;
         let (width, height) = window.drawable_size();
 
         let version = {
@@ -274,10 +274,10 @@ fn main() {
 
 
         if fps_cap > 0 && !vsync {
-            let frame_time = time::now() - now;
-            let sleep_interval = time::Duration::milliseconds(1000 / fps_cap);
+            let frame_time = now.elapsed();
+            let sleep_interval = Duration::from_millis(1000 / fps_cap as u64);
             if frame_time < sleep_interval {
-                thread::sleep((sleep_interval - frame_time).to_std().unwrap());
+                thread::sleep(sleep_interval - frame_time);
             }
         }
         window.gl_swap_window();