Merge branch 'akubera:trunk' into trunk

Author: Amejonah1200

.circleci/config.yml

@@ -1,17 +1,17 @@
 version: 2.1
 orbs:
-# codecov: codecov/codecov@3.2.4
-  rust: circleci/[email protected].0
+  # codecov: codecov/codecov@3.3.0
+  rust: circleci/[email protected].1
 
 jobs:
   build-and-test:
     parameters:
       rust-version:
         type: string
-        default: "1.69.0"
+        default: "1.75.0"
       debian-version:
         type: string
-        default: "buster"
+        default: "bookworm"
       rust-features:
         type: string
         default: "--all-targets"
@@ -49,7 +49,7 @@ jobs:
         type: string
       debian-version:
         type: string
-        default: "bullseye"
+        default: "bookworm"
     machine: true
     steps:
       - checkout
@@ -65,54 +65,92 @@ jobs:
               sh -c 'cargo test -q --no-run && kcov-rust && upload-kcov-results-to-codecov'
       - store_artifacts:
           path: target/cov
-      # - store_test_results:
-      #     path: target
 
   lint-check:
     docker:
-      - image: cimg/rust:1.69
+      - image: cimg/rust:1.75
     steps:
       - checkout
+      - run:
+          name: Generate cargo.lock
+          command: cargo generate-lockfile
       - rust/build:
           with_cache: false
       # - rust/format
-      # - rust/clippy
+      - rust/clippy
       - rust/test
       - run:
           name: Build examples
           command: cargo build --examples
 
+  cargo-semver-check:
+    docker:
+      - image: "akubera/rust:stable"
+    steps:
+      - checkout
+      - run:
+          name: Tool Versions
+          command: >
+            rustc --version
+            && cargo --version
+            && cargo semver-checks --version
+      - run:
+          name: cargo semver-checks
+          command: cargo semver-checks --verbose
+      - run:
+          name: cargo semver-checks (no-std)
+          command: cargo semver-checks --verbose --only-explicit-features
+
 workflows:
   version: 2
   cargo:build-and-test:
     jobs:
+    - rust/lint-test-build:
+        name: "lint-test-build:stable"
+        release: true
+        version: "1.75"
+        pre-steps:
+            - checkout
+            - run:
+                command: cargo generate-lockfile
+    - rust/lint-test-build:
+        name: "lint-test-build:1.56"
+        release: true
+        version: "1.56"
+
     - lint-check
+
+    - build-and-test:
+        name: build-and-test:MSRV
+        rust-version: "1.43.1"
+        debian-version: "buster"
+
     - build-and-test:
-        matrix:
-          parameters:
-            rust-version:
-            - "1.43.1"
-            - "1.54.0"
+        name: build-and-test:MSRV:serde
+        rust-version: "1.43.1"
+        debian-version: "buster"
+        rust-features: "--all-targets --features='serde'"
 
     - build-and-test:
-       name: build-and-test:latest
-       debian-version: "bullseye"
+        name: build-and-test:latest
 
     - build-and-test:
-        matrix:
-          parameters:
-            rust-version:
-            - "1.43.1"
-            - "1.69.0"
-            rust-features:
-            - "--features='serde'"
-            - "--features='serde,string-only'"
+        name: build-and-test:latest:serde
+        rust-features: "--all-targets --features='serde'"
 
     - build-and-test:
-       name: build-and-test:no-default-features
-       rust-features: "--no-default-features"
+        name: build-and-test:no_std
+        rust-features: "--no-default-features"
+
+    - build-and-test:
+        name: build-and-test:serde+no_std
+        rust-features: "--no-default-features --features='serde'"
+
+    - cargo-semver-check:
+        requires:
+        - build-and-test:latest:serde
 
     - upload-coverage:
-        rust-version: "1.69.0"
+        rust-version: "1.75.0"
         requires:
-        - build-and-test:latest
+        - build-and-test:latest:serde

.gitlab-ci.yml

@@ -118,7 +118,7 @@ cargo:check:
   <<: *script-cargo-check
   script:
     # enable property tests for the stable 'pipeline'
