on master help sign in
Simplify the load_runtime_file code.
f3db12eBrian Dawn
helix-core/src/syntax.rs+5−8
@@ -80,19 +80,16 @@ fn load_runtime_file(language: &str, filename: &str) -> Result<String, std::io::
80 std::fs::read_to_string(&path)
80 std::fs::read_to_string(&path)
81}
81}
82
82
83−#[cfg(feature = "embed_runtime")]
84−#[derive(rust_embed::RustEmbed)]
85−#[folder = "../runtime/"]
86−struct Runtime;
87−
88#[cfg(feature = "embed_runtime")]
83#[cfg(feature = "embed_runtime")]
89fn load_runtime_file(language: &str, filename: &str) -> Result<String, Box<dyn std::error::Error>> {
84fn 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+
90 let path = PathBuf::from("queries").join(language).join(filename);
89 let path = PathBuf::from("queries").join(language).join(filename);
91
90
92 let query_bytes = Runtime::get(&path.display().to_string()).unwrap_or_default();
91 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())
96}
93}
97
94
98fn read_query(language: &str, filename: &str) -> String {
95fn read_query(language: &str, filename: &str) -> String {