This uses the `im::OrdMap` for `NixAttrs` to enable sharing of memory between different iterations of a map. This slightly speeds up eval, but not significantly. Future work might include benchmarking whether using a `HashMap` and only ordering in cases where order is actually required would help. This switches to a fork of `im` that fixes some bugs with its OrdMap implementation. Change-Id: I2f6a5ff471b6d508c1e8a98b13f889f49c0d9537 Reviewed-on: https://cl.tvl.fyi/c/depot/+/7676 Reviewed-by: sterni <sternenseemann@systemli.org> Tested-by: BuildkiteCI
145 lines
4.2 KiB
Rust
145 lines
4.2 KiB
Rust
use super::*;
|
|
|
|
mod nix_eq {
|
|
use crate::observer::NoOpObserver;
|
|
|
|
use super::*;
|
|
use proptest::prelude::ProptestConfig;
|
|
use test_strategy::proptest;
|
|
|
|
#[proptest(ProptestConfig { cases: 2, ..Default::default() })]
|
|
fn reflexive(x: NixAttrs) {
|
|
let mut observer = NoOpObserver {};
|
|
let mut vm = VM::new(Default::default(), Box::new(crate::DummyIO), &mut observer);
|
|
|
|
assert!(x.nix_eq(&x, &mut vm).unwrap())
|
|
}
|
|
|
|
#[proptest(ProptestConfig { cases: 2, ..Default::default() })]
|
|
fn symmetric(x: NixAttrs, y: NixAttrs) {
|
|
let mut observer = NoOpObserver {};
|
|
let mut vm = VM::new(Default::default(), Box::new(crate::DummyIO), &mut observer);
|
|
|
|
assert_eq!(
|
|
x.nix_eq(&y, &mut vm).unwrap(),
|
|
y.nix_eq(&x, &mut vm).unwrap()
|
|
)
|
|
}
|
|
|
|
#[proptest(ProptestConfig { cases: 2, ..Default::default() })]
|
|
fn transitive(x: NixAttrs, y: NixAttrs, z: NixAttrs) {
|
|
let mut observer = NoOpObserver {};
|
|
let mut vm = VM::new(Default::default(), Box::new(crate::DummyIO), &mut observer);
|
|
|
|
if x.nix_eq(&y, &mut vm).unwrap() && y.nix_eq(&z, &mut vm).unwrap() {
|
|
assert!(x.nix_eq(&z, &mut vm).unwrap())
|
|
}
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn test_empty_attrs() {
|
|
let attrs = NixAttrs::construct(0, vec![]).expect("empty attr construction should succeed");
|
|
|
|
assert!(
|
|
matches!(attrs, NixAttrs(AttrsRep::Empty)),
|
|
"empty attribute set should use optimised representation"
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn test_simple_attrs() {
|
|
let attrs = NixAttrs::construct(
|
|
1,
|
|
vec![Value::String("key".into()), Value::String("value".into())],
|
|
)
|
|
.expect("simple attr construction should succeed");
|
|
|
|
assert!(
|
|
matches!(attrs, NixAttrs(AttrsRep::Im(_))),
|
|
"simple attribute set should use map representation",
|
|
)
|
|
}
|
|
|
|
#[test]
|
|
fn test_kv_attrs() {
|
|
let name_val = Value::String("name".into());
|
|
let value_val = Value::String("value".into());
|
|
let meaning_val = Value::String("meaning".into());
|
|
let forty_two_val = Value::Integer(42);
|
|
|
|
let kv_attrs = NixAttrs::construct(
|
|
2,
|
|
vec![
|
|
value_val,
|
|
forty_two_val.clone(),
|
|
name_val,
|
|
meaning_val.clone(),
|
|
],
|
|
)
|
|
.expect("constructing K/V pair attrs should succeed");
|
|
|
|
match kv_attrs {
|
|
NixAttrs(AttrsRep::KV { name, value })
|
|
if name.to_str().unwrap() == meaning_val.to_str().unwrap()
|
|
|| value.to_str().unwrap() == forty_two_val.to_str().unwrap() => {}
|
|
|
|
_ => panic!(
|
|
"K/V attribute set should use optimised representation, but got {:?}",
|
|
kv_attrs
|
|
),
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn test_empty_attrs_iter() {
|
|
let attrs = NixAttrs::construct(0, vec![]).unwrap();
|
|
assert!(attrs.iter().next().is_none());
|
|
}
|
|
|
|
#[test]
|
|
fn test_kv_attrs_iter() {
|
|
let name_val = Value::String("name".into());
|
|
let value_val = Value::String("value".into());
|
|
let meaning_val = Value::String("meaning".into());
|
|
let forty_two_val = Value::Integer(42);
|
|
|
|
let kv_attrs = NixAttrs::construct(
|
|
2,
|
|
vec![
|
|
value_val,
|
|
forty_two_val.clone(),
|
|
name_val,
|
|
meaning_val.clone(),
|
|
],
|
|
)
|
|
.expect("constructing K/V pair attrs should succeed");
|
|
|
|
let mut iter = kv_attrs
|
|
.iter()
|
|
.collect::<Vec<_>>()
|
|
.into_iter()
|
|
.map(|(k, v)| (k, v));
|
|
let (k, v) = iter.next().unwrap();
|
|
assert!(k == NixString::NAME_REF);
|
|
assert!(v.to_str().unwrap() == meaning_val.to_str().unwrap());
|
|
let (k, v) = iter.next().unwrap();
|
|
assert!(k == NixString::VALUE_REF);
|
|
assert!(v.as_int().unwrap() == forty_two_val.as_int().unwrap());
|
|
assert!(iter.next().is_none());
|
|
}
|
|
|
|
#[test]
|
|
fn test_map_attrs_iter() {
|
|
let attrs = NixAttrs::construct(
|
|
1,
|
|
vec![Value::String("key".into()), Value::String("value".into())],
|
|
)
|
|
.expect("simple attr construction should succeed");
|
|
|
|
let mut iter = attrs.iter().collect::<Vec<_>>().into_iter();
|
|
let (k, v) = iter.next().unwrap();
|
|
assert!(k == &NixString::from("key"));
|
|
assert!(v.to_str().unwrap().as_str() == "value");
|
|
assert!(iter.next().is_none());
|
|
}
|