From a872ce246ce2968b2e261649b9e17da704224d72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9ophile=20BR=C3=89ZOT?=
 <theophile.brezot@cosmian.com>
Date: Fri, 19 Jan 2024 14:26:34 +0100
Subject: [PATCH] fix: neats

---
 .gitignore                      |  1 +
 src/abe_policy/access_policy.rs | 32 ++++++++++++++------------------
 src/abe_policy/attribute.rs     |  8 ++++----
 3 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/.gitignore b/.gitignore
index f4e434f7..62f1ff88 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /.vscode
 Cargo.lock
 **/.#*
+**/#*#
\ No newline at end of file
diff --git a/src/abe_policy/access_policy.rs b/src/abe_policy/access_policy.rs
index c6d73cea..5b9fbe5d 100644
--- a/src/abe_policy/access_policy.rs
+++ b/src/abe_policy/access_policy.rs
@@ -32,7 +32,6 @@ impl AccessPolicy {
     /// given as a string.
     fn find_next_parenthesis(boolean_expression: &str) -> Result<usize, Error> {
         let mut count = 0;
-        let mut right_closing_parenthesis = None;
         for (index, c) in boolean_expression.chars().enumerate() {
             match c {
                 '(' => count += 1,
@@ -40,16 +39,12 @@ impl AccessPolicy {
                 _ => {}
             };
             if count < 0 {
-                right_closing_parenthesis = Some(index);
-                break;
+                return Ok(index);
             }
         }
-
-        right_closing_parenthesis.ok_or_else(|| {
-            Error::InvalidBooleanExpression(format!(
-                "Missing closing parenthesis in boolean expression {boolean_expression}"
-            ))
-        })
+        Err(Error::InvalidBooleanExpression(format!(
+            "Missing closing parenthesis in boolean expression {boolean_expression}"
+        )))
     }
 
     /// Parses the given string into an access policy.
@@ -101,16 +96,16 @@ impl AccessPolicy {
     /// - "Department::MKG Department::FIN"
     pub fn parse(mut e: &str) -> Result<Self, Error> {
         let seeker = |c: &char| !"()|&".contains(*c);
-        let mut conj = LinkedList::<Self>::new();
+        let mut q = LinkedList::<Self>::new();
         loop {
             e = e.trim();
             if e.is_empty() {
-                return Ok(Self::conj_queue(Self::Any, conj));
+                return Ok(Self::conjugate(Self::Any, q.into_iter()));
             } else {
                 match &e[..1] {
                     "(" => {
                         let offset = Self::find_next_parenthesis(&e[1..])?;
-                        conj.push_back(Self::parse(&e[1..1 + offset]).map_err(|err| {
+                        q.push_back(Self::parse(&e[1..1 + offset]).map_err(|err| {
                             Error::InvalidBooleanExpression(format!(
                                 "error while parsing '{e}': {err}"
                             ))
@@ -123,10 +118,10 @@ impl AccessPolicy {
                                 "invalid separator in: '{e}'"
                             )));
                         }
-                        let base = conj.pop_front().ok_or_else(|| {
+                        let base = q.pop_front().ok_or_else(|| {
                             Error::InvalidBooleanExpression(format!("leading OR operand in '{e}'"))
                         })?;
-                        let lhs = Self::conj_queue(base, conj);
+                        let lhs = Self::conjugate(base, q.into_iter());
                         return Ok(lhs | Self::parse(&e[2..])?);
                     }
                     "&" => {
@@ -135,7 +130,7 @@ impl AccessPolicy {
                                 "invalid leading separator in: '{e}'"
                             )));
                         }
-                        if conj.is_empty() {
+                        if q.is_empty() {
                             return Err(Error::InvalidBooleanExpression(format!(
                                 "leading AND operand in '{e}'"
                             )));
@@ -149,7 +144,7 @@ impl AccessPolicy {
                     }
                     _ => {
                         let attr: String = e.chars().take_while(seeker).collect();
-                        conj.push_back(Self::Attr(Attribute::try_from(attr.as_str())?));
+                        q.push_back(Self::Attr(Attribute::try_from(attr.as_str())?));
                         e = &e[attr.len()..];
                     }
                 }
@@ -157,8 +152,9 @@ impl AccessPolicy {
         }
     }
 
-    fn conj_queue(first: Self, q: LinkedList<Self>) -> Self {
-        q.into_iter().fold(first, |mut res, operand| {
+    /// Conjugate the access policies from the given iterator.
+    fn conjugate(first: Self, policies: impl Iterator<Item = Self>) -> Self {
+        policies.fold(first, |mut res, operand| {
             res = res & operand;
             res
         })
diff --git a/src/abe_policy/attribute.rs b/src/abe_policy/attribute.rs
index dbb864e7..8c75031e 100644
--- a/src/abe_policy/attribute.rs
+++ b/src/abe_policy/attribute.rs
@@ -67,14 +67,14 @@ impl BitOr for AttributeStatus {
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
-/// Attribute representation used to create a `Dimension` and add it to a
-/// `Policy`.
+/// Attribute representation used to create an attribute and add it to a dimension.
 pub struct AttributeBuilder {
     pub name: String,
     pub encryption_hint: EncryptionHint,
 }
-/// An attribute in a policy group is characterized by the dimension policy name
-/// and its unique name within this dimension.
+
+/// A policy attribute is composed of a dimension name and a component
+/// name.
 #[derive(Hash, PartialEq, Eq, Clone, PartialOrd, Ord, Serialize, Deserialize)]
 #[serde(try_from = "&str", into = "String")]
 pub struct Attribute {