From c1e0f5a9c9f6402703aece1581fd00ab20f71ded Mon Sep 17 00:00:00 2001 From: Andreas Fuchs Date: Wed, 25 Nov 2020 19:20:17 -0500 Subject: Use DeployData's store path to build the activate-rs path This gets rid of yet more code, so - win! --- src/utils/mod.rs | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'src/utils/mod.rs') diff --git a/src/utils/mod.rs b/src/utils/mod.rs index 6052813..02ea85b 100644 --- a/src/utils/mod.rs +++ b/src/utils/mod.rs @@ -312,23 +312,3 @@ pub enum DeployPathToActivatePathError { #[error("Deploy path was not valid utf8")] InvalidUtf8, } - -pub fn deploy_path_to_activate_path_str( - deploy_defs: &DeployDefs, -) -> Result<String, DeployPathToActivatePathError> { - Ok(format!("{}/activate-rs", deploy_defs.profile_path)) -} - -#[test] -fn test_activate_path_generation() { - let defs = DeployDefs { - ssh_user: "foo".to_string(), - profile_user: "bar".to_string(), - profile_path: "/nix/store/profile-closure".to_string(), - sudo: None, - }; - match deploy_path_to_activate_path_str(&defs) { - Err(_) => panic!(""), - Ok(x) => assert_eq!(x, "/nix/store/profile-closure/activate-rs".to_string()), - } -} -- cgit v1.2.3