diff --git a/benches/view/draw_buffer.rs b/benches/view/draw_buffer.rs index 01c6c6fa..e5301d32 100644 --- a/benches/view/draw_buffer.rs +++ b/benches/view/draw_buffer.rs @@ -1,4 +1,3 @@ -extern crate amp; #[macro_use] extern crate criterion; diff --git a/src/input/key_map/mod.rs b/src/input/key_map/mod.rs index ba30309b..52b6e4c3 100644 --- a/src/input/key_map/mod.rs +++ b/src/input/key_map/mod.rs @@ -5,7 +5,7 @@ use smallvec::SmallVec; use std::collections::HashMap; use std::ops::{Deref, DerefMut}; use std::convert::Into; -use crate::yaml::yaml::{Hash, Yaml, YamlLoader}; +use yaml_rust::yaml::{Hash, Yaml, YamlLoader}; /// Nested HashMap newtype that provides a more ergonomic interface. pub struct KeyMap(HashMap>>); @@ -241,7 +241,7 @@ impl Into>>> for KeyMap { #[cfg(test)] mod tests { - use crate::yaml::YamlLoader; + use yaml_rust::YamlLoader; use super::KeyMap; use crate::commands; use crate::input::Key; diff --git a/src/lib.rs b/src/lib.rs index 973137eb..96eafd08 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,22 +1,6 @@ // `error_chain!` can recurse deeply #![recursion_limit = "1024"] -// External dependencies -extern crate app_dirs2; -extern crate bloodhound; -extern crate fragment; -extern crate git2; -extern crate luthor; -extern crate mio; -extern crate regex; -extern crate scribe; -extern crate signal_hook; -extern crate syntect; -extern crate unicode_segmentation; -extern crate cli_clipboard as clipboard; -extern crate yaml_rust as yaml; -extern crate smallvec; - #[macro_use] extern crate error_chain; diff --git a/src/main.rs b/src/main.rs index 018a97f6..478c5170 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,4 +1,3 @@ -extern crate amp; use amp::Application; use amp::Error; use std::env; diff --git a/src/models/application/clipboard.rs b/src/models/application/clipboard.rs index 30154440..01a4d8cc 100644 --- a/src/models/application/clipboard.rs +++ b/src/models/application/clipboard.rs @@ -1,5 +1,5 @@ use crate::errors::*; -use clipboard::{ClipboardContext, ClipboardProvider}; +use cli_clipboard::{ClipboardContext, ClipboardProvider}; /// In-app content can be captured in both regular and full-line selection /// modes. This type describes the structure of said content, based on the diff --git a/src/models/application/mod.rs b/src/models/application/mod.rs index a2216605..46dab1bc 100644 --- a/src/models/application/mod.rs +++ b/src/models/application/mod.rs @@ -312,7 +312,7 @@ mod tests { use crate::view::View; use super::preferences::Preferences; - use yaml::YamlLoader; + use yaml_rust::YamlLoader; use scribe::Buffer; use std::cell::RefCell; use std::env; diff --git a/src/models/application/modes/open/exclusions.rs b/src/models/application/modes/open/exclusions.rs index b5cd8b12..c865f647 100644 --- a/src/models/application/modes/open/exclusions.rs +++ b/src/models/application/modes/open/exclusions.rs @@ -1,6 +1,6 @@ use crate::errors::*; use bloodhound::ExclusionPattern; -use crate::yaml::Yaml; +use yaml_rust::Yaml; pub fn parse(exclusion_data: &[Yaml]) -> Result> { let mut mapped_exclusions = Vec::new(); diff --git a/src/models/application/preferences/mod.rs b/src/models/application/preferences/mod.rs index 14e51424..ac4915b9 100644 --- a/src/models/application/preferences/mod.rs +++ b/src/models/application/preferences/mod.rs @@ -7,7 +7,7 @@ use scribe::Buffer; use std::fs::OpenOptions; use std::io::Read; use std::path::{Path, PathBuf}; -use crate::yaml::yaml::{Hash, Yaml, YamlLoader}; +use yaml_rust::yaml::{Hash, Yaml, YamlLoader}; use crate::models::application::modes::SearchSelectConfig; const APP_INFO: AppInfo = AppInfo { @@ -359,7 +359,7 @@ mod tests { use super::{ExclusionPattern, Preferences, YamlLoader}; use std::path::{Path, PathBuf}; use crate::input::KeyMap; - use crate::yaml::yaml::{Hash, Yaml}; + use yaml_rust::yaml::{Hash, Yaml}; #[test] fn preferences_returns_user_defined_theme_name() { diff --git a/src/view/buffer/renderer.rs b/src/view/buffer/renderer.rs index e5159f65..d9fe0cfd 100644 --- a/src/view/buffer/renderer.rs +++ b/src/view/buffer/renderer.rs @@ -399,7 +399,7 @@ mod tests { use super::{BufferRenderer, LexemeMapper, MappedLexeme}; use syntect::highlighting::ThemeSet; use crate::view::terminal::*; - use crate::yaml::yaml::YamlLoader; + use yaml_rust::yaml::YamlLoader; #[test] fn tabs_beyond_terminal_width_dont_panic() {