Update to 0.7.0

.gitignore

@@ -5,3 +5,4 @@
 /hashbrown-0.3.0.crate
 /hashbrown-0.5.0.crate
 /hashbrown-0.6.3.crate
+/hashbrown-0.7.0.crate

0001-Upgrade-to-ahash-0.3.2.patch

@@ -1,25 +0,0 @@
-From c4945f2cde25f388654cbd4614fd1b236a128986 Mon Sep 17 00:00:00 2001
-From: Josh Stone <cuviper@gmail.com>
-Date: Mon, 27 Jan 2020 16:24:00 -0800
-Subject: [PATCH] Upgrade to ahash 0.3.2
-
----
- src/map.rs | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/map.rs b/src/map.rs
-index 5bb4a9d358b9..54890bc40dbd 100644
---- a/src/map.rs
-+++ b/src/map.rs
-@@ -10,7 +10,7 @@ use core::ops::Index;
- 
- /// Default hasher for `HashMap`.
- #[cfg(feature = "ahash")]
--pub type DefaultHashBuilder = ahash::ABuildHasher;
-+pub type DefaultHashBuilder = ahash::RandomState;
- 
- /// Dummy default hasher for `HashMap`.
- #[cfg(not(feature = "ahash"))]
--- 
-2.24.1
-

0001-Upgrade-to-rand-0.7.3.patch

@@ -1,35 +0,0 @@
-From 704f030d74f2b5b649d8936977d4360154cfaf41 Mon Sep 17 00:00:00 2001
-From: Josh Stone <cuviper@gmail.com>
-Date: Mon, 27 Jan 2020 16:29:48 -0800
-Subject: [PATCH] Upgrade to rand 0.7.3
-
----
- tests/set.rs | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/tests/set.rs b/tests/set.rs
-index 332f3f6f0771..3fc0717053b4 100644
---- a/tests/set.rs
-+++ b/tests/set.rs
-@@ -1,7 +1,7 @@
- #![cfg(not(miri))] // FIXME: takes too long
- 
- use hashbrown::HashSet;
--use rand::{distributions::Alphanumeric, Rng, SeedableRng, XorShiftRng};
-+use rand::{distributions::Alphanumeric, rngs::SmallRng, Rng, SeedableRng};
- 
- #[test]
- fn test_hashset_insert_remove() {
-@@ -12,8 +12,7 @@ fn test_hashset_insert_remove() {
-         130, 220, 246, 217, 111, 124, 221, 189, 190, 234, 121, 93, 67, 95, 100, 43,
-     ];
- 
--    let mut rng: XorShiftRng = SeedableRng::from_seed(seed);
--    //let mut rng: XorShiftRng = XorShiftRng::new_unseeded();
-+    let rng = &mut SmallRng::from_seed(seed);
-     let tx: Vec<Vec<char>> = (0..4096)
-         .map(|_| (rng.sample_iter(&Alphanumeric).take(32).collect()))
-         .collect();
--- 
-2.24.1
-

hashbrown-fix-metadata.diff

@@ -1,30 +0,0 @@
---- hashbrown-0.6.3/Cargo.toml	1970-01-01T00:00:00+00:00
-+++ hashbrown-0.6.3/Cargo.toml	2020-01-28T00:45:55.982293+00:00
-@@ -26,7 +26,7 @@
- [package.metadata.docs.rs]
- features = ["nightly", "rayon", "serde", "raw"]
- [dependencies.ahash]
--version = "0.2.11"
-+version = "0.3.2"
- optional = true
- default-features = false
- 
-@@ -59,7 +59,8 @@
- version = "1.2"
- 
- [dev-dependencies.rand]
--version = "0.5.1"
-+version = "0.7.3"
-+features = ["small_rng"]
- 
- [dev-dependencies.rayon]
- version = "1.0"
-@@ -70,7 +71,7 @@
- [dev-dependencies.serde_test]
- version = "1.0"
- [build-dependencies.autocfg]
--version = "0.1.4"
-+version = "1"
- 
- [features]
- ahash-compile-time-rng = ["ahash/compile-time-rng"]

rust-hashbrown.spec

@@ -5,20 +5,14 @@
 %global crate hashbrown
 
 Name:           rust-%{crate}
-Version:        0.6.3
+Version:        0.7.0
-Release:        4%{?dist}
+Release:        1%{?dist}
 Summary:        Rust port of Google's SwissTable hash map
 
 # Upstream license specification: Apache-2.0/MIT
 License:        ASL 2.0 or MIT
 URL:            https://crates.io/crates/hashbrown
 Source:         %{crates_source}
-# Initial patched metadata
-# * Bump to autocfg 1, https://github.com/rust-lang/hashbrown/pull/138
-# * Bump to ahash 0.3.2 and rand 0.7.3, https://github.com/rust-lang/hashbrown/pull/141
-Patch0:         hashbrown-fix-metadata.diff
-Patch1:         0001-Upgrade-to-ahash-0.3.2.patch
-Patch2:         0001-Upgrade-to-rand-0.7.3.patch
 
 ExclusiveArch:  %{rust_arches}
 %if %{__cargo_skip_build}
@@ -149,6 +143,9 @@ which use "serde" feature of "%{crate}" crate.
 %endif
 
 %changelog
+* Tue Feb 11 2020 Josh Stone <jistone@redhat.com> - 0.7.0-1
+- Update to 0.7.0
+
 * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (hashbrown-0.6.3.crate) = 660c0023fdf876a6cb54c8c1d217bccc8af0e865f8afaf65652694c0fe38b87a9d85a215833b5eeeda2a170bc7f26e8c1388845317001ad21581673398e29687
+SHA512 (hashbrown-0.7.0.crate) = f92826e4755aa97b617d2f7ec5158d9b6041e699dc2ba655827f9b91e4b3ab6037135c5e096fd54f564daa2d6a8c7120deda0e1fc442e67cbf7608580fa33a4c