diff -Nru rust-arrayref-0.3.6/.cargo_vcs_info.json rust-arrayref-0.3.7/.cargo_vcs_info.json --- rust-arrayref-0.3.6/.cargo_vcs_info.json 2020-01-26 13:28:29.000000000 +0000 +++ rust-arrayref-0.3.7/.cargo_vcs_info.json 1970-01-01 00:00:01.000000000 +0000 @@ -1,5 +1,6 @@ { "git": { - "sha1": "8144865370eb064d4aefa49ab59e72c42029bca6" - } -} + "sha1": "6a0d5849e359a9ad29ad096997eba3f1c7ca6b64" + }, + "path_in_vcs": "" +} \ No newline at end of file diff -Nru rust-arrayref-0.3.6/.github/workflows/rust.yml rust-arrayref-0.3.7/.github/workflows/rust.yml --- rust-arrayref-0.3.6/.github/workflows/rust.yml 1970-01-01 00:00:00.000000000 +0000 +++ rust-arrayref-0.3.7/.github/workflows/rust.yml 2006-07-24 01:21:28.000000000 +0000 @@ -0,0 +1,15 @@ +name: Rust + +on: [push] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Build + run: cargo build --verbose + - name: Run tests + run: cargo test --verbose diff -Nru rust-arrayref-0.3.6/Cargo.lock rust-arrayref-0.3.7/Cargo.lock --- rust-arrayref-0.3.6/Cargo.lock 2020-01-26 13:28:29.000000000 +0000 +++ rust-arrayref-0.3.7/Cargo.lock 1970-01-01 00:00:01.000000000 +0000 @@ -1,256 +1,205 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +version = 3 + [[package]] name = "aho-corasick" -version = "0.6.6" +version = "0.7.20" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" dependencies = [ - "memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "memchr", ] [[package]] name = "arrayref" -version = "0.3.6" +version = "0.3.7" dependencies = [ - "quickcheck 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", + "quickcheck", ] [[package]] name = "atty" -version = "0.2.11" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", - "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "hermit-abi", + "libc", + "winapi", ] [[package]] -name = "bitflags" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] name = "cfg-if" -version = "0.1.5" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "env_logger" -version = "0.5.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "humantime 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "termcolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "fuchsia-zircon" -version = "0.3.3" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15b0a4d2e39f8420210be8b27eeda28029729e2fd4291019455016c348240c38" dependencies = [ - "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "atty", + "humantime", + "log", + "regex", + "termcolor", ] [[package]] -name = "fuchsia-zircon-sys" -version = "0.3.3" +name = "fuchsia-cprng" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" [[package]] -name = "humantime" -version = "1.1.1" +name = "hermit-abi" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" dependencies = [ - "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "libc", ] [[package]] -name = "lazy_static" -version = "1.1.0" +name = "humantime" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" dependencies = [ - "version_check 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "quick-error", ] [[package]] name = "libc" -version = "0.2.20" +version = "0.2.140" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" [[package]] name = "log" -version = "0.4.3" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ - "cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if", ] [[package]] name = "memchr" -version = "2.0.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", -] +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "quick-error" -version = "1.2.2" +version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quickcheck" version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c01babc5ffd48a2a83744b3024814bb46dfd4f2a4705ccb44b1b60e644fdcab7" dependencies = [ - "env_logger 0.5.12 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", + "env_logger", + "log", + "rand", ] [[package]] name = "rand" -version = "0.4.3" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" dependencies = [ - "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "fuchsia-cprng", + "libc", + "rand_core 0.3.1", + "rdrand", + "winapi", ] [[package]] -name = "redox_syscall" -version = "0.1.40" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "redox_termios" -version = "0.1.1" +name = "rand_core" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" dependencies = [ - "redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.4.2", ] [[package]] -name = "regex" -version = "1.0.2" +name = "rand_core" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "aho-corasick 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", - "memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "regex-syntax 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "utf8-ranges 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -] +checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" [[package]] -name = "regex-syntax" -version = "0.6.2" +name = "rdrand" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" dependencies = [ - "ucd-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.3.1", ] [[package]] -name = "termcolor" -version = "1.0.1" +name = "regex" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" dependencies = [ - "wincolor 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "aho-corasick", + "memchr", + "regex-syntax", ] [[package]] -name = "termion" -version = "1.5.1" +name = "regex-syntax" +version = "0.6.28" source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -] +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" [[package]] -name = "thread_local" -version = "0.3.6" +name = "termcolor" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" dependencies = [ - "lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi-util", ] [[package]] -name = "ucd-util" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "utf8-ranges" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "version_check" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] name = "winapi" -version = "0.3.5" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" dependencies = [ - "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", ] [[package]] name = "winapi-i686-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "wincolor" -version = "1.0.0" +name = "winapi-util" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" dependencies = [ - "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi", ] -[metadata] -"checksum aho-corasick 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c1c6d463cbe7ed28720b5b489e7c083eeb8f90d08be2a0d6bb9e1ffea9ce1afa" -"checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652" -"checksum bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d0c54bb8f454c567f21197eefcdbf5679d0bd99f2ddbe52e84c77061952e6789" -"checksum cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0c4e7bb64a8ebb0d856483e1e682ea3422f883c5f5615a90d51a2c82fe87fdd3" -"checksum env_logger 0.5.12 (registry+https://github.com/rust-lang/crates.io-index)" = "f4d7e69c283751083d53d01eac767407343b8b69c4bd70058e08adc2637cb257" -"checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" -"checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" -"checksum humantime 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0484fda3e7007f2a4a0d9c3a703ca38c71c54c55602ce4660c419fd32e188c9e" -"checksum lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca488b89a5657b0a2ecd45b95609b3e848cf1755da332a0da46e2b2b1cb371a7" -"checksum libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)" = "684f330624d8c3784fb9558ca46c4ce488073a8d22450415c5eb4f4cfb0d11b5" -"checksum log 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "61bd98ae7f7b754bc53dca7d44b604f733c6bba044ea6f41bc8d89272d8161d2" -"checksum memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "796fba70e76612589ed2ce7f45282f5af869e0fdd7cc6199fa1aa1f1d591ba9d" -"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" -"checksum quickcheck 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c01babc5ffd48a2a83744b3024814bb46dfd4f2a4705ccb44b1b60e644fdcab7" -"checksum rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8356f47b32624fef5b3301c1be97e5944ecdd595409cc5da11d05f211db6cfbd" -"checksum redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "c214e91d3ecf43e9a4e41e578973adeb14b474f2bee858742d127af75a0112b1" -"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" -"checksum regex 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5bbbea44c5490a1e84357ff28b7d518b4619a159fed5d25f6c1de2d19cc42814" -"checksum regex-syntax 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "747ba3b235651f6e2f67dfa8bcdcd073ddb7c243cb21c442fc12395dfcac212d" -"checksum termcolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "722426c4a0539da2c4ffd9b419d90ad540b4cff4a053be9069c908d4d07e2836" -"checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096" -"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" -"checksum ucd-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fd2be2d6639d0f8fe6cdda291ad456e23629558d466e2789d2c3e9892bda285d" -"checksum utf8-ranges 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "662fab6525a98beff2921d7f61a39e7d59e0b425ebc7d0d9e66d316e55124122" -"checksum version_check 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7716c242968ee87e5542f8021178248f267f295a5c4803beae8b8b7fd9bc6051" -"checksum winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "773ef9dcc5f24b7d850d0ff101e542ff24c3b090a9768e03ff889fdef41f00fd" -"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -"checksum wincolor 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b9dc3aa9dcda98b5a16150c54619c1ead22e3d3a5d458778ae914be760aa981a" +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff -Nru rust-arrayref-0.3.6/Cargo.toml rust-arrayref-0.3.7/Cargo.toml --- rust-arrayref-0.3.6/Cargo.toml 2020-01-26 13:28:29.000000000 +0000 +++ rust-arrayref-0.3.7/Cargo.toml 1970-01-01 00:00:01.000000000 +0000 @@ -3,20 +3,21 @@ # When uploading crates to the registry Cargo will automatically # "normalize" Cargo.toml files for maximal compatibility # with all versions of Cargo and also rewrite `path` dependencies -# to registry (e.g., crates.io) dependencies +# to registry (e.g., crates.io) dependencies. # -# If you believe there's an error in this file please file an -# issue against the rust-lang/cargo repository. If you're -# editing this file be aware that the upstream Cargo.toml -# will likely look very different (and much more reasonable) +# If you are reading this file be aware that the original Cargo.toml +# will likely look very different (and much more reasonable). +# See Cargo.toml.orig for the original contents. [package] name = "arrayref" -version = "0.3.6" +version = "0.3.7" authors = ["David Roundy "] description = "Macros to take array references of slices" documentation = "https://docs.rs/arrayref" +readme = "README.md" license = "BSD-2-Clause" repository = "https://github.com/droundy/arrayref" + [dev-dependencies.quickcheck] version = "0.6" diff -Nru rust-arrayref-0.3.6/Cargo.toml.orig rust-arrayref-0.3.7/Cargo.toml.orig --- rust-arrayref-0.3.6/Cargo.toml.orig 2020-01-26 13:27:23.000000000 +0000 +++ rust-arrayref-0.3.7/Cargo.toml.orig 2006-07-24 01:21:28.000000000 +0000 @@ -1,6 +1,6 @@ [package] name = "arrayref" -version = "0.3.6" +version = "0.3.7" authors = ["David Roundy "] description = "Macros to take array references of slices" license = "BSD-2-Clause" diff -Nru rust-arrayref-0.3.6/debian/cargo-checksum.json rust-arrayref-0.3.7/debian/cargo-checksum.json --- rust-arrayref-0.3.6/debian/cargo-checksum.json 2021-12-18 00:01:28.000000000 +0000 +++ rust-arrayref-0.3.7/debian/cargo-checksum.json 2024-01-19 22:15:42.000000000 +0000 @@ -1 +1 @@ -{"package":"a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544","files":{}} +{"package":"6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545","files":{}} diff -Nru rust-arrayref-0.3.6/debian/changelog rust-arrayref-0.3.7/debian/changelog --- rust-arrayref-0.3.6/debian/changelog 2021-12-18 00:01:28.000000000 +0000 +++ rust-arrayref-0.3.7/debian/changelog 2024-01-19 22:15:42.000000000 +0000 @@ -1,3 +1,10 @@ +rust-arrayref (0.3.7-1) unstable; urgency=medium + + * Team upload. + * Package arrayref 0.3.7 from crates.io using debcargo 2.6.1 + + -- Sylvestre Ledru Fri, 19 Jan 2024 23:15:42 +0100 + rust-arrayref (0.3.6-1) unstable; urgency=medium * Team upload. diff -Nru rust-arrayref-0.3.6/debian/control rust-arrayref-0.3.7/debian/control --- rust-arrayref-0.3.6/debian/control 2021-12-18 00:01:28.000000000 +0000 +++ rust-arrayref-0.3.7/debian/control 2024-01-19 22:15:42.000000000 +0000 @@ -9,9 +9,10 @@ Maintainer: Debian Rust Maintainers Uploaders: kpcyrd -Standards-Version: 4.5.1 +Standards-Version: 4.6.2 Vcs-Git: https://salsa.debian.org/rust-team/debcargo-conf.git [src/arrayref] Vcs-Browser: https://salsa.debian.org/rust-team/debcargo-conf/tree/master/src/arrayref +X-Cargo-Crate: arrayref Rules-Requires-Root: no Package: librust-arrayref-dev @@ -25,8 +26,7 @@ librust-arrayref-0+default-dev (= ${binary:Version}), librust-arrayref-0.3-dev (= ${binary:Version}), librust-arrayref-0.3+default-dev (= ${binary:Version}), - librust-arrayref-0.3.6-dev (= ${binary:Version}), - librust-arrayref-0.3.6+default-dev (= ${binary:Version}) + librust-arrayref-0.3.7-dev (= ${binary:Version}), + librust-arrayref-0.3.7+default-dev (= ${binary:Version}) Description: Macros to take array references of slices - Rust source code - This package contains the source for the Rust arrayref crate, packaged by - debcargo for use with cargo and dh-cargo. + Source code for Debianized Rust crate "arrayref" diff -Nru rust-arrayref-0.3.6/debian/copyright.debcargo.hint rust-arrayref-0.3.7/debian/copyright.debcargo.hint --- rust-arrayref-0.3.6/debian/copyright.debcargo.hint 2021-12-18 00:01:28.000000000 +0000 +++ rust-arrayref-0.3.7/debian/copyright.debcargo.hint 2024-01-19 22:15:42.000000000 +0000 @@ -12,7 +12,7 @@ be correct information so you should review and fix this before uploading to the archive. -Files: ./LICENSE +Files: LICENSE Copyright: 2015 David Roundy License: UNKNOWN-LICENSE; FIXME (overlay) Comment: @@ -21,8 +21,8 @@ Files: debian/* Copyright: - 2018-2021 Debian Rust Maintainers - 2018-2021 kpcyrd + 2018-2024 Debian Rust Maintainers + 2018-2024 kpcyrd License: BSD-2-Clause License: BSD-2-Clause diff -Nru rust-arrayref-0.3.6/debian/tests/control rust-arrayref-0.3.7/debian/tests/control --- rust-arrayref-0.3.6/debian/tests/control 2021-12-18 00:01:28.000000000 +0000 +++ rust-arrayref-0.3.7/debian/tests/control 2024-01-19 22:15:42.000000000 +0000 @@ -1,14 +1,14 @@ -Test-Command: /usr/share/cargo/bin/cargo-auto-test arrayref 0.3.6 --all-targets --all-features +Test-Command: /usr/share/cargo/bin/cargo-auto-test arrayref 0.3.7 --all-targets --all-features Features: test-name=rust-arrayref:@ Depends: dh-cargo (>= 18), librust-quickcheck-0.6+default-dev, @ Restrictions: allow-stderr, skip-not-installable -Test-Command: /usr/share/cargo/bin/cargo-auto-test arrayref 0.3.6 --all-targets +Test-Command: /usr/share/cargo/bin/cargo-auto-test arrayref 0.3.7 --all-targets Features: test-name=librust-arrayref-dev:default Depends: dh-cargo (>= 18), librust-quickcheck-0.6+default-dev, @ Restrictions: allow-stderr, skip-not-installable -Test-Command: /usr/share/cargo/bin/cargo-auto-test arrayref 0.3.6 --all-targets --no-default-features +Test-Command: /usr/share/cargo/bin/cargo-auto-test arrayref 0.3.7 --all-targets --no-default-features Features: test-name=librust-arrayref-dev: Depends: dh-cargo (>= 18), librust-quickcheck-0.6+default-dev, @ Restrictions: allow-stderr, skip-not-installable diff -Nru rust-arrayref-0.3.6/src/lib.rs rust-arrayref-0.3.7/src/lib.rs --- rust-arrayref-0.3.6/src/lib.rs 2020-01-26 13:27:09.000000000 +0000 +++ rust-arrayref-0.3.7/src/lib.rs 2006-07-24 01:21:28.000000000 +0000 @@ -105,10 +105,10 @@ macro_rules! array_refs { ( $arr:expr, $( $pre:expr ),* ; .. ; $( $post:expr ),* ) => {{ { - use std::slice; + use core::slice; #[inline] #[allow(unused_assignments)] - #[allow(eval_order_dependence)] + #[allow(clippy::eval_order_dependence)] unsafe fn as_arrays(a: &[T]) -> ( $( &[T; $pre], )* &[T], $( &[T; $post], )*) { let min_len = $( $pre + )* $( $post + )* 0; let var_len = a.len() - min_len; @@ -116,17 +116,17 @@ let mut p = a.as_ptr(); ( $( { let aref = & *(p as *const [T; $pre]); - p = p.offset($pre as isize); + p = p.add($pre); aref - } ),* , { + }, )* { let sl = slice::from_raw_parts(p as *const T, var_len); - p = p.offset(var_len as isize); + p = p.add(var_len); sl }, $( { let aref = & *(p as *const [T; $post]); - p = p.offset($post as isize); + p = p.add($post); aref - } ),*) + }, )*) } let input = $arr; #[allow(unused_unsafe)] @@ -139,14 +139,14 @@ { #[inline] #[allow(unused_assignments)] - #[allow(eval_order_dependence)] + #[allow(clippy::eval_order_dependence)] unsafe fn as_arrays(a: &[T; $( $len + )* 0 ]) -> ( $( &[T; $len], )* ) { let mut p = a.as_ptr(); ( $( { let aref = &*(p as *const [T; $len]); p = p.offset($len as isize); aref - } ),* ) + }, )* ) } let input = $arr; #[allow(unused_unsafe)] @@ -202,10 +202,10 @@ macro_rules! mut_array_refs { ( $arr:expr, $( $pre:expr ),* ; .. ; $( $post:expr ),* ) => {{ { - use std::slice; + use core::slice; #[inline] #[allow(unused_assignments)] - #[allow(eval_order_dependence)] + #[allow(clippy::eval_order_dependence)] unsafe fn as_arrays(a: &mut [T]) -> ( $( &mut [T; $pre], )* &mut [T], $( &mut [T; $post], )*) { let min_len = $( $pre + )* $( $post + )* 0; let var_len = a.len() - min_len; @@ -213,17 +213,17 @@ let mut p = a.as_mut_ptr(); ( $( { let aref = &mut *(p as *mut [T; $pre]); - p = p.offset($pre as isize); + p = p.add($pre); aref - } ),* , { + }, )* { let sl = slice::from_raw_parts_mut(p as *mut T, var_len); - p = p.offset(var_len as isize); + p = p.add(var_len); sl }, $( { let aref = &mut *(p as *mut [T; $post]); - p = p.offset($post as isize); + p = p.add($post); aref - } ),*) + }, )*) } let input = $arr; #[allow(unused_unsafe)] @@ -236,14 +236,14 @@ { #[inline] #[allow(unused_assignments)] - #[allow(eval_order_dependence)] + #[allow(clippy::eval_order_dependence)] unsafe fn as_arrays(a: &mut [T; $( $len + )* 0 ]) -> ( $( &mut [T; $len], )* ) { let mut p = a.as_mut_ptr(); ( $( { let aref = &mut *(p as *mut [T; $len]); - p = p.offset($len as isize); + p = p.add($len); aref - } ),* ) + }, )* ) } let input = $arr; #[allow(unused_unsafe)] @@ -297,6 +297,7 @@ } +#[allow(clippy::all)] #[cfg(test)] mod test { @@ -473,4 +474,29 @@ assert_eq!(&[10;10], array_ref![data, 118, 10]); } +#[forbid(clippy::ptr_offset_with_cast)] +#[test] +fn forbidden_clippy_lints_do_not_fire() { + let mut data = [0u8; 32]; + let _ = array_refs![&data, 8; .. ;]; + let _ = mut_array_refs![&mut data, 8; .. ; 10]; +} + +#[test] +fn single_arg_refs() { + let mut data = [0u8; 8]; + let (_, ) = array_refs![&data, 8]; + let (_, ) = mut_array_refs![&mut data, 8]; + + let (_, _) = array_refs![&data, 4; ..;]; + let (_, _) = mut_array_refs![&mut data, 4; ..;]; + + let (_, _) = array_refs![&data,; ..; 4]; + let (_, _) = mut_array_refs![&mut data,; ..; 4]; + + let (_,) = array_refs![&data,; ..;]; + let (_,) = mut_array_refs![&mut data,; ..;]; +} + } // mod test +