-    - scripts/bigdecimal-property-tests cargo check --all-targets
+    - scripts/bigdecimal-property-tests run cargo check --all-targets
 
 cargo:clippy:
   stage: check
@@ -158,7 +158,7 @@ cargo:build-stable:
   <<: *script-cargo-build
   script:
     # enable property tests for the stable 'pipeline'
-    - scripts/bigdecimal-property-tests cargo build --all-targets
+    - scripts/bigdecimal-property-tests run cargo build --all-targets
 
 
 cargo:test-stable:
@@ -171,7 +171,7 @@ cargo:test-stable:
   <<: *script-cargo-test
   script:
     # enable property tests for the stable 'pipeline'
-    - scripts/bigdecimal-property-tests cargo test
+    - scripts/bigdecimal-property-tests run cargo test
 
 
 cargo:build:no-std:
@@ -197,6 +197,29 @@ cargo:test:no-std:
     - cargo test --no-default-features --lib
 
 
+cargo:build:serde:
+  stage: build
+  image: akubera/rust:stable
+  needs:
+    - cargo:check
+  variables:
+    RUST_CACHE_KEY: "stable+serde"
+  <<: *script-cargo-build
+  script:
+    - cargo build --features=serde --all-targets
+
+cargo:test:serde:
+  stage: test
+  image: akubera/rust:stable
+  needs:
+    - "cargo:build:serde"
+  variables:
+    RUST_CACHE_KEY: "stable+serde"
+  <<: *script-cargo-test
+  script:
+    - cargo test --features=serde --all-targets
+
+
 cargo:build-nightly:
   stage: build
   image: rustlang/rust:nightly
@@ -243,39 +266,9 @@ cargo:test-1.43:
   <<: *script-cargo-test
 
 
-cargo:check-1.54:
-  stage: check
-  image: "akubera/rust-kcov:1.54.0-bullseye"
-  rules:
-    *rules-always-master-otherwise-manual
-  variables:
-    RUST_CACHE_KEY: "1.54"
-  <<: *script-cargo-check
-
-cargo:build-1.54:
-  stage: build
-  image: "akubera/rust-kcov:1.54.0-bullseye"
-  needs:
-    - "cargo:check-1.54"
-  variables:
-    RUST_CACHE_KEY: "1.54"
-  <<: *script-cargo-build
-
-cargo:test-1.54:
-  stage: test
-  needs:
-    - "cargo:build-1.54"
-  image: "akubera/rust-kcov:1.54.0-bullseye"
-  variables:
-    RUST_CACHE_KEY: "1.54"
-  <<: *script-cargo-test
-
-
 cargo:check-1.70:
   stage: check
   image: "akubera/rust-grcov:1.70.0-bullseye"
-  rules:
-    *rules-always-master-otherwise-manual
   variables:
     RUST_CACHE_KEY: "1.70"
   <<: *script-cargo-check

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bigdecimal"
-version = "0.4.2+dev"
+version = "0.4.3+dev"
 authors = ["Andrew Kubera"]
 description = "Arbitrary precision decimal numbers"
 documentation = "https://docs.rs/bigdecimal"
@@ -28,7 +28,7 @@ serde = { version = "1.0", optional = true, default-features = false }
 
 [dev-dependencies]
 paste = "1"
-serde_json = "<1.0.101"
+serde_test = "<1.0.176"
 siphasher = { version = "0.3.10", default-features = false }
 # The following dev-dependencies are only required for benchmarking
 #   (use the `benchmark-bigdecimal` script to uncomment these and run benchmarks)

benches/arithmetic.rs

@@ -1,4 +1,4 @@
-//! Benchmarks for arithmetic opertaion
+//! Benchmarks for arithmetic operation
 
 extern crate criterion;
 extern crate bigdecimal;

build.rs

@@ -1,17 +1,30 @@
-#![allow(clippy::style)]
 
 use std::env;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
