replace ToAnyParam with Into<Term> in macro calls

This removes the possibility to provide a public key where a term is expected and leverages a standard trait instead of a custom one

Author: divarvel

biscuit-auth/src/token/builder/check.rs

@@ -11,8 +11,6 @@ use crate::{
     error, PublicKey,
 };
 
-#[cfg(feature = "datalog-macro")]
-use super::ToAnyParam;
 use super::{display_rule_body, Convert, Rule, Term};
 
 /// Builder for a Biscuit check
@@ -98,17 +96,12 @@ impl Check {
     }
 
     #[cfg(feature = "datalog-macro")]
-    pub fn set_macro_param<T: ToAnyParam>(
+    pub fn set_macro_param<T: Into<Term>>(
         &mut self,
         name: &str,
         param: T,
     ) -> Result<(), error::Token> {
-        use super::AnyParam;
-
-        match param.to_any_param() {
-            AnyParam::Term(t) => self.set_lenient(name, t),
-            AnyParam::PublicKey(p) => self.set_scope_lenient(name, p),
-        }
+        self.set_lenient(name, param.into())
     }
 
     // TODO maybe introduce a conversion trait to support refs, multiple values, non-pk scopes

biscuit-auth/src/token/builder/fact.rs

@@ -11,8 +11,6 @@ use crate::{
     error,
 };
 
-#[cfg(feature = "datalog-macro")]
-use super::ToAnyParam;
 use super::{Convert, Predicate, Term};
 
 /// Builder for a Datalog fact
@@ -115,17 +113,12 @@ impl Fact {
     }
 
     #[cfg(feature = "datalog-macro")]
-    pub fn set_macro_param<T: ToAnyParam>(
+    pub fn set_macro_param<T: Into<Term>>(
         &mut self,
         name: &str,
         param: T,
     ) -> Result<(), error::Token> {
-        use super::AnyParam;
-
-        match param.to_any_param() {
-            AnyParam::Term(t) => self.set_lenient(name, t),
-            AnyParam::PublicKey(_) => Ok(()),
-        }
+        self.set_lenient(name, param.into())
     }
 
     pub(super) fn apply_parameters(&mut self) {

biscuit-auth/src/token/builder/policy.rs

@@ -8,8 +8,6 @@ use nom::Finish;
 
 use crate::{error, PublicKey};
 
-#[cfg(feature = "datalog-macro")]
-use super::ToAnyParam;
 use super::{display_rule_body, Rule, Term};
 
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -91,17 +89,12 @@ impl Policy {
     }
 
     #[cfg(feature = "datalog-macro")]
-    pub fn set_macro_param<T: ToAnyParam>(
+    pub fn set_macro_param<T: Into<Term>>(
         &mut self,
         name: &str,
         param: T,
     ) -> Result<(), error::Token> {
-        use super::AnyParam;
-
-        match param.to_any_param() {
-            AnyParam::Term(t) => self.set_lenient(name, t),
-            AnyParam::PublicKey(p) => self.set_scope_lenient(name, p),
-        }
+        self.set_lenient(name, param.into())
     }
 
     // TODO maybe introduce a conversion trait to support refs, multiple values, non-pk scopes

biscuit-auth/src/token/builder/rule.rs

@@ -11,8 +11,6 @@ use crate::{
     error, PublicKey,
 };
 
-#[cfg(feature = "datalog-macro")]
-use super::ToAnyParam;
 use super::{Convert, Expression, Predicate, Scope, Term};
 
 /// Builder for a Datalog rule
@@ -245,17 +243,12 @@ impl Rule {
     }
 
     #[cfg(feature = "datalog-macro")]
-    pub fn set_macro_param<T: ToAnyParam>(
+    pub fn set_macro_param<T: Into<Term>>(
         &mut self,
         name: &str,
         param: T,
     ) -> Result<(), error::Token> {
-        use super::AnyParam;
-
-        match param.to_any_param() {
-            AnyParam::Term(t) => self.set_lenient(name, t),
-            AnyParam::PublicKey(pubkey) => self.set_scope_lenient(name, pubkey),
-        }
+        self.set_lenient(name, param.into())
     }
 
     // TODO maybe introduce a conversion trait to support refs, multiple values, non-pk scopes