existing crate to redis subdir

mxbrt · Jul 16, 2022 · f20e044 · f20e044
1 parent 36fa7e3
commit f20e044
Show file tree

Hide file tree

Showing 45 changed files with 142 additions and 140 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,139 +1,2 @@
-[package]
-name = "redis"
-version = "0.21.5"
-keywords = ["redis", "database"]
-description = "Redis driver for Rust."
-homepage = "https://github.com/redis-rs/redis-rs"
-repository = "https://github.com/redis-rs/redis-rs"
-documentation = "https://docs.rs/redis"
-license = "BSD-3-Clause"
-edition = "2018"
-rust-version = "1.57"
-
-[package.metadata.docs.rs]
-all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
-
-[dependencies]
-# These two are generally really common simple dependencies so it does not seem
-# much of a point to optimize these, but these could in theory be removed for
-# an indirection through std::Formatter.
-ryu = "1.0"
-itoa = "1.0"
-
-# This is a dependency that already exists in url
-percent-encoding = "2.1"
-
-# We need this for redis url parsing
-url = "2.1"
-
-# We need this for script support
-sha1_smol = { version = "1.0", optional = true }
-
-combine = { version = "4.6", default-features = false, features = ["std"] }
-
-# Only needed for AIO
-bytes = { version = "1", optional = true }
-futures-util = { version = "0.3.15", default-features = false, optional = true }
-pin-project-lite = { version = "0.2", optional = true }
-tokio-util = { version = "0.7", optional = true }
-tokio = { version = "1", features = ["rt", "net"], optional = true }
-
-# Only needed for the connection manager
-arc-swap = { version = "1.1.0", optional = true }
-futures = { version = "0.3.3", optional = true }
-
-# Only needed for the r2d2 feature
-r2d2 = { version = "0.8.8", optional = true }
-
-# Only needed for cluster
-crc16 = { version = "0.4", optional = true }
-rand = { version = "0.8", optional = true }
-# Only needed for async_std support
-async-std = { version = "1.8.0", optional = true}
-async-trait = { version = "0.1.24", optional = true }
-
-# Only needed for TLS
-native-tls = { version = "0.2", optional = true }
-tokio-native-tls = { version = "0.3", optional = true }
-async-native-tls = { version = "0.4", optional = true }
-
-# Optional aHash support
-ahash = { version = "0.7.6", optional = true }
-
-[features]
-default = ["acl", "streams", "geospatial", "script"]
-acl = []
-aio = ["bytes", "pin-project-lite", "futures-util", "futures-util/alloc", "futures-util/sink", "tokio/io-util", "tokio-util", "tokio-util/codec", "tokio/sync", "combine/tokio", "async-trait"]
-geospatial = []
-cluster = ["crc16", "rand"]
-script = ["sha1_smol"]
-tls = ["native-tls"]
-async-std-comp = ["aio", "async-std"]
-async-std-tls-comp = ["async-std-comp", "async-native-tls", "tls"]
-tokio-comp = ["aio", "tokio", "tokio/net"]
-tokio-native-tls-comp = ["tls", "tokio-native-tls"]
-connection-manager = ["arc-swap", "futures", "aio"]
-streams = []
-
-
-[dev-dependencies]
-rand = "0.8"
-socket2 = "0.4"
-assert_approx_eq = "1.0"
-fnv = "1.0.5"
-futures = "0.3"
-criterion = "0.3"
-partial-io = { version = "0.5", features = ["tokio", "quickcheck1"] }
-quickcheck = "1.0.3"
-tokio = { version = "1", features = ["rt", "macros", "rt-multi-thread", "time"] }
-tempfile = "3.2"
-
-[[test]]
-name = "test_async"
-required-features = ["tokio-comp"]
-
-[[test]]
-name = "test_async_async_std"
-required-features = ["async-std-comp"]
-
-[[test]]
-name = "parser"
-required-features = ["aio"]
-
-[[test]]
-name = "test_acl"
-
-[[bench]]
-name = "bench_basic"
-harness = false
-required-features = ["tokio-comp"]
-
-[[bench]]
-name = "bench_cluster"
-harness = false
-required-features = ["cluster"]
-
-[[example]]
-name = "async-multiplexed"
-required-features = ["tokio-comp"]
-
-[[example]]
-name = "async-await"
-required-features = ["aio"]
-
-[[example]]
-name = "async-pub-sub"
-required-features = ["aio"]
-
-[[example]]
-name = "async-scan"
-required-features = ["aio"]
-
-[[example]]
-name = "async-connection-loss"
-required-features = ["connection-manager"]
-
-[[example]]
-name = "streams"
-required-features = ["streams"]
+[workspace]
+members = ["redis"]
diff --git a/afl/parser/Cargo.toml b/afl/parser/Cargo.toml
@@ -14,4 +14,4 @@ path = "src/reproduce.rs"
 
 [dependencies]
 afl = "0.4"