+
 
 fn main() {
     let ac = autocfg::new();
     ac.emit_rustc_version(1, 70);
 
+    // Option::zip
+    ac.emit_rustc_version(1, 46);
+
+    // Remove this comment if enabled proptests
+    // ::PROPERTY-TESTS:: autocfg::emit("property_tests");
+
+    let outdir: PathBuf = std::env::var_os("OUT_DIR").unwrap().into();
+    write_default_precision_file(&outdir);
+    write_default_rounding_mode(&outdir);
+}
+
+
+/// Create default_precision.rs, containing definition of constant DEFAULT_PRECISION loaded in src/lib.rs
+fn write_default_precision_file(outdir: &Path) {
     let env_var = env::var("RUST_BIGDECIMAL_DEFAULT_PRECISION").unwrap_or_else(|_| "100".to_owned());
     println!("cargo:rerun-if-env-changed=RUST_BIGDECIMAL_DEFAULT_PRECISION");
 
-    let outdir = std::env::var_os("OUT_DIR").unwrap();
-    let rust_file_path = PathBuf::from(outdir).join("default_precision.rs");
+    let rust_file_path = outdir.join("default_precision.rs");
 
     let default_prec: u32 = env_var
         .parse::<std::num::NonZeroU32>()
@@ -21,4 +34,15 @@ fn main() {
     let rust_file_contents = format!("const DEFAULT_PRECISION: u64 = {};", default_prec);
 
     std::fs::write(rust_file_path, rust_file_contents).unwrap();
-}
+}
+
+/// Create default_rounding_mode.rs, using value of RUST_BIGDECIMAL_DEFAULT_ROUNDING_MODE environment variable
+fn write_default_rounding_mode(outdir: &Path) {
+    let rounding_mode_name = env::var("RUST_BIGDECIMAL_DEFAULT_ROUNDING_MODE").unwrap_or_else(|_| "HalfEven".to_owned());
+    println!("cargo:rerun-if-env-changed=RUST_BIGDECIMAL_DEFAULT_ROUNDING_MODE");
+
+    let rust_file_path = outdir.join("default_rounding_mode.rs");
+    let rust_file_contents = format!("const DEFAULT_ROUNDING_MODE: RoundingMode = RoundingMode::{};", rounding_mode_name);
+
+    std::fs::write(rust_file_path, rust_file_contents).unwrap();
+}

examples/floating-precision.rs

@@ -4,7 +4,7 @@ use bigdecimal::BigDecimal;
 use std::str::FromStr;
 
 fn main() {
-    let input = std::env::args().skip(1).next().unwrap_or("0.7".to_string());
+    let input = std::env::args().nth(1).unwrap_or("0.7".to_string());
     let decimal = BigDecimal::from_str(&input).expect("invalid decimal");
     let floating = f32::from_str(&input).expect("invalid float");
 

examples/simple-math.rs

@@ -21,8 +21,8 @@ sum mut: 48.00000000000000
 fn main() {
     println!("Hello, Big Decimals!");
     let input = "0.8";
-    let dec = BigDecimal::from_str(&input).unwrap();
-    let float = f32::from_str(&input).unwrap();
+    let dec = BigDecimal::from_str(input).unwrap();
+    let float = f32::from_str(input).unwrap();
     println!("Input ({}) with 10 decimals: {} vs {})", input, dec, float);
 
     let bd_square = dec.square();

scripts/benchmark-bigdecimal

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Run Criterion Benchmarks
 #
@@ -14,7 +14,7 @@ mv Cargo.toml.bak Cargo.toml
 
 
 # store extra things for the benchmarking report
-if [ ! -z "$BENCHMARK_EXTRAS" ]; then
+if [ -n "$BENCHMARK_EXTRAS" ]; then
 cat <<EOF > index.html
 <!doctype html>
 <head>
@@ -36,12 +36,12 @@ EOF
 # Add svg plots to index html
 find target/criterion -name 'pdf.svg' -type f -print0 |
 sort -z |
-while read -d $'\0' svg_file
+while read -r -d $'\0' svg_file
 do
-  name=$(echo $svg_file | cut -d '/' -f 3)
+  name=$(echo "$svg_file" | cut -d '/' -f 3)
 
   sample_datafile=target/criterion/$name/new/sample.json
-  if [ -f $sample_datafile ]; then
+  if [ -f "$sample_datafile" ]; then
     echo "<p><a href='${sample_datafile}' class='sample-json'>$name</a>" >> index.html
   else
     echo "<p>$name</p>" >> index.html