From 158f4d1d69fc77e594866fa5d78b45c6daa66ff0 Mon Sep 17 00:00:00 2001 From: Aaqa Ishtyaq Date: Wed, 11 Jan 2023 01:03:27 +0530 Subject: fix(tvix/eval): len_without_is_empty clippy warn This CL addresses clippy warning len_without_is_empty which expects `.is_empty()` method to be present when implementing `.len()` method for an item. Change-Id: I8878db630b9ef5853649a906b764a33299bb5dc8 Signed-off-by: Aaqa Ishtyaq Reviewed-on: https://cl.tvl.fyi/c/depot/+/7806 Reviewed-by: flokli Tested-by: BuildkiteCI --- tvix/eval/src/builtins/mod.rs | 2 +- tvix/eval/src/value/attrs.rs | 8 ++++++++ tvix/eval/src/value/list.rs | 4 ++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/tvix/eval/src/builtins/mod.rs b/tvix/eval/src/builtins/mod.rs index 331dcbcd419c..b93bbd99f87a 100644 --- a/tvix/eval/src/builtins/mod.rs +++ b/tvix/eval/src/builtins/mod.rs @@ -898,7 +898,7 @@ mod pure_builtins { fn builtin_tail(_: &mut VM, list: Value) -> Result { let xs = list.to_list()?; - if xs.len() == 0 { + if xs.is_empty() { Err(ErrorKind::TailEmptyList) } else { let output = xs.into_iter().skip(1).collect::>(); diff --git a/tvix/eval/src/value/attrs.rs b/tvix/eval/src/value/attrs.rs index d413f0073f26..6515fb515a5d 100644 --- a/tvix/eval/src/value/attrs.rs +++ b/tvix/eval/src/value/attrs.rs @@ -301,6 +301,14 @@ impl NixAttrs { } } + pub fn is_empty(&self) -> bool { + match &self.0 { + AttrsRep::Im(map) => map.is_empty(), + AttrsRep::Empty => true, + AttrsRep::KV { .. } => false, + } + } + /// Select a value from an attribute set by key. pub fn select(&self, key: &str) -> Option<&Value> { self.0.select(key) diff --git a/tvix/eval/src/value/list.rs b/tvix/eval/src/value/list.rs index 70952419abea..6d830b7283d0 100644 --- a/tvix/eval/src/value/list.rs +++ b/tvix/eval/src/value/list.rs @@ -67,6 +67,10 @@ impl NixList { self.0.get(i) } + pub fn is_empty(&self) -> bool { + self.0.is_empty() + } + pub fn construct(count: usize, stack_slice: Vec) -> Self { debug_assert!( count == stack_slice.len(), -- cgit 1.4.1