Apply suggestions from code review

Co-authored-by: Ivan Tham <pickfire@riseup.net>
This commit is contained in:
Brian Dawn 2021-06-05 11:50:34 -05:00 committed by Blaž Hrastnik
parent 255598a2cb
commit ae105812d6
3 changed files with 4 additions and 8 deletions

View file

@ -81,10 +81,7 @@ fn load_runtime_file(language: &str, filename: &str) -> Result<String, std::io::
}
#[cfg(feature = "embed_runtime")]
use rust_embed::RustEmbed;
#[cfg(feature = "embed_runtime")]
#[derive(RustEmbed)]
#[derive(rust_embed::RustEmbed)]
#[folder = "../runtime/"]
struct Runtime;
@ -93,7 +90,7 @@ fn load_runtime_file(language: &str, filename: &str) -> Result<String, Box<dyn s
let root = PathBuf::new();
let path = root.join("queries").join(language).join(filename);
let query_bytes = Runtime::get(&path.as_path().display().to_string()).unwrap_or_default();
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())