proptest 1 is now in debian, so no need to depend on 0.9 in the crate average, also fixed a compile error in a bench suite and disabled the nightly feature

This commit is contained in:
Alexander Kjäll 2022-08-20 12:14:42 +02:00
parent 88d18ac360
commit 8539664ccd
6 changed files with 52 additions and 15 deletions

0
src/average/debian/RFS Normal file
View File

View File

@ -1,8 +1,11 @@
rust-average (0.13.1-3) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
* Package average 0.13.1 from crates.io using debcargo 2.5.0
* Updated the serde-big-array and proptest dependencies to the versions that
are in debian. Disabled the nightly feature and fixed a bug in the
benchmark suite https://github.com/vks/average/pull/23 .
-- Alexander Kjäll <alexander.kjall@gmail.com> Sun, 05 Jun 2022 10:51:42 +0200
-- Alexander Kjäll <alexander.kjall@gmail.com> Sat, 20 Aug 2022 10:38:38 +0200
rust-average (0.13.1-2) unstable; urgency=medium

View File

@ -0,0 +1,24 @@
diff --git a/Cargo.toml b/Cargo.toml
index 3a26129..ba2bc8e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -98,6 +98,5 @@ version = "0.2"
[features]
default = ["libm"]
libm = ["easy-cast/libm", "num-traits/libm"]
-nightly = []
serde1 = ["serde", "serde_derive", "serde-big-array"]
std = ["easy-cast/std", "num-traits/std"]
diff --git a/src/lib.rs b/src/lib.rs
index 9caa3d5..be0b64e 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -99,7 +99,7 @@
#![forbid(missing_debug_implementations)]
#![cfg_attr(feature = "nightly",
- feature(const_generics, const_evaluatable_checked))]
+ feature(generic_const_exprs))]
#[macro_use] mod macros;
#[macro_use] mod moments;

View File

@ -0,0 +1,22 @@
diff --git a/benches/kurtosis.rs b/benches/kurtosis.rs
index e483917..68c64fd 100644
--- a/benches/kurtosis.rs
+++ b/benches/kurtosis.rs
@@ -16,6 +16,7 @@ fn initialize_vec() -> Vec<f64> {
values
}
+#[cfg(feature = "libm")]
fn bench_kurtosis(b: &mut Bencher) {
let values = initialize_vec();
b.iter(|| {
@@ -32,5 +33,9 @@ fn bench_moments(b: &mut Bencher) {
});
}
+#[cfg(feature = "libm")]
benchmark_group!(benches, bench_kurtosis, bench_moments);
+#[cfg(not(feature = "libm"))]
+benchmark_group!(benches, bench_moments);
+
benchmark_main!(benches);

View File

@ -1,13 +0,0 @@
diff --git a/Cargo.toml b/Cargo.toml
index 3a26129..b7d4282 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -75,7 +75,7 @@ version = "0.1"
version = "=1.4"
[dev-dependencies.proptest]
-version = "1"
+version = "0.9"
[dev-dependencies.quantiles]
version = "0.7"

View File

@ -1,3 +1,4 @@
relax-float-ord-dep.patch
tweak-byteorder-and-serde-big-array-versions.patch
relax-proptest-dep.patch
feature-gate-bench.patch
disable-nightly-feature.patch