From f3db12e240868796257b9e57c5e39eb404723985 Mon Sep 17 00:00:00 2001
From: Brian Dawn <brian.t.dawn@gmail.com>
Date: Sat, 5 Jun 2021 12:12:08 -0500
Subject: [PATCH] Simplify the load_runtime_file code.

Reduce the number of feature switches for the embed_runtime feature.
---
 helix-core/src/syntax.rs | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index 0bc6cb9d..e94c154d 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -80,19 +80,16 @@ fn load_runtime_file(language: &str, filename: &str) -> Result<String, std::io::
     std::fs::read_to_string(&path)
 }
 
-#[cfg(feature = "embed_runtime")]
-#[derive(rust_embed::RustEmbed)]
-#[folder = "../runtime/"]
-struct Runtime;
-
 #[cfg(feature = "embed_runtime")]
 fn load_runtime_file(language: &str, filename: &str) -> Result<String, Box<dyn std::error::Error>> {
+    #[derive(rust_embed::RustEmbed)]
+    #[folder = "../runtime/"]
+    struct Runtime;
+
     let path = PathBuf::from("queries").join(language).join(filename);
 
     let query_bytes = Runtime::get(&path.display().to_string()).unwrap_or_default();
-    std::str::from_utf8(query_bytes.as_ref())
-        .map(|s| s.to_string())
-        .map_err(|err| err.into())
+    String::from_utf8(query_bytes.to_vec()).map_err(|err| err.into())
 }
 
 fn read_query(language: &str, filename: &str) -> String {