Skip to content

Commit

Permalink
Merge pull request #9 from negezor/update-dependencies
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
daniel7grant authored Apr 1, 2024
2 parents 55ff184 + 45dca71 commit 2e6f8f5
Show file tree
Hide file tree
Showing 12 changed files with 490 additions and 340 deletions.
412 changes: 234 additions & 178 deletions Cargo.lock

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@ license = "MIT"
keywords = ["redis", "macro", "derive", "json"]

[dependencies]
redis = { version = "0.23.0", optional = true }
redis = { version = "0.25", optional = true }
redis-macros-derive = { version = "0.2.1", optional = true, path = "./redis-macros-derive" }
serde = { version = "1.0.152", features = ["derive"], optional = true }
serde_json = { version = "1.0.91", optional = true }
serde = { version = "1.0", features = ["derive"], optional = true }
serde_json = { version = "1.0", optional = true }

[features]
default = ["json", "macros"]
json = ["dep:redis", "dep:serde", "dep:serde_json"]
macros = ["dep:redis-macros-derive"]

[dev-dependencies]
deadpool-redis = "0.12.0"
redis = { version = "0.23.0", features = ["tokio-comp", "json"] }
serde_yaml = "0.9.16"
tokio = { version = "1.24.1", features = ["full"] }
deadpool-redis = "0.15"
redis = { version = "0.25", features = ["tokio-comp", "json"] }
serde_yaml = "0.9"
tokio = { version = "1.37", features = ["full"] }
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ To install it, simply add the package `redis-macros`. This package is a helper f

```toml
[dependencies]
redis-macros = "0.1.0"
redis = { version = "0.22.2" }
serde = { version = "1.0.152", features = ["derive"] }
serde_json = { version = "1.0.91" }
redis-macros = "0.2.1"
redis = { version = "0.25.2" }
serde = { version = "1.0", features = ["derive"] }
serde_json = { version = "1.0" }
```

## Basic usage
Expand Down
2 changes: 1 addition & 1 deletion examples/derive_async.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ struct User {
async fn main() -> RedisResult<()> {
// Open new async connection to localhost
let client = Client::open("redis://localhost:6379")?;
let mut con = client.get_async_connection().await.map_err(|_| {
let mut con = client.get_multiplexed_async_connection().await.map_err(|_| {
RedisError::from((
ErrorKind::InvalidClientConfig,
"Cannot connect to localhost:6379. Try starting a redis-server process or container.",
Expand Down
2 changes: 1 addition & 1 deletion examples/derive_redisjson.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ struct User {
async fn main() -> RedisResult<()> {
// Open new connection to localhost
let client = Client::open("redis://localhost:6379")?;
let mut con = client.get_async_connection().await.map_err(|_| {
let mut con = client.get_multiplexed_async_connection().await.map_err(|_| {
RedisError::from((
ErrorKind::InvalidClientConfig,
"Cannot connect to localhost:6379. Try starting a redis-server process or container.",
Expand Down
2 changes: 1 addition & 1 deletion examples/derive_yaml.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ struct User {
async fn main() -> RedisResult<()> {
// Open new async connection to localhost
let client = Client::open("redis://localhost:6379")?;
let mut con = client.get_async_connection().await.map_err(|_| {
let mut con = client.get_multiplexed_async_connection().await.map_err(|_| {
RedisError::from((
ErrorKind::InvalidClientConfig,
"Cannot connect to localhost:6379. Try starting a redis-server process or container.",
Expand Down
2 changes: 1 addition & 1 deletion examples/json_wrapper_basic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ struct User {
async fn main() -> RedisResult<()> {
// Open new connection to localhost
let client = Client::open("redis://localhost:6379")?;
let mut con = client.get_async_connection().await.map_err(|_| {
let mut con = client.get_multiplexed_async_connection().await.map_err(|_| {
RedisError::from((
ErrorKind::InvalidClientConfig,
"Cannot connect to localhost:6379. Try starting a redis-server process or container.",
Expand Down
2 changes: 1 addition & 1 deletion examples/json_wrapper_modify.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ struct User {
async fn main() -> RedisResult<()> {
// Open new connection to localhost
let client = Client::open("redis://localhost:6379")?;
let mut con = client.get_async_connection().await.map_err(|_| {
let mut con = client.get_multiplexed_async_connection().await.map_err(|_| {
RedisError::from((
ErrorKind::InvalidClientConfig,
"Cannot connect to localhost:6379. Try starting a redis-server process or container.",
Expand Down
Loading

0 comments on commit 2e6f8f5

Please sign in to comment.