From 1dee64f7ec304c607afeb7da8db305e6de1d064c Mon Sep 17 00:00:00 2001 From: Michael Davis Date: Thu, 20 Mar 2025 20:52:49 -0400 Subject: [PATCH] minor: Accept `impl AsRef` in loader's runtime_file helper This is purely for ergonomics: we should be able to pass strings for example crate::runtime_file(format!("namespace/{foo}/{bar}.txt")) (Note that this works on Windows, see the `Path` documentation.) --- helix-loader/src/grammar.rs | 2 +- helix-loader/src/lib.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/helix-loader/src/grammar.rs b/helix-loader/src/grammar.rs index 7e4fc2b58..29bcf07f5 100644 --- a/helix-loader/src/grammar.rs +++ b/helix-loader/src/grammar.rs @@ -592,6 +592,6 @@ fn mtime(path: &Path) -> Result { /// Gives the contents of a file from a language's `runtime/queries/` /// directory pub fn load_runtime_file(language: &str, filename: &str) -> Result { - let path = crate::runtime_file(&PathBuf::new().join("queries").join(language).join(filename)); + let path = crate::runtime_file(PathBuf::new().join("queries").join(language).join(filename)); std::fs::read_to_string(path) } diff --git a/helix-loader/src/lib.rs b/helix-loader/src/lib.rs index 0e7c134d0..ae9ffe550 100644 --- a/helix-loader/src/lib.rs +++ b/helix-loader/src/lib.rs @@ -107,8 +107,8 @@ fn find_runtime_file(rel_path: &Path) -> Option { /// The valid runtime directories are searched in priority order and the first /// file found to exist is returned, otherwise the path to the final attempt /// that failed. -pub fn runtime_file(rel_path: &Path) -> PathBuf { - find_runtime_file(rel_path).unwrap_or_else(|| { +pub fn runtime_file(rel_path: impl AsRef) -> PathBuf { + find_runtime_file(rel_path.as_ref()).unwrap_or_else(|| { RUNTIME_DIRS .last() .map(|dir| dir.join(rel_path))