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 2023/07/08 21:22:46 UTC
[avro] branch branch-1.11 updated: Bump libflate from 1.2.0 to 2.0.0 in /lang/rust (#2331)
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 78d27e2fd Bump libflate from 1.2.0 to 2.0.0 in /lang/rust (#2331)
78d27e2fd is described below
commit 78d27e2fded897ce7b19db85db198ea95cc428e9
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Sun Jul 9 00:22:08 2023 +0300
Bump libflate from 1.2.0 to 2.0.0 in /lang/rust (#2331)
* Bump libflate from 1.2.0 to 2.0.0 in /lang/rust
Bumps [libflate](https://github.com/sile/libflate) from 1.2.0 to 2.0.0.
- [Release notes](https://github.com/sile/libflate/releases)
- [Commits](https://github.com/sile/libflate/compare/1.2.0...2.0.0)
---
updated-dependencies:
- dependency-name: libflate
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <su...@github.com>
* Enable "std" feature for libflate dependency
Signed-off-by: Martin Tzvetanov Grigorov <mg...@apache.org>
* Simplify test code
Signed-off-by: Martin Tzvetanov Grigorov <mg...@apache.org>
---------
Signed-off-by: dependabot[bot] <su...@github.com>
Signed-off-by: Martin Tzvetanov Grigorov <mg...@apache.org>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
Co-authored-by: Martin Tzvetanov Grigorov <mg...@apache.org>
(cherry picked from commit 0cc1850a045f92e8c369093da4e010f7e5c64b97)
---
lang/rust/Cargo.lock | 53 ++++++++++++++++++++++++++++++-----
lang/rust/avro/Cargo.toml | 2 +-
lang/rust/avro_derive/tests/derive.rs | 7 ++---
3 files changed, 49 insertions(+), 13 deletions(-)
diff --git a/lang/rust/Cargo.lock b/lang/rust/Cargo.lock
index 0ecc7a821..9092b3c17 100644
--- a/lang/rust/Cargo.lock
+++ b/lang/rust/Cargo.lock
@@ -23,6 +23,17 @@ version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234"
+[[package]]
+name = "ahash"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "version_check",
+]
+
[[package]]
name = "aho-corasick"
version = "1.0.1"
@@ -277,6 +288,15 @@ dependencies = [
"wasm-bindgen",
]
+[[package]]
+name = "core2"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b49ba7ef1ad6107f8824dbe97de947cbaac53c44e7f9756a1fba0d37c1eec505"
+dependencies = [
+ "memchr",
+]
+
[[package]]
name = "cpufeatures"
version = "0.2.2"
@@ -383,6 +403,12 @@ dependencies = [
"syn 2.0.23",
]
+[[package]]
+name = "dary_heap"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7762d17f1241643615821a8455a0b2c3e803784b058693d990b11f2dce25a0ca"
+
[[package]]
name = "diff"
version = "0.1.13"
@@ -459,6 +485,15 @@ version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+[[package]]
+name = "hashbrown"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+dependencies = [
+ "ahash",
+]
+
[[package]]
name = "heck"
version = "0.4.1"
@@ -504,7 +539,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399"
dependencies = [
"autocfg",
- "hashbrown",
+ "hashbrown 0.12.3",
]
[[package]]
@@ -554,21 +589,25 @@ checksum = "505e71a4706fa491e9b1b55f51b95d4037d0821ee40131190475f692b35b009b"
[[package]]
name = "libflate"
-version = "1.2.0"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05605ab2bce11bcfc0e9c635ff29ef8b2ea83f29be257ee7d730cac3ee373093"
+checksum = "9f7d5654ae1795afc7ff76f4365c2c8791b0feb18e8996a96adad8ffd7c3b2bf"
dependencies = [
"adler32",
+ "core2",
"crc32fast",
+ "dary_heap",
"libflate_lz77",
]
[[package]]
name = "libflate_lz77"
-version = "1.1.0"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39a734c0493409afcd49deee13c006a04e3586b9761a03543c6272c9c51f2f5a"
+checksum = "be5f52fb8c451576ec6b79d3f4deb327398bc05bbdbd99021a6e77a4c855d524"
dependencies = [
+ "core2",
+ "hashbrown 0.13.2",
"rle-decode-fast",
]
@@ -661,9 +700,9 @@ dependencies = [
[[package]]
name = "once_cell"
-version = "1.13.0"
+version = "1.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1"
+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
[[package]]
name = "oorandom"
diff --git a/lang/rust/avro/Cargo.toml b/lang/rust/avro/Cargo.toml
index d992fdac0..e59a81f46 100644
--- a/lang/rust/avro/Cargo.toml
+++ b/lang/rust/avro/Cargo.toml
@@ -60,7 +60,7 @@ bzip2 = { default-features = false, version = "0.4.4", optional = true }
crc32fast = { default-features = false, version = "1.3.2", optional = true }
digest = { default-features = false, version = "0.10.7", features = ["core-api"] }
lazy_static = { default-features = false, version = "1.4.0" }
-libflate = { default-features = false, version = "1.2.0" }
+libflate = { default-features = false, version = "2.0.0", features = ["std"] }
log = { default-features = false, version = "0.4.19" }
num-bigint = { default-features = false, version = "0.4.3" }
regex = { default-features = false, version = "1.9.0", features = ["std", "perf"] }
diff --git a/lang/rust/avro_derive/tests/derive.rs b/lang/rust/avro_derive/tests/derive.rs
index 3dc217b6a..0bfc9a95c 100644
--- a/lang/rust/avro_derive/tests/derive.rs
+++ b/lang/rust/avro_derive/tests/derive.rs
@@ -31,10 +31,7 @@ extern crate serde;
#[cfg(test)]
mod test_derive {
use apache_avro::schema::{Alias, EnumSchema, RecordSchema};
- use std::{
- borrow::{Borrow, Cow},
- sync::Mutex,
- };
+ use std::{borrow::Cow, sync::Mutex};
use super::*;
@@ -866,7 +863,7 @@ mod test_derive {
// test serde with manual equality for mutex
let test = serde(test);
assert_eq!("hey", test.a);
- assert_eq!(vec![42], *test.b.borrow().lock().unwrap());
+ assert_eq!(vec![42], *test.b.lock().unwrap());
assert_eq!(Cow::Owned::<i32>(32), test.c);
}