Merge pull request #45 from dmitrypol/main

dmitrypol · web-flow · commit b8f2e5847158 · 2024-06-23T11:34:53.000-07:00
renamed redis-module-macros and redis-module-macros-internals to valk…
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "valkey-module"
-version = "0.1.0"
+version = "0.1.1"
 authors = ["Dmitry Polyakovsky <dmitry.polyakovsky@oracle.com>"]
 edition = "2021"
 build = "build.rs"
@@ -132,14 +132,14 @@ linkme = "0.3"
 serde = { version = "1", features = ["derive"] }
 nix = "0.26"
 cfg-if = "1"
-redis-module-macros-internals = { path = "./redismodule-rs-macros-internals", version = "2.0.7"}
+valkey-module-macros-internals = { path = "valkeymodule-rs-macros-internals", version = "0.1.1"}
 log = "0.4"
 
 [dev-dependencies]
 anyhow = "1"
 redis = "0.25"
 lazy_static = "1"
-redis-module-macros = { path = "./redismodule-rs-macros"}
+valkey-module-macros = { path = "valkeymodule-rs-macros", version = "0.1.1" }
 valkey-module = { path = "./", default-features = false, features = ["min-redis-compatibility-version-7-2"] }
 
 [build-dependencies]
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
 
 # valkeymodule-rs
 
