From 502d3290fb88d8a871b0824adc7987a98104933d Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne
Date: Mon, 17 Jan 2022 19:04:40 -0500
Subject: improve test harness

* Use new macro syntax for encoding sequences of keys
* Make convenience helpers for common test pattern
* Use indoc for inline indented raw strings
* Add feature flag for integration testing to disable rendering
---
 helix-loader/src/lib.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'helix-loader')

diff --git a/helix-loader/src/lib.rs b/helix-loader/src/lib.rs
index 767bff7a..595ac7aa 100644
--- a/helix-loader/src/lib.rs
+++ b/helix-loader/src/lib.rs
@@ -11,17 +11,17 @@ pub fn runtime_dir() -> std::path::PathBuf {
         return dir.into();
     }
 
+    if let Ok(dir) = std::env::var("CARGO_MANIFEST_DIR") {
+        // this is the directory of the crate being run by cargo, we need the workspace path so we take the parent
+        return std::path::PathBuf::from(dir).parent().unwrap().join(RT_DIR);
+    }
+
     const RT_DIR: &str = "runtime";
     let conf_dir = config_dir().join(RT_DIR);
     if conf_dir.exists() {
         return conf_dir;
     }
 
-    if let Ok(dir) = std::env::var("CARGO_MANIFEST_DIR") {
-        // this is the directory of the crate being run by cargo, we need the workspace path so we take the parent
-        return std::path::PathBuf::from(dir).parent().unwrap().join(RT_DIR);
-    }
-
     // fallback to location of the executable being run
     std::env::current_exe()
         .ok()
-- 
cgit v1.2.3-70-g09d2