on master help sign in
Simplify the load_runtime_file code.

Reduce the number of feature switches for the embed_runtime feature.

commitf3db12e240868796257b9e57c5e39eb404723985 authorBrian Dawn <brian.t.dawn@gmail.com> dateSat 5 Jun 2021, 12:12 (5 years ago) parent676719b
1 file changed+5−8
helix-core/src/syntax.rs+5−8
helix-core/src/syntax.rs+5−8
@@ -80,19 +80,16 @@ fn load_runtime_file(language: &str, filename: &str) -> Result<String, std::io::
8080 std::fs::read_to_string(&path)
8181}
8282
83−#[cfg(feature = "embed_runtime")]
84−#[derive(rust_embed::RustEmbed)]
85−#[folder = "../runtime/"]
86−struct Runtime;
87−
8883#[cfg(feature = "embed_runtime")]
8984fn load_runtime_file(language: &str, filename: &str) -> Result<String, Box<dyn std::error::Error>> {
85+ #[derive(rust_embed::RustEmbed)]
86+ #[folder = "../runtime/"]
87+ struct Runtime;
88+
9089 let path = PathBuf::from("queries").join(language).join(filename);
9190
9291 let query_bytes = Runtime::get(&path.display().to_string()).unwrap_or_default();
93− std::str::from_utf8(query_bytes.as_ref())
94− .map(|s| s.to_string())
95− .map_err(|err| err.into())
92+ String::from_utf8(query_bytes.to_vec()).map_err(|err| err.into())
9693}
9794
9895fn read_query(language: &str, filename: &str) -> String {