From b86c1981cc90be95fa3c31f03a3dafe2f3cd2e6b Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Dec 15 2018 10:30:26 +0000
Subject: bump crossbeam-* to 0.6


Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>

---

diff --git a/crossbeam-deque-fix-metadata.diff b/crossbeam-deque-fix-metadata.diff
index 8d99a43..4b69598 100644
--- a/crossbeam-deque-fix-metadata.diff
+++ b/crossbeam-deque-fix-metadata.diff
@@ -1,11 +1,17 @@
 --- crossbeam-deque-0.4.1/Cargo.toml	1970-01-01T01:00:00+01:00
-+++ crossbeam-deque-0.4.1/Cargo.toml	2018-10-28T02:28:32.432268+02:00
-@@ -26,7 +26,7 @@
- version = "0.5.0"
++++ crossbeam-deque-0.4.1/Cargo.toml	2018-12-15T11:22:39.344038+01:00
+@@ -23,11 +23,11 @@
+ license = "MIT/Apache-2.0"
+ repository = "https://github.com/crossbeam-rs/crossbeam-deque"
+ [dependencies.crossbeam-epoch]
+-version = "0.5.0"
++version = "0.6.0"
  
  [dependencies.crossbeam-utils]
 -version = "0.4.0"
-+version = "0.5.0"
++version = "0.6.0"
  [dev-dependencies.rand]
- version = "0.4"
+-version = "0.4"
++version = "0.6"
  [badges.travis-ci]
+ repository = "crossbeam-rs/crossbeam-deque"
diff --git a/crossbeam-deque-update-crossbeam-utils.diff b/crossbeam-deque-update-crossbeam-utils.diff
index 9819888..edea88b 100644
--- a/crossbeam-deque-update-crossbeam-utils.diff
+++ b/crossbeam-deque-update-crossbeam-utils.diff
@@ -1,6 +1,6 @@
 diff -uNr crossbeam-deque-0.4.1.orig/src/lib.rs crossbeam-deque-0.4.1/src/lib.rs
 --- crossbeam-deque-0.4.1.orig/src/lib.rs	2018-05-04 17:10:16.000000000 +0200
-+++ crossbeam-deque-0.4.1/src/lib.rs	2018-09-08 12:15:07.091505555 +0200
++++ crossbeam-deque-0.4.1/src/lib.rs	2018-12-15 11:27:56.178977718 +0100
 @@ -95,7 +95,7 @@
  use std::sync::atomic::Ordering::{Acquire, Relaxed, Release, SeqCst};
  
@@ -10,3 +10,12 @@ diff -uNr crossbeam-deque-0.4.1.orig/src/lib.rs crossbeam-deque-0.4.1/src/lib.rs
  
  /// Minimum buffer capacity for a deque.
  const DEFAULT_MIN_CAP: usize = 16;
+@@ -224,7 +224,7 @@
+             .swap(Owned::new(new).into_shared(guard), Release, guard);
+ 
+         // Destroy the old buffer later.
+-        guard.defer(move || old.into_owned());
++        guard.defer_unchecked(move || old.into_owned());
+ 
+         // If the buffer is very large, then flush the thread-local garbage in order to
+         // deallocate it as soon as possible.
diff --git a/rust-crossbeam-deque0.4.spec b/rust-crossbeam-deque0.4.spec
index 3c0d05d..706298f 100644
--- a/rust-crossbeam-deque0.4.spec
+++ b/rust-crossbeam-deque0.4.spec
@@ -7,7 +7,7 @@
 
 Name:           rust-%{crate}0.4
 Version:        0.4.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Concurrent work-stealing deque
 
 # Upstream license specification: MIT/Apache-2.0
@@ -15,7 +15,7 @@ License:        MIT or ASL 2.0
 URL:            https://crates.io/crates/crossbeam-deque
 Source0:        https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate
 # Initial patched metadata
-# * Bump crossbeam-utils to 0.5
+# * Bump crossbeam-* to 0.6, rand to 0.6
 Patch0:         crossbeam-deque-fix-metadata.diff
 # Make it work with new crossbeam-utils
 Patch0001:      crossbeam-deque-update-crossbeam-utils.diff
@@ -23,10 +23,10 @@ Patch0001:      crossbeam-deque-update-crossbeam-utils.diff
 ExclusiveArch:  %{rust_arches}
 
 BuildRequires:  rust-packaging
-BuildRequires:  (crate(crossbeam-epoch/default) >= 0.5.0 with crate(crossbeam-epoch/default) < 0.6.0)
-BuildRequires:  (crate(crossbeam-utils/default) >= 0.5.0 with crate(crossbeam-utils/default) < 0.6.0)
+BuildRequires:  (crate(crossbeam-epoch/default) >= 0.6.0 with crate(crossbeam-epoch/default) < 0.7.0)
+BuildRequires:  (crate(crossbeam-utils/default) >= 0.6.0 with crate(crossbeam-utils/default) < 0.7.0)
 %if %{with check}
-BuildRequires:  (crate(rand/default) >= 0.4.0 with crate(rand/default) < 0.5.0)
+BuildRequires:  (crate(rand/default) >= 0.6.0 with crate(rand/default) < 0.7.0)
 %endif
 
 %global _description \
@@ -76,6 +76,9 @@ which use "default" feature of "%{crate}" crate.
 %endif
 
 %changelog
+* Sat Dec 15 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org - 0.4.1-7
+- Bump crossbeam-* to 0.6, rand to 0.6
+
 * Sun Oct 28 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.4.1-6
 - Adapt to new packaging