diff -Nru rust-extprim-1.7.0/Cargo.toml rust-extprim-1.7.1/Cargo.toml --- rust-extprim-1.7.0/Cargo.toml 1970-01-01 00:00:00.000000000 +0000 +++ rust-extprim-1.7.1/Cargo.toml 2020-05-30 16:31:33.000000000 +0000 @@ -12,7 +12,7 @@ [package] name = "extprim" -version = "1.7.0" +version = "1.7.1" authors = ["kennytm "] build = "build.rs" include = ["build.rs", "src/*.rs", "Cargo.toml", "README.md", "LICENSE*.txt"] @@ -35,6 +35,9 @@ optional = true [dev-dependencies.extprim_literals] version = "2.0" + +[dev-dependencies.serde_derive] +version = ">=1.0.0,<=1.0.98" [build-dependencies.rustc_version] version = "0.2" diff -Nru rust-extprim-1.7.0/Cargo.toml.orig rust-extprim-1.7.1/Cargo.toml.orig --- rust-extprim-1.7.0/Cargo.toml.orig 2019-04-21 06:58:49.000000000 +0000 +++ rust-extprim-1.7.1/Cargo.toml.orig 2020-05-24 05:49:16.000000000 +0000 @@ -1,6 +1,6 @@ [package] name = "extprim" -version = "1.7.0" +version = "1.7.1" authors = ["kennytm "] description = "Extra primitive types (u128, i128)" repository = "https://github.com/kennytm/extprim" @@ -29,12 +29,16 @@ members = ["extprim_literals", "extprim_literals_macros", "extprim_tests"] [dependencies] +# note: upgrading to rand 0.7 requires 'dyn' support i.e. rust 1.27+ rand = { version = "0.6", optional = true } num-traits = "0.2" serde = { version = "1", optional = true, features = ["derive"] } [dev-dependencies] extprim_literals = { version = "2.0", path = "./extprim_literals" } +# note: pin the version of serde_derive to 1.0.98 or below, +# so we don't need to depend on proc-macro2 v1.0 +serde_derive = ">=1.0.0,<=1.0.98" [build-dependencies] rustc_version = "0.2" diff -Nru rust-extprim-1.7.0/.cargo_vcs_info.json rust-extprim-1.7.1/.cargo_vcs_info.json --- rust-extprim-1.7.0/.cargo_vcs_info.json 1970-01-01 00:00:00.000000000 +0000 +++ rust-extprim-1.7.1/.cargo_vcs_info.json 2020-05-30 16:31:33.000000000 +0000 @@ -1,5 +1,5 @@ { "git": { - "sha1": "1bdef46f3612694c9650342f1da82282c18f30fc" + "sha1": "049d9bca2c38f62256e5133d42a25bba9176194d" } } diff -Nru rust-extprim-1.7.0/debian/changelog rust-extprim-1.7.1/debian/changelog --- rust-extprim-1.7.0/debian/changelog 2020-01-16 21:07:21.000000000 +0000 +++ rust-extprim-1.7.1/debian/changelog 2022-02-05 09:47:13.000000000 +0000 @@ -1,3 +1,21 @@ +rust-extprim (1.7.1-1) unstable; urgency=medium + + * Team upload. + * Package extprim 1.7.1 from crates.io using debcargo 2.5.0 + * Further relax rand depenency to allow 0.8 + * Fix autopkgtest so it passess successfully and is no longer skipped. + + Disable test that depends on extprim_literals and remove dependency. + + Fix the tests in no-default-features builds. + + -- Peter Michael Green Sat, 05 Feb 2022 09:47:13 +0000 + +rust-extprim (1.7.0-3) unstable; urgency=medium + + * Team upload. + * d/patches: added patch relax-deps.patch + + -- Henry-Nicolas Tourneur Sun, 28 Nov 2021 22:24:00 +0100 + rust-extprim (1.7.0-2) unstable; urgency=medium * Team upload. diff -Nru rust-extprim-1.7.0/debian/compat rust-extprim-1.7.1/debian/compat --- rust-extprim-1.7.0/debian/compat 2020-01-16 21:07:21.000000000 +0000 +++ rust-extprim-1.7.1/debian/compat 2022-02-05 09:47:13.000000000 +0000 @@ -1 +1 @@ -11 +12 diff -Nru rust-extprim-1.7.0/debian/control rust-extprim-1.7.1/debian/control --- rust-extprim-1.7.0/debian/control 2020-01-16 21:07:21.000000000 +0000 +++ rust-extprim-1.7.1/debian/control 2022-02-05 09:47:13.000000000 +0000 @@ -1,23 +1,24 @@ Source: rust-extprim Section: rust Priority: optional -Build-Depends: debhelper (>= 11), - dh-cargo (>= 18), +Build-Depends: debhelper (>= 12), + dh-cargo (>= 25), cargo:native , rustc:native , libstd-rust-dev , librust-num-traits-0.2+default-dev , - librust-rand-0.7+default-dev | librust-rand-0.6+default-dev , - librust-rustc-version-0.2+default-dev , + librust-rand-0.8+default-dev | librust-rand-0.7+default-dev | librust-rand-0.6+default-dev , + librust-rustc-version-0.4+default-dev , librust-semver-0.9+default-dev , librust-serde-1+default-dev , librust-serde-1+derive-dev Maintainer: Debian Rust Maintainers Uploaders: Sylvestre Ledru -Standards-Version: 4.4.1 +Standards-Version: 4.5.1 Vcs-Git: https://salsa.debian.org/rust-team/debcargo-conf.git [src/extprim] Vcs-Browser: https://salsa.debian.org/rust-team/debcargo-conf/tree/master/src/extprim +Rules-Requires-Root: no Package: librust-extprim-dev Architecture: any @@ -25,7 +26,7 @@ Depends: ${misc:Depends}, librust-num-traits-0.2+default-dev, - librust-rustc-version-0.2+default-dev, + librust-rustc-version-0.4+default-dev, librust-semver-0.9+default-dev Recommends: librust-extprim+default-dev (= ${binary:Version}) @@ -38,8 +39,8 @@ librust-extprim-1+use-std-dev (= ${binary:Version}), librust-extprim-1.7-dev (= ${binary:Version}), librust-extprim-1.7+use-std-dev (= ${binary:Version}), - librust-extprim-1.7.0-dev (= ${binary:Version}), - librust-extprim-1.7.0+use-std-dev (= ${binary:Version}) + librust-extprim-1.7.1-dev (= ${binary:Version}), + librust-extprim-1.7.1+use-std-dev (= ${binary:Version}) Description: Extra primitive types (u128, i128) - Rust source code This package contains the source for the Rust extprim crate, packaged by debcargo for use with cargo and dh-cargo. @@ -51,13 +52,12 @@ ${misc:Depends}, librust-extprim-dev (= ${binary:Version}), librust-extprim+use-std-dev (= ${binary:Version}), - librust-rand-0.7+default-dev | librust-rand-0.6+default-dev, - librust-serde-1+default-dev, - librust-serde-1+derive-dev + librust-extprim+rand-dev (= ${binary:Version}), + librust-extprim+serde-dev (= ${binary:Version}) Provides: librust-extprim-1+default-dev (= ${binary:Version}), librust-extprim-1.7+default-dev (= ${binary:Version}), - librust-extprim-1.7.0+default-dev (= ${binary:Version}) + librust-extprim-1.7.1+default-dev (= ${binary:Version}) Description: Extra primitive types (u128, i128) - feature "default" This metapackage enables feature "default" for the Rust extprim crate, by pulling in any additional dependencies needed by that feature. @@ -68,11 +68,11 @@ Depends: ${misc:Depends}, librust-extprim-dev (= ${binary:Version}), - librust-rand-0.7+default-dev | librust-rand-0.6+default-dev + librust-rand-0.8+default-dev | librust-rand-0.7+default-dev | librust-rand-0.6+default-dev Provides: librust-extprim-1+rand-dev (= ${binary:Version}), librust-extprim-1.7+rand-dev (= ${binary:Version}), - librust-extprim-1.7.0+rand-dev (= ${binary:Version}) + librust-extprim-1.7.1+rand-dev (= ${binary:Version}) Description: Extra primitive types (u128, i128) - feature "rand" This metapackage enables feature "rand" for the Rust extprim crate, by pulling in any additional dependencies needed by that feature. @@ -88,7 +88,7 @@ Provides: librust-extprim-1+serde-dev (= ${binary:Version}), librust-extprim-1.7+serde-dev (= ${binary:Version}), - librust-extprim-1.7.0+serde-dev (= ${binary:Version}) + librust-extprim-1.7.1+serde-dev (= ${binary:Version}) Description: Extra primitive types (u128, i128) - feature "serde" This metapackage enables feature "serde" for the Rust extprim crate, by pulling in any additional dependencies needed by that feature. diff -Nru rust-extprim-1.7.0/debian/copyright.debcargo.hint rust-extprim-1.7.1/debian/copyright.debcargo.hint --- rust-extprim-1.7.0/debian/copyright.debcargo.hint 2020-01-16 21:07:21.000000000 +0000 +++ rust-extprim-1.7.1/debian/copyright.debcargo.hint 2022-02-05 09:47:13.000000000 +0000 @@ -21,8 +21,8 @@ Files: debian/* Copyright: - 2018-2020 Debian Rust Maintainers - 2018-2020 Sylvestre Ledru + 2018-2022 Debian Rust Maintainers + 2018-2022 Sylvestre Ledru License: MIT or Apache-2.0 License: Apache-2.0 diff -Nru rust-extprim-1.7.0/debian/librust-extprim+default-dev.lintian-overrides rust-extprim-1.7.1/debian/librust-extprim+default-dev.lintian-overrides --- rust-extprim-1.7.0/debian/librust-extprim+default-dev.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ rust-extprim-1.7.1/debian/librust-extprim+default-dev.lintian-overrides 2022-02-05 09:47:13.000000000 +0000 @@ -0,0 +1 @@ +librust-extprim+default-dev binary: empty-rust-library-declares-provides * \ No newline at end of file diff -Nru rust-extprim-1.7.0/debian/librust-extprim+rand-dev.lintian-overrides rust-extprim-1.7.1/debian/librust-extprim+rand-dev.lintian-overrides --- rust-extprim-1.7.0/debian/librust-extprim+rand-dev.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ rust-extprim-1.7.1/debian/librust-extprim+rand-dev.lintian-overrides 2022-02-05 09:47:13.000000000 +0000 @@ -0,0 +1 @@ +librust-extprim+rand-dev binary: empty-rust-library-declares-provides * \ No newline at end of file diff -Nru rust-extprim-1.7.0/debian/librust-extprim+serde-dev.lintian-overrides rust-extprim-1.7.1/debian/librust-extprim+serde-dev.lintian-overrides --- rust-extprim-1.7.0/debian/librust-extprim+serde-dev.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ rust-extprim-1.7.1/debian/librust-extprim+serde-dev.lintian-overrides 2022-02-05 09:47:13.000000000 +0000 @@ -0,0 +1 @@ +librust-extprim+serde-dev binary: empty-rust-library-declares-provides * \ No newline at end of file diff -Nru rust-extprim-1.7.0/debian/patches/disable-extprim-literals.patch rust-extprim-1.7.1/debian/patches/disable-extprim-literals.patch --- rust-extprim-1.7.0/debian/patches/disable-extprim-literals.patch 1970-01-01 00:00:00.000000000 +0000 +++ rust-extprim-1.7.1/debian/patches/disable-extprim-literals.patch 2022-02-05 09:47:13.000000000 +0000 @@ -0,0 +1,26 @@ +Index: extprim/src/lib.rs +=================================================================== +--- extprim.orig/src/lib.rs ++++ extprim/src/lib.rs +@@ -9,7 +9,7 @@ + //! operate on "very large integers", the [bigint](https://crates.io/crates/num-bigint) library may + //! be more suitable. + //! +-//! ```rust ++//! ```ignore + //! #[macro_use] extern crate extprim_literals; + //! extern crate extprim; + //! +Index: extprim/Cargo.toml +=================================================================== +--- extprim.orig/Cargo.toml ++++ extprim/Cargo.toml +@@ -33,8 +33,6 @@ optional = true + version = "1" + features = ["derive"] + optional = true +-[dev-dependencies.extprim_literals] +-version = "2.0" + + [dev-dependencies.serde_derive] + version = "1" diff -Nru rust-extprim-1.7.0/debian/patches/relax-deps.patch rust-extprim-1.7.1/debian/patches/relax-deps.patch --- rust-extprim-1.7.0/debian/patches/relax-deps.patch 2020-01-16 21:07:21.000000000 +0000 +++ rust-extprim-1.7.1/debian/patches/relax-deps.patch 2022-02-05 09:47:13.000000000 +0000 @@ -7,7 +7,44 @@ [dependencies.rand] -version = "0.6" -+version = ">= 0.6, < 0.8" ++version = ">= 0.6, < 0.9" optional = true [dependencies.serde] +@@ -37,9 +37,9 @@ optional = true + version = "2.0" + + [dev-dependencies.serde_derive] +-version = ">=1.0.0,<=1.0.98" ++version = "1" + [build-dependencies.rustc_version] +-version = "0.2" ++version = "0.4" + + [build-dependencies.semver] + version = "0.9" +Index: extprim/build.rs +=================================================================== +--- extprim.orig/build.rs ++++ extprim/build.rs +@@ -1,16 +1,15 @@ + extern crate rustc_version; + extern crate semver; +-use rustc_version::{version_meta, Channel}; +-use semver::Version; ++use rustc_version::{version, version_meta, Channel, Version}; + + pub fn main() { +- let version = version_meta().unwrap(); +- let channel = match version.channel { ++ let channel = match version_meta().unwrap().channel { + Channel::Dev | Channel::Nightly => "unstable", + Channel::Beta | Channel::Stable => "stable", + }; ++ + println!("cargo:rustc-cfg=extprim_channel=\"{}\"", channel); +- if version.semver >= Version::new(1, 26, 0) { ++ if version().unwrap() >= Version::parse("1.26.0").unwrap() { + println!("cargo:rustc-cfg=extprim_has_stable_i128"); + } + } diff -Nru rust-extprim-1.7.0/debian/patches/series rust-extprim-1.7.1/debian/patches/series --- rust-extprim-1.7.0/debian/patches/series 2020-01-16 21:07:21.000000000 +0000 +++ rust-extprim-1.7.1/debian/patches/series 2022-02-05 09:47:13.000000000 +0000 @@ -1 +1,3 @@ relax-deps.patch +disable-extprim-literals.patch +use-alloc-for-tests.patch diff -Nru rust-extprim-1.7.0/debian/patches/use-alloc-for-tests.patch rust-extprim-1.7.1/debian/patches/use-alloc-for-tests.patch --- rust-extprim-1.7.0/debian/patches/use-alloc-for-tests.patch 1970-01-01 00:00:00.000000000 +0000 +++ rust-extprim-1.7.1/debian/patches/use-alloc-for-tests.patch 2022-02-05 09:47:13.000000000 +0000 @@ -0,0 +1,26 @@ +Description: use alloc for tests so they can work in no-std builds. +Author: Peter Michael Green + +only in patch2: +--- rust-extprim-1.7.1.orig/src/i128.rs ++++ rust-extprim-1.7.1/src/i128.rs +@@ -2046,2 +2046,3 @@ + use i128::{i128, ZERO, ONE, MIN, MAX}; ++ use alloc::vec::Vec; + +--- rust-extprim-1.7.1.orig/src/lib.rs ++++ rust-extprim-1.7.1/src/lib.rs +@@ -78,2 +78,7 @@ + ++// needed for the tests to run in builds without std ++#[cfg(test)] ++#[macro_use] ++extern crate alloc; ++ + #[macro_use] mod forward; +--- rust-extprim-1.7.1.orig/src/u128.rs ++++ rust-extprim-1.7.1/src/u128.rs +@@ -2046,2 +2046,3 @@ + use u128::{u128, ZERO, ONE, MIN, MAX}; ++ use alloc::vec::Vec; + diff -Nru rust-extprim-1.7.0/debian/tests/control rust-extprim-1.7.1/debian/tests/control --- rust-extprim-1.7.0/debian/tests/control 2020-01-16 21:07:21.000000000 +0000 +++ rust-extprim-1.7.1/debian/tests/control 2022-02-05 09:47:13.000000000 +0000 @@ -1,24 +1,29 @@ -Test-Command: /usr/share/cargo/bin/cargo-auto-test extprim 1.7.0 --all-targets --all-features -Features: test-name=@ -Depends: dh-cargo (>= 18), librust-extprim-literals-2+default-dev, @ +Test-Command: /usr/share/cargo/bin/cargo-auto-test extprim 1.7.1 --all-targets --all-features +Features: test-name=rust-extprim:@ +Depends: dh-cargo (>= 18), librust-serde-derive-1+default-dev, @ Restrictions: allow-stderr, skip-not-installable -Test-Command: /usr/share/cargo/bin/cargo-auto-test extprim 1.7.0 --all-targets --no-default-features -Features: test-name=librust-extprim-dev -Depends: dh-cargo (>= 18), librust-extprim-literals-2+default-dev, @ +Test-Command: /usr/share/cargo/bin/cargo-auto-test extprim 1.7.1 --all-targets --no-default-features --features use-std +Features: test-name=librust-extprim-dev:use-std +Depends: dh-cargo (>= 18), librust-serde-derive-1+default-dev, @ Restrictions: allow-stderr, skip-not-installable -Test-Command: /usr/share/cargo/bin/cargo-auto-test extprim 1.7.0 --all-targets --features default -Features: test-name=librust-extprim+default-dev -Depends: dh-cargo (>= 18), librust-extprim-literals-2+default-dev, @ +Test-Command: /usr/share/cargo/bin/cargo-auto-test extprim 1.7.1 --all-targets --no-default-features +Features: test-name=librust-extprim-dev: +Depends: dh-cargo (>= 18), librust-serde-derive-1+default-dev, @ Restrictions: allow-stderr, skip-not-installable -Test-Command: /usr/share/cargo/bin/cargo-auto-test extprim 1.7.0 --all-targets --features rand -Features: test-name=librust-extprim+rand-dev -Depends: dh-cargo (>= 18), librust-extprim-literals-2+default-dev, @ +Test-Command: /usr/share/cargo/bin/cargo-auto-test extprim 1.7.1 --all-targets +Features: test-name=librust-extprim+default-dev:default +Depends: dh-cargo (>= 18), librust-serde-derive-1+default-dev, @ Restrictions: allow-stderr, skip-not-installable -Test-Command: /usr/share/cargo/bin/cargo-auto-test extprim 1.7.0 --all-targets --features serde -Features: test-name=librust-extprim+serde-dev -Depends: dh-cargo (>= 18), librust-extprim-literals-2+default-dev, @ +Test-Command: /usr/share/cargo/bin/cargo-auto-test extprim 1.7.1 --all-targets --no-default-features --features rand +Features: test-name=librust-extprim+rand-dev:rand +Depends: dh-cargo (>= 18), librust-serde-derive-1+default-dev, @ +Restrictions: allow-stderr, skip-not-installable + +Test-Command: /usr/share/cargo/bin/cargo-auto-test extprim 1.7.1 --all-targets --no-default-features --features serde +Features: test-name=librust-extprim+serde-dev:serde +Depends: dh-cargo (>= 18), librust-serde-derive-1+default-dev, @ Restrictions: allow-stderr, skip-not-installable diff -Nru rust-extprim-1.7.0/src/lib.rs rust-extprim-1.7.1/src/lib.rs --- rust-extprim-1.7.0/src/lib.rs 2018-05-12 17:00:11.000000000 +0000 +++ rust-extprim-1.7.1/src/lib.rs 2020-05-24 05:47:06.000000000 +0000 @@ -55,9 +55,9 @@ //! } //! ``` -#![cfg_attr(extprim_channel="unstable", feature(asm, test, specialization, const_fn))] +#![cfg_attr(extprim_channel="unstable", feature(llvm_asm, test, specialization, const_fn))] // feature requirement: -// - asm: to provide a fast implementation of u64_long_mul in x86_64 +// - llvm_asm: to provide a fast implementation of u64_long_mul in x86_64 // - test: benchmarking // - specialization: to allow ToExtraPrimitive inherit from ToPrimitive, while ensuring conversion // between the 128-bit types remain correct diff -Nru rust-extprim-1.7.0/src/u128.rs rust-extprim-1.7.1/src/u128.rs --- rust-extprim-1.7.0/src/u128.rs 2019-04-21 06:57:35.000000000 +0000 +++ rust-extprim-1.7.1/src/u128.rs 2020-05-24 05:47:06.000000000 +0000 @@ -881,7 +881,7 @@ fn u64_long_mul(left: u64, right: u64) -> u128 { unsafe { let mut result: u128 = ::std::mem::uninitialized(); - asm!(" + llvm_asm!(" movq $2, %rax mulq $3 movq %rax, $0