Merge pull request #54 from NixOS/small-cleanup

Small cleanup

Author: Mic92

src/action/base/create_user.rs

@@ -268,7 +268,7 @@ async fn execute_dscl_retry_on_specific_errors(dscl_args: &[&str]) -> Result<(),
             );
             break;
         } else if retry_tokens == 0 {
-            return Err(ActionErrorKind::command_output(&command, output))?;
+            return Err(ActionErrorKind::command_output(&command, output));
         } else {
             if output.status.code() == Some(140) && stderr.contains("-14988 (eNotYetImplemented)") {
                 // Retry due to buggy macOS user behavior?
@@ -384,7 +384,7 @@ pub async fn delete_user_macos(name: &str) -> Result<(), ActionErrorKind> {
         },
         Some(185) if stderr.contains("-14009 (eDSUnknownNodeName)") => {
             // The user has already been deleted
-            tracing::debug!("User already deleted: /Users/{}`", name);
+            tracing::debug!("User already deleted: /Users/{}", name);
         },
         _ => {
             // Something went wrong

src/action/common/place_nix_configuration.rs

@@ -566,13 +566,13 @@ mod tests {
             .expect("place nix config should succeed");
 
         let standard_conf = tokio::fs::read_to_string(nix_conf_path).await.unwrap();
-        assert!(standard_conf.contains("trusted-user"), "trusted-user setting should exist in standard conf so that we don't break cachix users");
+        assert!(standard_conf.contains("trusted-users"), "trusted-users setting should exist in standard conf so that we don't break cachix users");
 
         let custom_conf = tokio::fs::read_to_string(nix_custom_conf_path)
             .await
             .unwrap();
         assert!(
-            custom_conf.contains("trusted-user"),
+            custom_conf.contains("trusted-users"),
             "trusted-user setting should exist in custom conf as well"
         );