You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@avro.apache.org by mg...@apache.org on 2022/03/03 11:48:42 UTC
[avro] branch branch-1.11 updated: AVRO-3428: Rust: Restructure the RUST SDK to a Rust workspace (#1575)
This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a commit to branch branch-1.11
in repository https://gitbox.apache.org/repos/asf/avro.git
The following commit(s) were added to refs/heads/branch-1.11 by this push:
new 08405f7 AVRO-3428: Rust: Restructure the RUST SDK to a Rust workspace (#1575)
08405f7 is described below
commit 08405f71971e1e70a9d7571decf5c13d13bd6086
Author: Martin Grigorov <ma...@users.noreply.github.com>
AuthorDate: Thu Mar 3 13:48:07 2022 +0200
AVRO-3428: Rust: Restructure the RUST SDK to a Rust workspace (#1575)
* AVRO-3428: Rust: Restructure the RUST SDK to a Rust workspace
Signed-off-by: Martin Tzvetanov Grigorov <mg...@apache.org>
* AVRO-3428: Add ASL to the new root Cargo.toml
Signed-off-by: Martin Tzvetanov Grigorov <mg...@apache.org>
(cherry picked from commit 5194d60ce70b6b848830f1e8ebbec1f44df0fcf6)
---
lang/rust/Cargo.toml | 70 ++-------------------
lang/rust/{ => avro}/Cargo.toml | 0
lang/rust/{ => avro}/benches/quickstop-null.avro | Bin
lang/rust/{ => avro}/benches/serde.rs | 0
lang/rust/{ => avro}/benches/serde_json.rs | 0
lang/rust/{ => avro}/benches/single.rs | 0
lang/rust/{ => avro}/examples/benchmark.rs | 0
.../{ => avro}/examples/generate_interop_data.rs | 0
lang/rust/{ => avro}/examples/test_interop_data.rs | 0
lang/rust/{ => avro}/examples/to_value.rs | 0
lang/rust/{ => avro}/src/codec.rs | 0
lang/rust/{ => avro}/src/de.rs | 0
lang/rust/{ => avro}/src/decimal.rs | 0
lang/rust/{ => avro}/src/decode.rs | 0
lang/rust/{ => avro}/src/duration.rs | 0
lang/rust/{ => avro}/src/encode.rs | 0
lang/rust/{ => avro}/src/error.rs | 0
lang/rust/{ => avro}/src/lib.rs | 0
lang/rust/{ => avro}/src/rabin.rs | 0
lang/rust/{ => avro}/src/reader.rs | 0
lang/rust/{ => avro}/src/schema.rs | 0
lang/rust/{ => avro}/src/schema_compatibility.rs | 0
lang/rust/{ => avro}/src/ser.rs | 0
lang/rust/{ => avro}/src/types.rs | 0
lang/rust/{ => avro}/src/util.rs | 0
lang/rust/{ => avro}/src/writer.rs | 0
lang/rust/{ => avro}/tests/io.rs | 0
lang/rust/{ => avro}/tests/schema.rs | 0
28 files changed, 4 insertions(+), 66 deletions(-)
diff --git a/lang/rust/Cargo.toml b/lang/rust/Cargo.toml
index 13cc9c5..9a8e9ea 100644
--- a/lang/rust/Cargo.toml
+++ b/lang/rust/Cargo.toml
@@ -15,69 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-[package]
-name = "apache-avro"
-version = "0.14.0"
-authors = ["Apache Avro team <de...@avro.apache.org>"]
-description = "A library for working with Apache Avro in Rust"
-license = "Apache-2.0"
-readme = "README.md"
-repository = "https://github.com/apache/avro"
-edition = "2018"
-keywords = ["avro", "data", "serialization"]
-categories = ["encoding"]
-documentation = "https://docs.rs/apache-avro"
-
-[features]
-snappy = ["crc32fast", "snap"]
-zstandard = ["zstd"]
-bzip = ["bzip2"]
-xz = ["xz2"]
-
-[lib]
-path = "src/lib.rs"
-# disable benchmarks to allow passing criterion arguments to `cargo bench`
-bench = false
-
-[[bench]]
-name = "serde"
-harness = false
-
-[[bench]]
-name = "serde_json"
-harness = false
-
-[[bench]]
-name = "single"
-harness = false
-
-[dependencies]
-byteorder = "1.4.3"
-bzip2 = { version = "0.4.3", optional = true }
-crc32fast = { version = "1.3.2", optional = true }
-digest = "0.10.3"
-libflate = "1.1.2"
-xz2 = { version = "0.1.6", optional = true }
-num-bigint = "0.4.3"
-rand = "0.8.5"
-regex = "1.5.4"
-serde_json = "1.0.79"
-serde = { version = "1.0.136", features = ["derive"] }
-snap = { version = "1.0.5", optional = true }
-strum = "0.24.0"
-strum_macros = "0.24.0"
-thiserror = "1.0.30"
-typed-builder = "0.10.0"
-uuid = { version = "0.8.2", features = ["serde", "v4"] }
-zerocopy = "0.6.1"
-lazy_static = "1.4.0"
-log = "0.4.14"
-zstd = { version = "0.10.0+zstd.1.5.2" , optional = true }
-
-[dev-dependencies]
-md-5 = "0.10.0"
-sha2 = "0.10.1"
-criterion = "0.3.5"
-anyhow = "1.0.53"
-hex-literal = "0.3.4"
-env_logger = "0.9.0"
+[workspace]
+members = [
+ "avro",
+]
diff --git a/lang/rust/Cargo.toml b/lang/rust/avro/Cargo.toml
similarity index 100%
copy from lang/rust/Cargo.toml
copy to lang/rust/avro/Cargo.toml
diff --git a/lang/rust/benches/quickstop-null.avro b/lang/rust/avro/benches/quickstop-null.avro
similarity index 100%
rename from lang/rust/benches/quickstop-null.avro
rename to lang/rust/avro/benches/quickstop-null.avro
diff --git a/lang/rust/benches/serde.rs b/lang/rust/avro/benches/serde.rs
similarity index 100%
rename from lang/rust/benches/serde.rs
rename to lang/rust/avro/benches/serde.rs
diff --git a/lang/rust/benches/serde_json.rs b/lang/rust/avro/benches/serde_json.rs
similarity index 100%
rename from lang/rust/benches/serde_json.rs
rename to lang/rust/avro/benches/serde_json.rs
diff --git a/lang/rust/benches/single.rs b/lang/rust/avro/benches/single.rs
similarity index 100%
rename from lang/rust/benches/single.rs
rename to lang/rust/avro/benches/single.rs
diff --git a/lang/rust/examples/benchmark.rs b/lang/rust/avro/examples/benchmark.rs
similarity index 100%
rename from lang/rust/examples/benchmark.rs
rename to lang/rust/avro/examples/benchmark.rs
diff --git a/lang/rust/examples/generate_interop_data.rs b/lang/rust/avro/examples/generate_interop_data.rs
similarity index 100%
rename from lang/rust/examples/generate_interop_data.rs
rename to lang/rust/avro/examples/generate_interop_data.rs
diff --git a/lang/rust/examples/test_interop_data.rs b/lang/rust/avro/examples/test_interop_data.rs
similarity index 100%
rename from lang/rust/examples/test_interop_data.rs
rename to lang/rust/avro/examples/test_interop_data.rs
diff --git a/lang/rust/examples/to_value.rs b/lang/rust/avro/examples/to_value.rs
similarity index 100%
rename from lang/rust/examples/to_value.rs
rename to lang/rust/avro/examples/to_value.rs
diff --git a/lang/rust/src/codec.rs b/lang/rust/avro/src/codec.rs
similarity index 100%
rename from lang/rust/src/codec.rs
rename to lang/rust/avro/src/codec.rs
diff --git a/lang/rust/src/de.rs b/lang/rust/avro/src/de.rs
similarity index 100%
rename from lang/rust/src/de.rs
rename to lang/rust/avro/src/de.rs
diff --git a/lang/rust/src/decimal.rs b/lang/rust/avro/src/decimal.rs
similarity index 100%
rename from lang/rust/src/decimal.rs
rename to lang/rust/avro/src/decimal.rs
diff --git a/lang/rust/src/decode.rs b/lang/rust/avro/src/decode.rs
similarity index 100%
rename from lang/rust/src/decode.rs
rename to lang/rust/avro/src/decode.rs
diff --git a/lang/rust/src/duration.rs b/lang/rust/avro/src/duration.rs
similarity index 100%
rename from lang/rust/src/duration.rs
rename to lang/rust/avro/src/duration.rs
diff --git a/lang/rust/src/encode.rs b/lang/rust/avro/src/encode.rs
similarity index 100%
rename from lang/rust/src/encode.rs
rename to lang/rust/avro/src/encode.rs
diff --git a/lang/rust/src/error.rs b/lang/rust/avro/src/error.rs
similarity index 100%
rename from lang/rust/src/error.rs
rename to lang/rust/avro/src/error.rs
diff --git a/lang/rust/src/lib.rs b/lang/rust/avro/src/lib.rs
similarity index 100%
rename from lang/rust/src/lib.rs
rename to lang/rust/avro/src/lib.rs
diff --git a/lang/rust/src/rabin.rs b/lang/rust/avro/src/rabin.rs
similarity index 100%
rename from lang/rust/src/rabin.rs
rename to lang/rust/avro/src/rabin.rs
diff --git a/lang/rust/src/reader.rs b/lang/rust/avro/src/reader.rs
similarity index 100%
rename from lang/rust/src/reader.rs
rename to lang/rust/avro/src/reader.rs
diff --git a/lang/rust/src/schema.rs b/lang/rust/avro/src/schema.rs
similarity index 100%
rename from lang/rust/src/schema.rs
rename to lang/rust/avro/src/schema.rs
diff --git a/lang/rust/src/schema_compatibility.rs b/lang/rust/avro/src/schema_compatibility.rs
similarity index 100%
rename from lang/rust/src/schema_compatibility.rs
rename to lang/rust/avro/src/schema_compatibility.rs
diff --git a/lang/rust/src/ser.rs b/lang/rust/avro/src/ser.rs
similarity index 100%
rename from lang/rust/src/ser.rs
rename to lang/rust/avro/src/ser.rs
diff --git a/lang/rust/src/types.rs b/lang/rust/avro/src/types.rs
similarity index 100%
rename from lang/rust/src/types.rs
rename to lang/rust/avro/src/types.rs
diff --git a/lang/rust/src/util.rs b/lang/rust/avro/src/util.rs
similarity index 100%
rename from lang/rust/src/util.rs
rename to lang/rust/avro/src/util.rs
diff --git a/lang/rust/src/writer.rs b/lang/rust/avro/src/writer.rs
similarity index 100%
rename from lang/rust/src/writer.rs
rename to lang/rust/avro/src/writer.rs
diff --git a/lang/rust/tests/io.rs b/lang/rust/avro/tests/io.rs
similarity index 100%
rename from lang/rust/tests/io.rs
rename to lang/rust/avro/tests/io.rs
diff --git a/lang/rust/tests/schema.rs b/lang/rust/avro/tests/schema.rs
similarity index 100%
rename from lang/rust/tests/schema.rs
rename to lang/rust/avro/tests/schema.rs