From 86b1d970c20645dfc6c2f0369ba320b73a2892da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Sun, 1 May 2022 11:36:38 +0900
Subject: [PATCH] fix build

---
 helix-core/src/lib.rs         | 2 +-
 helix-term/src/application.rs | 2 +-
 helix-view/src/ui/editor.rs   | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/helix-core/src/lib.rs b/helix-core/src/lib.rs
index 023412657..757d69d85 100644
--- a/helix-core/src/lib.rs
+++ b/helix-core/src/lib.rs
@@ -51,7 +51,7 @@ pub fn find_root(root: Option<&str>, root_markers: &[String]) -> Option<std::pat
         .cloned()
 }
 
-pub use ropey::{Rope, RopeBuilder, RopeSlice};
+pub use ropey::{str_utils, Rope, RopeBuilder, RopeSlice};
 
 // pub use tendril::StrTendril as Tendril;
 pub use smartstring::SmartString;
diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 8f7a4ae62..742d8c173 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -80,7 +80,7 @@ pub fn new(args: Args) -> Result<Self, Error> {
 
         let config = match std::fs::read_to_string(config_dir.join("config.toml")) {
             Ok(config) => toml::from_str(&config)
-                .map(crate::keymap::merge_keys)
+                .map(crate::config::merge_keys)
                 .unwrap_or_else(|err| {
                     eprintln!("Bad config: {}", err);
                     eprintln!("Press <ENTER> to continue with default config");
diff --git a/helix-view/src/ui/editor.rs b/helix-view/src/ui/editor.rs
index 0d4136b5d..4151c6da7 100644
--- a/helix-view/src/ui/editor.rs
+++ b/helix-view/src/ui/editor.rs
@@ -359,9 +359,9 @@ pub fn render_text_highlights<H: Iterator<Item = HighlightEvent>>(
         surface: &mut Surface,
         theme: &Theme,
         highlights: H,
-        whitespace: &helix_view::editor::WhitespaceConfig,
+        whitespace: &crate::editor::WhitespaceConfig,
     ) {
-        use helix_view::editor::WhitespaceRenderValue;
+        use crate::editor::WhitespaceRenderValue;
 
         // It's slightly more efficient to produce a full RopeSlice from the Rope, then slice that a bunch
         // of times than it is to always call Rope::slice/get_slice (it will internally always hit RSEnum::Light).
@@ -455,7 +455,7 @@ pub fn render_text_highlights<H: Iterator<Item = HighlightEvent>>(
                                 // make sure we display tab as appropriate amount of spaces
                                 let visual_tab_width = tab_width - (visual_x as usize % tab_width);
                                 let grapheme_tab_width =
-                                    ropey::str_utils::char_to_byte_idx(&tab, visual_tab_width);
+                                    helix_core::str_utils::char_to_byte_idx(&tab, visual_tab_width);
 
                                 (&tab[..grapheme_tab_width], visual_tab_width)
                             } else if grapheme == " " {