Some minor fixes

Some minor things I noticed while doing all the other stuff

src/eval/error.rs

@@ -174,7 +174,7 @@ fn try_js_error_to_rust(
  }
  _ => {
  return Ok(NixError {
- message: vec![NixErrorMessagePart::Plain("An error occurred.".to_owned())],
+ message: vec![NixErrorMessagePart::Plain("An unrecognized NixError occurred.".to_owned())],
  kind: NixErrorKind::UnexpectedJsError {
  message: error.to_rust_string_lossy(scope),
  },

src/tests/attr_set.rs

@@ -84,7 +84,7 @@ fn eval_attrset_non_string_attr() {
 fn eval_attrset_update() {
  assert_eq!(eval_ok("{} // {}"), Value::AttrSet(HashMap::new()));
  assert_eq!(
- eval_ok("{a = 1; b = 2;} // {a = 3; c = 1;"),
+ eval_ok("{a = 1; b = 2;} // {a = 3; c = 1;}"),
  Value::AttrSet(HashMap::from([
  ("a".to_owned(), Value::Int(3)),
  ("b".to_owned(), Value::Int(2)),

src/tests/mod.rs

@@ -2,7 +2,7 @@
 #![allow(clippy::expect_fun_call)]
 #![allow(clippy::approx_constant)]
 
-use crate::eval::{error::NixErrorKind, execution::evaluate, types::Value};
+use crate::eval::{error::NixErrorKind, execution::evaluate, types::{NixTypeKind, Value}};
 
 mod attr_set;
 mod builtins;
@@ -34,7 +34,13 @@ fn eval_if_then_else() {
 
 #[test]
 fn eval_if_then_else_invalid_type() {
- assert!(evaluate("if 0 then 1 else 0").is_err());
+ assert_eq!(
+ eval_err("if 0 then 1 else 0"),
+ NixErrorKind::TypeMismatch {
+ expected: vec![NixTypeKind::Bool],
+ got: NixTypeKind::Int,
+ }
+ );
 }
 
 #[test]

src/tests/operators.rs

@@ -139,6 +139,17 @@ fn eval_path_string_concatenation() {
 
 #[test]
 fn eval_path_concat() {
+ let curr_dir = std::env::current_dir().unwrap();
+
+ assert_eq!(
+ eval_ok("./foo + ./bar"),
+ Value::Path(format!(
+ "{}/foo{}/bar",
+ curr_dir.display(),
+ curr_dir.display()
+ ))
+ );
+
  assert_eq!(eval_ok(r#"/. + "a""#), Value::Path("/a".to_owned()));
  assert_eq!(eval_ok(r#"/. + "./a/../b""#), Value::Path("/b".to_owned()));
 }