aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Duerr <chrisduerr@users.noreply.github.com>2018-11-10 17:04:26 +0000
committerGitHub <noreply@github.com>2018-11-10 17:04:26 +0000
commit021b424858d0b2fcf50c4199e152e93596cc8d5d (patch)
tree3ccc2b691b9bc1423183866cfe639f14b8f2de76
parent2434547fce7bf47a848f088f2600e8ba7027a62b (diff)
downloadalacritty-021b424858d0b2fcf50c4199e152e93596cc8d5d.tar.gz
alacritty-021b424858d0b2fcf50c4199e152e93596cc8d5d.zip
Remove re-export of glutin size types
-rw-r--r--src/display.rs5
-rw-r--r--src/event.rs2
-rw-r--r--src/lib.rs3
-rw-r--r--src/renderer/mod.rs3
-rw-r--r--src/window.rs5
5 files changed, 7 insertions, 11 deletions
diff --git a/src/display.rs b/src/display.rs
index f4d48120..6ab622f2 100644
--- a/src/display.rs
+++ b/src/display.rs
@@ -18,8 +18,8 @@ use std::sync::mpsc;
use std::f64;
use parking_lot::MutexGuard;
+use glutin::dpi::{LogicalPosition, PhysicalSize};
-use {LogicalPosition, PhysicalSize, Rgb};
use cli;
use config::Config;
use font::{self, Rasterize};
@@ -27,9 +27,8 @@ use meter::Meter;
use renderer::{self, GlyphCache, QuadRenderer};
use term::{Term, SizeInfo, RenderableCell};
use sync::FairMutex;
-
use window::{self, Window};
-
+use Rgb;
#[derive(Debug)]
pub enum Error {
diff --git a/src/event.rs b/src/event.rs
index a61450f3..7a1faa70 100644
--- a/src/event.rs
+++ b/src/event.rs
@@ -23,7 +23,7 @@ use term::{Term, SizeInfo, TermMode, Search};
use util::limit;
use util::fmt::Red;
use window::Window;
-use PhysicalSize;
+use glutin::dpi::PhysicalSize;
/// Byte sequences are sent to a `Notify` in response to some events
pub trait Notify {
diff --git a/src/lib.rs b/src/lib.rs
index 291be259..1d393d1a 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -93,9 +93,6 @@ use std::ops::Mul;
pub use grid::Grid;
pub use term::Term;
-/// Re-export size and position types from glutin/winit
-pub use glutin::dpi::{PhysicalSize,LogicalSize,LogicalPosition,PhysicalPosition};
-
/// Facade around [winit's `MouseCursor`](glutin::MouseCursor)
#[derive(Debug, Eq, PartialEq, Copy, Clone)]
pub enum MouseCursor {
diff --git a/src/renderer/mod.rs b/src/renderer/mod.rs
index cb36210f..df219cf5 100644
--- a/src/renderer/mod.rs
+++ b/src/renderer/mod.rs
@@ -28,10 +28,11 @@ use gl::types::*;
use gl;
use index::{Column, Line, RangeInclusive};
use notify::{watcher, DebouncedEvent, RecursiveMode, Watcher};
+use Rgb;
use config::{self, Config, Delta};
use term::{self, cell, RenderableCell};
-use {PhysicalSize, Rgb};
+use glutin::dpi::PhysicalSize;
// Shader paths for live reload
static TEXT_SHADER_F_PATH: &'static str = concat!(env!("CARGO_MANIFEST_DIR"), "/res/text.f.glsl");
diff --git a/src/window.rs b/src/window.rs
index a19fd9c5..31b7c766 100644
--- a/src/window.rs
+++ b/src/window.rs
@@ -24,12 +24,11 @@ use glutin::{
self, ContextBuilder, ControlFlow, Event, EventsLoop,
MouseCursor as GlutinMouseCursor, WindowBuilder,
};
-
-use {LogicalPosition, LogicalSize, MouseCursor, PhysicalSize};
-
+use glutin::dpi::{LogicalPosition, LogicalSize, PhysicalSize};
use cli::Options;
use config::{Decorations, WindowConfig};
+use MouseCursor;
#[cfg(windows)]
static WINDOW_ICON: &'static [u8] = include_bytes!("../assets/windows/alacritty.ico");