Simplify the load_runtime_file code.
Reduce the number of feature switches for the embed_runtime feature.
This commit is contained in:
parent
676719b361
commit
f3db12e240
1 changed files with 5 additions and 8 deletions
|
@ -81,18 +81,15 @@ fn load_runtime_file(language: &str, filename: &str) -> Result<String, std::io::
|
|||
}
|
||||
|
||||
#[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;
|
||||
|
||||
#[cfg(feature = "embed_runtime")]
|
||||
fn load_runtime_file(language: &str, filename: &str) -> Result<String, Box<dyn std::error::Error>> {
|
||||
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 {
|
||||
|
|
Loading…
Add table
Reference in a new issue