From 335045840ba27986524e8a2793fee32aa94bb958 Mon Sep 17 00:00:00 2001
From: Keith Simmons <keith@the-simmons.net>
Date: Mon, 27 Jan 2020 12:19:45 -0800
Subject: [PATCH] fix some warnings and bump skulpin

---
 Cargo.toml                     | 2 +-
 src/redraw_scheduler.rs        | 7 ++-----
 src/renderer/caching_shaper.rs | 7 ++-----
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index b48b2c6..eab2604 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,7 +10,7 @@ euclid = "0.20.7"
 font-kit = "0.4.0"
 skribo = { git = "https://github.com/linebender/skribo" }
 lru = "0.4.3"
-skulpin = "0.5"
+skulpin = "0.5.1"
 derive-new = "0.5"
 env_logger = "0.7.1"
 rmpv = "0.4.2"
diff --git a/src/redraw_scheduler.rs b/src/redraw_scheduler.rs
index 1673919..ec18fe7 100644
--- a/src/redraw_scheduler.rs
+++ b/src/redraw_scheduler.rs
@@ -1,9 +1,6 @@
-use std::sync::{Arc, Mutex};
+use std::sync::Mutex;
 use std::sync::atomic::{AtomicU16, Ordering};
-use std::time::{Duration, Instant};
-use std::thread;
-
-use skulpin::winit::window::Window;
+use std::time::Instant;
 
 lazy_static! {
     pub static ref REDRAW_SCHEDULER: RedrawScheduler = RedrawScheduler::new();
diff --git a/src/renderer/caching_shaper.rs b/src/renderer/caching_shaper.rs
index 261b06d..7fa53a9 100644
--- a/src/renderer/caching_shaper.rs
+++ b/src/renderer/caching_shaper.rs
@@ -1,12 +1,9 @@
-use std::sync::Arc;
 use std::collections::HashMap;
 
 use lru::LruCache;
-use skulpin::skia_safe::{TextBlob, Font as SkiaFont, FontStyle, Typeface, TextBlobBuilder, Data};
+use skulpin::skia_safe::{TextBlob, Font as SkiaFont, Typeface, TextBlobBuilder, Data};
 use font_kit::{source::SystemSource, metrics::Metrics, properties::Properties, family_name::FamilyName};
-use skribo::{layout_run, LayoutSession, FontRef as SkriboFont, FontFamily, FontCollection, TextStyle};
-
-use crate::error_handling::OptionPanicExplanation;
+use skribo::{LayoutSession, FontRef as SkriboFont, FontFamily, FontCollection, TextStyle};
 
 const STANDARD_CHARACTER_STRING: &'static str = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890";