aboutsummaryrefslogtreecommitdiff
path: root/alacritty_terminal/src/config/mod.rs
diff options
context:
space:
mode:
authorNathan Lilienthal <nathan@nixpulvis.com>2019-05-03 19:48:25 -0400
committerGitHub <noreply@github.com>2019-05-03 19:48:25 -0400
commit34c54e7e0eb7c28406df112d118b82280be2adee (patch)
tree7b32e11bed7906d67d43da81bd8e8b08f128660d /alacritty_terminal/src/config/mod.rs
parentba6e208a95e37116b031aca02246d3cff04c0216 (diff)
downloadalacritty-34c54e7e0eb7c28406df112d118b82280be2adee.tar.gz
alacritty-34c54e7e0eb7c28406df112d118b82280be2adee.zip
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.
Diffstat (limited to 'alacritty_terminal/src/config/mod.rs')
-rw-r--r--alacritty_terminal/src/config/mod.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/alacritty_terminal/src/config/mod.rs b/alacritty_terminal/src/config/mod.rs
index 9502e3fd..6eebbdfc 100644
--- a/alacritty_terminal/src/config/mod.rs
+++ b/alacritty_terminal/src/config/mod.rs
@@ -22,11 +22,12 @@ use serde::{self, de, Deserialize};
use serde_yaml;
use crate::ansi::CursorStyle;
-use crate::cli::Options;
use crate::index::{Column, Line};
use crate::input::{Action, Binding, KeyBinding, MouseBinding};
use crate::term::color::Rgb;
+pub use self::options::Options;
+mod options;
mod bindings;
pub const SOURCE_FILE_PATH: &str = file!();
@@ -2704,7 +2705,7 @@ impl Key {
#[cfg(test)]
mod tests {
use super::{Config, DEFAULT_ALACRITTY_CONFIG};
- use crate::cli::Options;
+ use crate::config::Options;
#[test]
fn parse_config() {