-redis = { path = "../../" }
+redis = { path = "../../redis" }
diff --git a/redis/Cargo.toml b/redis/Cargo.toml
@@ -0,0 +1,139 @@
+[package]
+name = "redis"
+version = "0.21.5"
+keywords = ["redis", "database"]
+description = "Redis driver for Rust."
+homepage = "https://github.com/redis-rs/redis-rs"
+repository = "https://github.com/redis-rs/redis-rs"
+documentation = "https://docs.rs/redis"
+license = "BSD-3-Clause"
+edition = "2018"
+rust-version = "1.57"
+
+[package.metadata.docs.rs]
+all-features = true
+rustdoc-args = ["--cfg", "docsrs"]
+
+[dependencies]
+# These two are generally really common simple dependencies so it does not seem
+# much of a point to optimize these, but these could in theory be removed for
+# an indirection through std::Formatter.
+ryu = "1.0"
+itoa = "1.0"
+
+# This is a dependency that already exists in url
+percent-encoding = "2.1"
+
+# We need this for redis url parsing
+url = "2.1"
+
+# We need this for script support
+sha1_smol = { version = "1.0", optional = true }
+
+combine = { version = "4.6", default-features = false, features = ["std"] }
+
+# Only needed for AIO
+bytes = { version = "1", optional = true }
+futures-util = { version = "0.3.15", default-features = false, optional = true }
+pin-project-lite = { version = "0.2", optional = true }
+tokio-util = { version = "0.7", optional = true }
+tokio = { version = "1", features = ["rt", "net"], optional = true }
+
+# Only needed for the connection manager
+arc-swap = { version = "1.1.0", optional = true }
+futures = { version = "0.3.3", optional = true }
+
+# Only needed for the r2d2 feature
+r2d2 = { version = "0.8.8", optional = true }
+
+# Only needed for cluster
+crc16 = { version = "0.4", optional = true }
+rand = { version = "0.8", optional = true }
+# Only needed for async_std support
+async-std = { version = "1.8.0", optional = true}
+async-trait = { version = "0.1.24", optional = true }
+
+# Only needed for TLS
+native-tls = { version = "0.2", optional = true }
+tokio-native-tls = { version = "0.3", optional = true }
+async-native-tls = { version = "0.4", optional = true }
+
+# Optional aHash support
+ahash = { version = "0.7.6", optional = true }
+
+[features]
+default = ["acl", "streams", "geospatial", "script"]
+acl = []
+aio = ["bytes", "pin-project-lite", "futures-util", "futures-util/alloc", "futures-util/sink", "tokio/io-util", "tokio-util", "tokio-util/codec", "tokio/sync", "combine/tokio", "async-trait"]
+geospatial = []
+cluster = ["crc16", "rand"]
+script = ["sha1_smol"]
+tls = ["native-tls"]
+async-std-comp = ["aio", "async-std"]
+async-std-tls-comp = ["async-std-comp", "async-native-tls", "tls"]
+tokio-comp = ["aio", "tokio", "tokio/net"]
+tokio-native-tls-comp = ["tls", "tokio-native-tls"]
+connection-manager = ["arc-swap", "futures", "aio"]
+streams = []
+
+
+[dev-dependencies]
+rand = "0.8"
+socket2 = "0.4"
+assert_approx_eq = "1.0"
+fnv = "1.0.5"
+futures = "0.3"
+criterion = "0.3"
+partial-io = { version = "0.5", features = ["tokio", "quickcheck1"] }
+quickcheck = "1.0.3"
+tokio = { version = "1", features = ["rt", "macros", "rt-multi-thread", "time"] }
+tempfile = "3.2"
+
+[[test]]
+name = "test_async"
+required-features = ["tokio-comp"]
+
+[[test]]
+name = "test_async_async_std"
+required-features = ["async-std-comp"]
+
+[[test]]
+name = "parser"
+required-features = ["aio"]
+
+[[test]]
+name = "test_acl"
+
+[[bench]]
+name = "bench_basic"
+harness = false
+required-features = ["tokio-comp"]
+
+[[bench]]
+name = "bench_cluster"
+harness = false
+required-features = ["cluster"]
+
+[[example]]
+name = "async-multiplexed"
+required-features = ["tokio-comp"]
+
+[[example]]
+name = "async-await"
+required-features = ["aio"]
+
+[[example]]
+name = "async-pub-sub"
+required-features = ["aio"]
+
+[[example]]
+name = "async-scan"
+required-features = ["aio"]
+
+[[example]]
+name = "async-connection-loss"
+required-features = ["connection-manager"]
+
+[[example]]
+name = "streams"
+required-features = ["streams"]
diff --git a/benches/bench_basic.rs → redis/benches/bench_basic.rs b/benches/bench_basic.rs → redis/benches/bench_basic.rs
diff --git a/benches/bench_cluster.rs → redis/benches/bench_cluster.rs b/benches/bench_cluster.rs → redis/benches/bench_cluster.rs
diff --git a/examples/async-await.rs → redis/examples/async-await.rs b/examples/async-await.rs → redis/examples/async-await.rs
diff --git a/examples/async-connection-loss.rs → redis/examples/async-connection-loss.rs b/examples/async-connection-loss.rs → redis/examples/async-connection-loss.rs
diff --git a/examples/async-multiplexed.rs → redis/examples/async-multiplexed.rs b/examples/async-multiplexed.rs → redis/examples/async-multiplexed.rs
diff --git a/examples/async-pub-sub.rs → redis/examples/async-pub-sub.rs b/examples/async-pub-sub.rs → redis/examples/async-pub-sub.rs
diff --git a/examples/async-scan.rs → redis/examples/async-scan.rs b/examples/async-scan.rs → redis/examples/async-scan.rs
diff --git a/examples/basic.rs → redis/examples/basic.rs b/examples/basic.rs → redis/examples/basic.rs
diff --git a/examples/geospatial.rs → redis/examples/geospatial.rs b/examples/geospatial.rs → redis/examples/geospatial.rs
diff --git a/examples/streams.rs → redis/examples/streams.rs b/examples/streams.rs → redis/examples/streams.rs
diff --git a/src/acl.rs → redis/src/acl.rs b/src/acl.rs → redis/src/acl.rs
diff --git a/src/aio.rs → redis/src/aio.rs b/src/aio.rs → redis/src/aio.rs
diff --git a/src/aio/async_std.rs → redis/src/aio/async_std.rs b/src/aio/async_std.rs → redis/src/aio/async_std.rs
diff --git a/src/aio/tokio.rs → redis/src/aio/tokio.rs b/src/aio/tokio.rs → redis/src/aio/tokio.rs
diff --git a/src/client.rs → redis/src/client.rs b/src/client.rs → redis/src/client.rs
diff --git a/src/cluster.rs → redis/src/cluster.rs b/src/cluster.rs → redis/src/cluster.rs
diff --git a/src/cluster_client.rs → redis/src/cluster_client.rs b/src/cluster_client.rs → redis/src/cluster_client.rs
diff --git a/src/cluster_pipeline.rs → redis/src/cluster_pipeline.rs b/src/cluster_pipeline.rs → redis/src/cluster_pipeline.rs
diff --git a/src/cluster_routing.rs → redis/src/cluster_routing.rs b/src/cluster_routing.rs → redis/src/cluster_routing.rs
diff --git a/src/cmd.rs → redis/src/cmd.rs b/src/cmd.rs → redis/src/cmd.rs
diff --git a/src/commands.rs → redis/src/commands.rs b/src/commands.rs → redis/src/commands.rs
diff --git a/src/connection.rs → redis/src/connection.rs b/src/connection.rs → redis/src/connection.rs
diff --git a/src/geo.rs → redis/src/geo.rs b/src/geo.rs → redis/src/geo.rs
diff --git a/src/lib.rs → redis/src/lib.rs b/src/lib.rs → redis/src/lib.rs
diff --git a/src/macros.rs → redis/src/macros.rs b/src/macros.rs → redis/src/macros.rs
diff --git a/src/parser.rs → redis/src/parser.rs b/src/parser.rs → redis/src/parser.rs
diff --git a/src/pipeline.rs → redis/src/pipeline.rs b/src/pipeline.rs → redis/src/pipeline.rs
diff --git a/src/r2d2.rs → redis/src/r2d2.rs b/src/r2d2.rs → redis/src/r2d2.rs
diff --git a/src/script.rs → redis/src/script.rs b/src/script.rs → redis/src/script.rs
diff --git a/src/streams.rs → redis/src/streams.rs b/src/streams.rs → redis/src/streams.rs
diff --git a/src/types.rs → redis/src/types.rs b/src/types.rs → redis/src/types.rs
diff --git a/tests/parser.rs → redis/tests/parser.rs b/tests/parser.rs → redis/tests/parser.rs
diff --git a/tests/support/cluster.rs → redis/tests/support/cluster.rs b/tests/support/cluster.rs → redis/tests/support/cluster.rs
diff --git a/tests/support/mod.rs → redis/tests/support/mod.rs b/tests/support/mod.rs → redis/tests/support/mod.rs
diff --git a/tests/test_acl.rs → redis/tests/test_acl.rs b/tests/test_acl.rs → redis/tests/test_acl.rs
diff --git a/tests/test_async.rs → redis/tests/test_async.rs b/tests/test_async.rs → redis/tests/test_async.rs
diff --git a/tests/test_async_async_std.rs → redis/tests/test_async_async_std.rs b/tests/test_async_async_std.rs → redis/tests/test_async_async_std.rs
diff --git a/tests/test_basic.rs → redis/tests/test_basic.rs b/tests/test_basic.rs → redis/tests/test_basic.rs
diff --git a/tests/test_cluster.rs → redis/tests/test_cluster.rs b/tests/test_cluster.rs → redis/tests/test_cluster.rs
diff --git a/tests/test_geospatial.rs → redis/tests/test_geospatial.rs b/tests/test_geospatial.rs → redis/tests/test_geospatial.rs
diff --git a/tests/test_streams.rs → redis/tests/test_streams.rs b/tests/test_streams.rs → redis/tests/test_streams.rs
diff --git a/tests/test_types.rs → redis/tests/test_types.rs b/tests/test_types.rs → redis/tests/test_types.rs