Merge pull request #230 from hackerchai/upgrade-tokio

Upgrade tokio

.github/workflows/changelog.yml

@@ -1,11 +1,8 @@
 name: Changelog Generator
 
 on:
-  push:
-    branches:
-      - master
-    tags:
-      - '*'
+  release:
+    types: [created, edited]
 
 jobs:
   generate_changelog_file:

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [Unreleased](https://github.com/casbin/casbin-rs/tree/HEAD)
+
+[Full Changelog](https://github.com/casbin/casbin-rs/compare/v2.0.5...HEAD)
+
+**Implemented enhancements:**
+
+- Support policy.csv comment or YAML file adapter [\#213](https://github.com/casbin/casbin-rs/issues/213)
+
 ## [v2.0.5](https://github.com/casbin/casbin-rs/tree/v2.0.5) (2020-12-24)
 
 [Full Changelog](https://github.com/casbin/casbin-rs/compare/v2.0.3...v2.0.5)
@@ -10,6 +18,7 @@
 
 **Fixed bugs:**
 
+- not currently running on the Tokio runtime on tonic [\#221](https://github.com/casbin/casbin-rs/issues/221)
 - CSV loader deletes double quotes [\#214](https://github.com/casbin/casbin-rs/issues/214)
 
 **Closed issues:**

Cargo.toml

@@ -8,20 +8,20 @@ license     = "Apache-2.0"
 name        = "casbin"
 readme      = "README.md"
 repository  = "https://github.com/casbin/casbin-rs"
-version     = "2.0.5"
+version     = "2.0.6"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-async-std   = { version = "1.8.0", optional = true }
-async-trait = "0.1.37"
-globset     = { version = "0.4.5", optional = true }
-indexmap    = "1.6.0"
+async-std   = { version = "1.9.0", optional = true }
+async-trait = "0.1.42"
+globset     = { version = "0.4.6", optional = true }
+indexmap    = "1.6.1"
 ip_network  = { version = "0.3.4", optional = true }
 lazy_static = "1.4.0"
-lru         = { version = "0.6.2", optional = true }
-regex       = "1.4.0"
-rhai        = { version = "0.19.7", features = [
+lru         = { version = "0.6.3", optional = true }
+regex       = "1.4.3"
+rhai        = { version = "0.19.10", features = [
     "sync",
     "only_i32",
     "no_function",
@@ -31,12 +31,13 @@ rhai        = { version = "0.19.7", features = [
     "serde",
     "unchecked",
 ] }
-serde       = "1.0.115"
+serde       = "1.0.123"
 slog        = { version = "2.7.0", optional = true }
 slog-async  = { version = "2.5.0", optional = true }
 slog-term   = { version = "2.6.0", optional = true }
-thiserror   = "1.0.20"
-tokio       = { version = "~0.2", optional = true, default-features = false }
+thiserror   = "1.0.23"
+tokio       = { version = "1.1.1", optional = true, default-features = false }
+tokio-stream = { version = "0.1", optional = true, default-features = false }
 
 [features]
 default = ["runtime-async-std", "incremental"]
@@ -52,13 +53,13 @@ runtime-tokio     = ["tokio/fs", "tokio/io-util"]
 watcher           = []
 
 [target.'cfg(target_arch = "wasm32")'.dev-dependencies]
-async-std = { version = "1.8.0", features = ["attributes"] }
-serde     = { version = "1.0.115", features = ["derive"] }
+async-std = { version = "1.9.0", features = ["attributes"] }
+serde     = { version = "1.0.123", features = ["derive"] }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
-async-std = { version = "1.8.0", features = ["attributes"] }
-serde     = { version = "1.0.115", features = ["derive"] }
-tokio     = { version = "~0.2", features = ["full"] }
+async-std = { version = "1.9.0", features = ["attributes"] }
+serde     = { version = "1.0.123", features = ["derive"] }
+tokio     = { version = "1.1.1", features = ["full"] }
 
 [profile.release]
 codegen-units = 1

README.md

@@ -33,8 +33,8 @@ Add this package to `Cargo.toml` of your project. (Check https://crates.io/crate
 
 ```toml
 [dependencies]
-casbin = { version = "2.0.5", default-features = false, features = ["runtime-async-std", "logging", "incremental"] }
-async-std = { version = "1.8", features = ["attributes"] }
+casbin = { version = "2.0.6", default-features = false, features = ["runtime-async-std", "logging", "incremental"] }
+async-std = { version = "1.9", features = ["attributes"] }
 ```
 
 ## Get started

src/adapter/file_adapter.rs

@@ -24,7 +24,6 @@ use std::{
 use tokio::{
     fs::File,
     io::{AsyncBufReadExt, AsyncWriteExt, BufReader},
-    stream::StreamExt,
 };
 
 use async_trait::async_trait;
@@ -58,9 +57,14 @@ where
     ) -> Result<()> {
         let f = File::open(&self.file_path).await?;
         let mut lines = BufReader::new(f).lines();
-
+        #[cfg(feature = "runtime-async-std")]
         while let Some(line) = lines.next().await {
-            handler(line?, m);
+            handler(line?, m)
+        }
+
+        #[cfg(feature = "runtime-tokio")]
+        while let Some(line) = lines.next_line().await? {
+            handler(line, m)
         }
 
         Ok(())
@@ -76,12 +80,20 @@ where
         let mut lines = BufReader::new(f).lines();
 
         let mut is_filtered = false;
+        #[cfg(feature = "runtime-async-std")]
         while let Some(line) = lines.next().await {
             if handler(line?, m, &filter) {
                 is_filtered = true;
             }
         }
 
+        #[cfg(feature = "runtime-tokio")]
+        while let Some(line) = lines.next_line().await? {
+            if handler(line, m, &filter) {
+                is_filtered = true;
+            }
+        }
+
         Ok(is_filtered)
     }
 

src/convert.rs

@@ -131,9 +131,7 @@ macro_rules! impl_args {
         {
             fn try_into_vec(self) -> Result<Vec<Dynamic>> {
                 let ($($p,)*) = self;
-
-                let mut _v = Vec::new();
-                $(_v.push(to_dynamic($p)?);)*
+                let _v = vec![$(to_dynamic($p)?,)*];
 
                 Ok(_v)
             }

src/enforcer.rs

@@ -226,7 +226,7 @@ impl CoreApi for Enforcer {
 
         let mut engine = Engine::new_raw();
 
-        engine.load_package(CASBIN_PACKAGE.get());
+        engine.register_global_module(CASBIN_PACKAGE.as_shared_module());
 
         for (key, &func) in fm.get_functions() {
             engine.register_fn(key, func);

src/rbac/default_role_manager.rs

@@ -152,11 +152,9 @@ impl RoleManager for DefaultRoleManager {
         let role2 = self.create_role(name2, domain);
 
         if !role1.write().unwrap().add_role(role2) {
-            return;
+            #[cfg(feature = "cached")]
+            self.cache.clear();
         }
-
-        #[cfg(feature = "cached")]
-        self.cache.clear();
     }
 
     fn matching_fn(

src/rbac_api.rs

@@ -630,8 +630,7 @@ mod tests {
 
             #[cfg(feature = "runtime-tokio")]
             {
-                tokio::runtime::Builder::new()
-                    .basic_scheduler()
+                tokio::runtime::Builder::new_multi_thread()
                     .enable_all()
                     .build()
                     .unwrap()