Merge pull request #27 from honhimW/develop

Bump tree-sitter from 0.23 to 0.24

Cargo.toml

@@ -1,20 +1,20 @@
 [package]
 name = "ratisui"
-version = "0.1.2"
+version = "0.1.7"
 edition = "2021"
 authors = ["honhimw <honhimw@outlook.com>"]
 rust-version = "1.81.0"
 build = "build.rs"
 
 [workspace]
-members = ["ratisui-deadpool-redis", "ratisui-jaded", "ratisui-tree-sitter-ron"]
+members = ["ratisui-deadpool-redis"]
 
 [workspace.dependencies]
 log = "0.4"
 redis = "0.27"
 serde = "1"
 tokio = "1"
-tree-sitter = "0.23"
+tree-sitter = "0.24"
 
 [dependencies]
 anyhow = "1"
@@ -59,14 +59,16 @@ unicode-width = "0.2.0"
 once_cell = "1"
 futures = "0.3"
 
-jaded = { path = "ratisui-jaded", features = ["serde"] }
+jaded = { version = "0.5.0", features = ["serde"] }
 protobuf = { version = "3.7.1" }
 
 tree-sitter = { workspace = true}
-tree-sitter-highlight = "0.23"
-tree-sitter-json = "0.23"
-tree-sitter-html = "0.23"
-tree-sitter-ron = { path = "ratisui-tree-sitter-ron" }
+tree-sitter-highlight = "0.24"
+tree-sitter-json = "0.24"
+tree-sitter-html = { git = "https://github.com/honhimW/tree-sitter-html" }
+tree-sitter-ron = { git = "https://github.com/honhimW/tree-sitter-ron" }
+#tree-sitter-html = "0.23"
+#tree-sitter-ron = { path = "ratisui-tree-sitter-ron" }
 russh = { version = "0.46", default-features = false }
 async-trait = "0.1.83"
 # git crates

examples/ssh_tunnel.rs

@@ -10,6 +10,7 @@ use redis::cmd;
 use russh::client::Handler;
 use russh::keys::key;
 use std::ops::Deref;
+use std::string::ToString;
 
 const SSH_HOST: &str = "10.37.1.133";
 const SSH_PORT: u16 = 22;
@@ -18,8 +19,8 @@ const SSH_PASSWORD: &str = "123";
 
 const REDIS_HOST: &str = "redis-16430.c1.asia-northeast1-1.gce.redns.redis-cloud.com";
 const REDIS_PORT: u16 = 16430;
-const REDIS_USER: Some(String) = Some(String::from("default"));
-const REDIS_PASSWORD: Some(String) = Some(String::from("9JRCAjglNSTc4pXWOggLT7BKljwuoSSy"));
+const REDIS_USER: &str = "default";
+const REDIS_PASSWORD: &str = "9JRCAjglNSTc4pXWOggLT7BKljwuoSSy";
 
 const LOCAL_HOST: &str = "127.0.0.1";
 
@@ -50,8 +51,8 @@ async fn main() -> Result<()> {
     let pool = build_pool(common::client::Config {
         host: addr.ip().to_string(),
         port: addr.port(),
-        username: REDIS_USER.deref().clone(),
-        password: REDIS_PASSWORD.deref().clone(),
+        username: Some(REDIS_USER.to_string()),
+        password: Some(REDIS_PASSWORD.to_string()),
         ..Default::default()
     })?;
     let mut connection = pool.get().await?;

ratisui-deadpool-redis/src/lib.rs

@@ -175,7 +175,7 @@ impl managed::Manager for Manager {
 }
 
 /// Pretty format human readable redis command.
-pub fn format_cmd(cmd: &Cmd) -> String {
+fn format_cmd(cmd: &Cmd) -> String {
     let mut s = String::new();
     for x in cmd.args_iter() {
         match x {

ratisui-deadpool-redis/src/sentinel/mod.rs

@@ -10,12 +10,12 @@ use redis::sentinel::{SentinelClient, SentinelNodeConnectionInfo};
 use redis::{aio::ConnectionLike, IntoConnectionInfo, RedisError, RedisResult};
 use tokio::sync::Mutex;
 
+pub use self::config::{Config, ConfigError};
+use crate::log_cmd;
 pub use crate::sentinel::config::SentinelServerType;
 use deadpool::managed;
 pub use deadpool::managed::reexports::*;
 
-pub use self::config::{Config, ConfigError};
-
 mod config;
 
 deadpool::managed_reexports!(