From 4404ec224f5dc2d6600ece6d67300ef37377ad56 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sep 14 2019 16:33:14 +0000 Subject: Update to 0.3.0 Signed-off-by: Igor Gnatenko --- diff --git a/.gitignore b/.gitignore index 351876d..4849edc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /criterion-0.2.10.crate /criterion-0.2.11.crate +/criterion-0.3.0.crate diff --git a/0001-Update-rand-dependencies-to-those-in-0.7.patch b/0001-Update-rand-dependencies-to-those-in-0.7.patch deleted file mode 100644 index f7d451c..0000000 --- a/0001-Update-rand-dependencies-to-those-in-0.7.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 7f4967318998e613fc8bf0d10961468feb836677 Mon Sep 17 00:00:00 2001 -From: Jon Gjengset -Date: Wed, 24 Jul 2019 10:38:50 -0400 -Subject: [PATCH] Update rand dependencies to those in 0.7 - ---- - src/stats/rand_util.rs | 2 +- - src/stats/test.rs | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/stats/rand_util.rs b/src/stats/rand_util.rs -index fefbc6e..7a72783 100644 ---- a/src/stats/rand_util.rs -+++ b/src/stats/rand_util.rs -@@ -7,7 +7,7 @@ use std::cell::RefCell; - pub type Rng = Xoshiro256StarStar; - - thread_local! { -- static SEED_RAND: RefCell = RefCell::new(OsRng::new().unwrap()); -+ static SEED_RAND: RefCell = RefCell::new(OsRng); - } - - pub fn new_rng() -> Rng { -diff --git a/src/stats/test.rs b/src/stats/test.rs -index e6fc0fd..185c991 100644 ---- a/src/stats/test.rs -+++ b/src/stats/test.rs -@@ -1,5 +1,5 @@ - use rand::distributions::{Distribution, Standard}; --use rand::{self, FromEntropy, Rng}; -+use rand::prelude::*; - use rand_xoshiro::Xoshiro256StarStar; - - pub fn vec(size: usize, start: usize) -> Option> --- -2.22.0 - diff --git a/criterion-fix-metadata.diff b/criterion-fix-metadata.diff deleted file mode 100644 index 8490a28..0000000 --- a/criterion-fix-metadata.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- criterion-0.2.11/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ criterion-0.2.11/Cargo.toml 2019-08-06T06:47:48.832751+00:00 -@@ -59,14 +59,14 @@ - version = "0.2" - - [dependencies.rand_core] --version = "0.3" -+version = "0.5" - default-features = false - - [dependencies.rand_os] --version = "0.1" -+version = "0.2" - - [dependencies.rand_xoshiro] --version = "0.1" -+version = "0.3" - - [dependencies.rayon] - version = "1.0.3" -@@ -97,7 +97,7 @@ - default-features = false - - [dev-dependencies.rand] --version = "0.6" -+version = "0.7" - - [dev-dependencies.tempdir] - version = "0.3.7" diff --git a/rust-criterion.spec b/rust-criterion.spec index 0aaa384..1f96502 100644 --- a/rust-criterion.spec +++ b/rust-criterion.spec @@ -5,19 +5,14 @@ %global crate criterion Name: rust-%{crate} -Version: 0.2.11 -Release: 4%{?dist} +Version: 0.3.0 +Release: 1%{?dist} Summary: Statistics-driven micro-benchmarking library # Upstream license specification: Apache-2.0/MIT License: ASL 2.0 or MIT URL: https://crates.io/crates/criterion Source: %{crates_source} -# Initial patched metadata -# * Update rand to 0.7, https://github.com/bheisler/criterion.rs/pull/309 -Patch0: criterion-fix-metadata.diff -# Finish rand update -Patch0001: 0001-Update-rand-dependencies-to-those-in-0.7.patch ExclusiveArch: %{rust_arches} %if %{__cargo_skip_build} @@ -57,30 +52,6 @@ which use "default" feature of "%{crate}" crate. %files -n %{name}+default-devel %ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml -%package -n %{name}+criterion-plot-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+criterion-plot-devel %{_description} - -This package contains library source intended for building other packages -which use "criterion-plot" feature of "%{crate}" crate. - -%files -n %{name}+criterion-plot-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml - -%package -n %{name}+html_reports-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+html_reports-devel %{_description} - -This package contains library source intended for building other packages -which use "html_reports" feature of "%{crate}" crate. - -%files -n %{name}+html_reports-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml - %package -n %{name}+real_blackbox-devel Summary: %{summary} BuildArch: noarch @@ -93,18 +64,6 @@ which use "real_blackbox" feature of "%{crate}" crate. %files -n %{name}+real_blackbox-devel %ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml -%package -n %{name}+tinytemplate-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+tinytemplate-devel %{_description} - -This package contains library source intended for building other packages -which use "tinytemplate" feature of "%{crate}" crate. - -%files -n %{name}+tinytemplate-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml - %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 %cargo_prep @@ -124,6 +83,9 @@ which use "tinytemplate" feature of "%{crate}" crate. %endif %changelog +* Sat Sep 14 18:32:15 CEST 2019 Igor Gnatenko - 0.3.0-1 +- Update to 0.3.0 + * Tue Aug 06 08:47:48 CEST 2019 Igor Gnatenko - 0.2.11-4 - Update rand to 0.7 diff --git a/sources b/sources index 316b7c3..ae277d8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (criterion-0.2.11.crate) = b2bbf3053392db8fe74b6da9da25bcf2eca5b4c6c72e393f485c4cd9aa978cdff88383d95562e0cc542497aa8e71f45f2c315441b0e1d486d842d34066929cbe +SHA512 (criterion-0.3.0.crate) = d1110f0699493281013980dbeeccb93553e4147e138bde7ab4a6bffcd522385fb74e8f3f15c2bac32661c56fc720ba808e6483223ca4cae05b2a1da7307de620