-This crate provides an idiomatic Rust API for the [Valkey Modules API](https://redis.io/topics/modules-intro).
+This crate provides an idiomatic Rust API for the [Valkey Modules API](https://valkey.io/docs/topics/modules-api-ref/).
 It allows writing Valkey modules in Rust, without needing to use raw pointers or unsafe code. See [here](https://docs.rs/valkey-module/latest) for the most recent API documentation.
 
 This repo was forked from [redismodule-rs](https://github.com/RedisLabsModules/redismodule-rs).  We appreciate the contributions of the original authors.  
@@ -26,4 +26,4 @@ This repo was forked from [redismodule-rs](https://github.com/RedisLabsModules/r
 See the [examples](examples) directory for some sample modules.
 
 This crate tries to provide high-level wrappers around the standard Valkey Modules API, while preserving the API's basic concepts.
-Therefore, following the [Valkeyi Modules API](https://redis.io/topics/modules-intro) documentation will be mostly relevant here as well.
+Therefore, following the [Valkeyi Modules API](https://valkey.io/docs/topics/modules-api-ref/) documentation will be mostly relevant here as well.
diff --git a/examples/info_handler_builder.rs b/examples/info_handler_builder.rs
@@ -1,4 +1,4 @@
-use redis_module_macros::info_command_handler;
+use valkey_module_macros::info_command_handler;
 use valkey_module::InfoContext;
 use valkey_module::{valkey_module, ValkeyResult};
 
diff --git a/examples/info_handler_macro.rs b/examples/info_handler_macro.rs
@@ -1,4 +1,4 @@
-use redis_module_macros::info_command_handler;
+use valkey_module_macros::info_command_handler;
 use valkey_module::{valkey_module, ValkeyResult};
 use valkey_module::{InfoContext, Status};
 
diff --git a/examples/info_handler_multiple_sections.rs b/examples/info_handler_multiple_sections.rs
@@ -1,4 +1,4 @@
-use redis_module_macros::{info_command_handler, InfoSection};
+use valkey_module_macros::{info_command_handler, InfoSection};
 use valkey_module::InfoContext;
 use valkey_module::{valkey_module, ValkeyResult};
 
diff --git a/examples/info_handler_struct.rs b/examples/info_handler_struct.rs
@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use redis_module_macros::{info_command_handler, InfoSection};
+use valkey_module_macros::{info_command_handler, InfoSection};
 use valkey_module::InfoContext;
 use valkey_module::{valkey_module, ValkeyResult};
 
diff --git a/examples/open_key_with_flags.rs b/examples/open_key_with_flags.rs
@@ -1,4 +1,4 @@
-use redis_module_macros::command;
+use valkey_module_macros::command;
 use valkey_module::{
     key::KeyFlags, valkey_module, Context, NextArg, ValkeyError, ValkeyResult, ValkeyString,
     ValkeyValue,
diff --git a/examples/proc_macro_commands.rs b/examples/proc_macro_commands.rs
@@ -1,6 +1,6 @@
 use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};
 
-use redis_module_macros::{command, ValkeyValue};
+use valkey_module_macros::{command, ValkeyValue};
 use valkey_module::ValkeyError;
 use valkey_module::{valkey_module, Context, ValkeyResult, ValkeyString, ValkeyValue};
 
diff --git a/examples/server_events.rs b/examples/server_events.rs
@@ -1,6 +1,6 @@
 use std::sync::atomic::{AtomicI64, Ordering};
 
-use redis_module_macros::{config_changed_event_handler, cron_event_handler, flush_event_handler};
+use valkey_module_macros::{config_changed_event_handler, cron_event_handler, flush_event_handler};
 use valkey_module::{
     server_events::FlushSubevent, valkey_module, Context, ValkeyResult, ValkeyString, ValkeyValue,
 };
diff --git a/src/context/commands.rs b/src/context/commands.rs
@@ -5,7 +5,7 @@ use crate::ValkeyError;
 use bitflags::bitflags;
 use libc::c_char;
 use linkme::distributed_slice;
-use redis_module_macros_internals::api;
+use valkey_module_macros_internals::api;
 use std::ffi::CString;
 use std::mem::MaybeUninit;
 use std::os::raw::c_int;
diff --git a/src/context/mod.rs b/src/context/mod.rs
@@ -1,5 +1,5 @@
 use bitflags::bitflags;
-use redis_module_macros_internals::api;
+use valkey_module_macros_internals::api;
 use std::collections::{BTreeMap, HashMap};
 use std::ffi::CString;
 use std::os::raw::c_void;
diff --git a/src/logging.rs b/src/logging.rs
@@ -7,7 +7,7 @@ const NOT_INITIALISED_MESSAGE: &str = "Valkey module hasn't been initialised.";
 
 /// [ValkeyLogLevel] is a level of logging which can be used when
 /// logging with Redis. See [raw::RedisModule_Log] and the official
-/// redis [reference](https://redis.io/docs/reference/modules/modules-api-ref/).
+/// valkey [reference](https://valkey.io/docs/topics/modules-api-ref/).
 #[derive(Clone, Copy, Debug, AsRefStr)]
 #[strum(serialize_all = "snake_case")]
 pub enum ValkeyLogLevel {
diff --git a/src/macros.rs b/src/macros.rs
@@ -167,7 +167,7 @@ macro_rules! valkey_module {
 
         // The old-style info command handler, if specified.
         $(
-            #[redis_module_macros::info_command_handler]
+            #[valkey_module_macros::info_command_handler]
             #[inline]
             fn module_info(ctx: &InfoContext, for_crash_report: bool) -> ValkeyResult<()> {
                 $info_func(ctx, for_crash_report);
diff --git a/valkeymodule-rs-macros-internals/Cargo.toml b/valkeymodule-rs-macros-internals/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
-name = "redis-module-macros-internals"
-version = "2.0.7"
-authors = ["Meir Shpilraien <meir@redis.com>"]
+name = "valkey-module-macros-internals"
+version = "0.1.1"
+authors = ["Dmitry Polyakovsky <dmitry.polyakovsky@oracle.com"]
 edition = "2021"
-description = "A macros crate for redismodule-rs"
+description = "A macros crate for valkeymodule-rs"
 license = "BSD-3-Clause"
-repository = "https://github.com/RedisLabsModules/redismodule-rs"
-keywords = ["redis", "plugin"]
+repository = "https://github.com/valkey-io/valkeymodule-rs"
+keywords = ["valkey", "plugin"]
 categories = ["database", "api-bindings"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -18,6 +18,6 @@ lazy_static = "1"
 proc-macro2 = "1"
 
 [lib]
-name = "redis_module_macros_internals"
+name = "valkey_module_macros_internals"
 path = "src/lib.rs"
 proc-macro = true
diff --git a/valkeymodule-rs-macros-internals/src/api_versions.rs b/valkeymodule-rs-macros-internals/src/api_versions.rs
diff --git a/valkeymodule-rs-macros-internals/src/lib.rs b/valkeymodule-rs-macros-internals/src/lib.rs
diff --git a/valkeymodule-rs-macros/Cargo.toml b/valkeymodule-rs-macros/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
-name = "redis-module-macros"
-version = "99.99.99"
-authors = ["Meir Shpilraien <meir@redis.com>"]
+name = "valkey-module-macros"
+version = "0.1.1"
+authors = ["Dmitry Polyakovsky <dmitry.polyakovsky@oracle.com>"]
 edition = "2021"
-description = "A macros crate for redismodule-rs"
+description = "A macros crate for valkeymodule-rs"
 license = "BSD-3-Clause"
-repository = "https://github.com/RedisLabsModules/redismodule-rs"
-keywords = ["redis", "plugin"]
+repository = "https://github.com/valkey-io/valkeymodule-rs"
+keywords = ["valkey", "plugin"]
 categories = ["database", "api-bindings"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -19,6 +19,6 @@ serde = { version = "1", features = ["derive"] }
 serde_syn = "0.1.0"
 
 [lib]
-name = "redis_module_macros"
+name = "valkey_module_macros"
 path = "src/lib.rs"
 proc-macro = true
diff --git a/valkeymodule-rs-macros/src/command.rs b/valkeymodule-rs-macros/src/command.rs
diff --git a/valkeymodule-rs-macros/src/info_section.rs b/valkeymodule-rs-macros/src/info_section.rs
diff --git a/valkeymodule-rs-macros/src/lib.rs b/valkeymodule-rs-macros/src/lib.rs
diff --git a/valkeymodule-rs-macros/src/redis_value.rs b/valkeymodule-rs-macros/src/redis_value.rs

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-use redis_module_macros::info_command_handler;`
	`1`	`+use valkey_module_macros::info_command_handler;`
`2`	`2`	`use valkey_module::InfoContext;`
`3`	`3`	`use valkey_module::{valkey_module, ValkeyResult};`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-use redis_module_macros::{info_command_handler, InfoSection};`
	`1`	`+use valkey_module_macros::{info_command_handler, InfoSection};`
`2`	`2`	`use valkey_module::InfoContext;`
`3`	`3`	`use valkey_module::{valkey_module, ValkeyResult};`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-use redis_module_macros::command;`
	`1`	`+use valkey_module_macros::command;`
`2`	`2`	`use valkey_module::{`
`3`	`3`	`key::KeyFlags, valkey_module, Context, NextArg, ValkeyError, ValkeyResult, ValkeyString,`
`4`	`4`	`ValkeyValue,`