From 25c841aecdc26d9058a8784ad67e5fe3143fc9b2 Mon Sep 17 00:00:00 2001
From: Peter Burnett <peterburnett@catalyst-au.net>
Date: Sun, 17 Dec 2023 19:02:22 +1000
Subject: [PATCH] feat: fix incompatible trait implementation with Casbin-rs
 2.1.0 (#84)

* fix: Update trait definition for casbin-rs 2.1.0 (#83)

* fix: clippy fix for redundant guard
---
 Cargo.toml     | 4 ++--
 src/actions.rs | 2 +-
 src/adapter.rs | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index d1122ea..a0c777a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,7 @@ version     = "0.9.0"
 [dependencies]
 async-std   = { version = "1.9.0", default-features = false, optional = true }
 async-trait = "0.1.42"
-casbin      = { version = "2.0.6", default-features = false }
+casbin      = { version = "2.1.0", default-features = false }
 diesel      = { version = "2.0.3", default-features = false, features = ["r2d2"] }
 futures     = "0.3"
 libsqlite3-sys = { version = "0.26.0", features = ["bundled"] }
@@ -38,4 +38,4 @@ lto           = true
 opt-level     = 3
 
 [profile.dev]
-split-debuginfo = "unpacked"
\ No newline at end of file
+split-debuginfo = "unpacked"
diff --git a/src/actions.rs b/src/actions.rs
index 028bf19..b0a2ea9 100644
--- a/src/actions.rs
+++ b/src/actions.rs
@@ -133,7 +133,7 @@ pub fn remove_policies(mut conn: Pool, pt: &str, rules: Vec<Vec<String>>) -> Res
                 .and(v5.eq(&rule[5]));
 
             match diesel::delete(casbin_rule.filter(filter)).execute(conn) {
-                Ok(n) if n == 1 => continue,
+                Ok(1) => continue,
                 _ => return Err(DieselError::RollbackTransaction),
             }
         }
diff --git a/src/adapter.rs b/src/adapter.rs
index c8afa8d..b49c3ac 100644
--- a/src/adapter.rs
+++ b/src/adapter.rs
@@ -146,7 +146,7 @@ fn normalize_policy(casbin_rule: &CasbinRule) -> Option<Vec<String>> {
 
 #[async_trait]
 impl Adapter for DieselAdapter {
-    async fn load_policy(&self, m: &mut dyn Model) -> Result<()> {
+    async fn load_policy(&mut self, m: &mut dyn Model) -> Result<()> {
         let conn = self
             .pool
             .get()