From 34c54e7e0eb7c28406df112d118b82280be2adee Mon Sep 17 00:00:00 2001
From: Nathan Lilienthal <nathan@nixpulvis.com>
Date: Fri, 3 May 2019 19:48:25 -0400
Subject: Add git hash to version string, and fix crate name (#2397)

This moves `cli` out of `alacritty_terminal` and into `alacritty` where
it belongs, along with the `clap` dependency.
---
 alacritty_terminal/src/display.rs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'alacritty_terminal/src/display.rs')

diff --git a/alacritty_terminal/src/display.rs b/alacritty_terminal/src/display.rs
index 4cb023af..9304398f 100644
--- a/alacritty_terminal/src/display.rs
+++ b/alacritty_terminal/src/display.rs
@@ -22,8 +22,7 @@ use glutin::dpi::{PhysicalPosition, PhysicalSize};
 use glutin::EventsLoop;
 use parking_lot::MutexGuard;
 
-use crate::cli;
-use crate::config::{Config, StartupMode};
+use crate::config::{Config, Options, StartupMode};
 use crate::index::Line;
 use crate::message_bar::Message;
 use crate::meter::Meter;
@@ -135,7 +134,7 @@ impl Display {
         &self.size_info
     }
 
-    pub fn new(config: &Config, options: &cli::Options) -> Result<Display, Error> {
+    pub fn new(config: &Config, options: &Options) -> Result<Display, Error> {
         // Extract some properties from config
         let render_timer = config.render_timer();
 
@@ -241,7 +240,7 @@ impl Display {
 
     fn calculate_dimensions(
         config: &Config,
-        options: &cli::Options,
+        options: &Options,
         dpr: f64,
         cell_width: f32,
         cell_height: f32,
-- 
cgit