Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package phraze for openSUSE:Factory checked in at 2025-02-17 20:58:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/phraze (Old) and /work/SRC/openSUSE:Factory/.phraze.new.8181 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "phraze" Mon Feb 17 20:58:19 2025 rev:7 rq:1246469 version:0.3.18 Changes: -------- --- /work/SRC/openSUSE:Factory/phraze/phraze.changes 2024-12-19 21:42:36.561603982 +0100 +++ /work/SRC/openSUSE:Factory/.phraze.new.8181/phraze.changes 2025-02-17 20:58:52.971371735 +0100 @@ -1,0 +2,12 @@ +Tue Feb 04 07:32:29 UTC 2025 - felix.niederwan...@suse.de + +- Update to version 0.3.18: + * update version of cargo dist used to create new releases + * updates CHANGELOG in preparation for new release + * updates two of the built-in word lists, removing the awkward word 'hank' + * Uses ? for conciseness in file reader, at suggestion of new version of Clippy + * upgrades rand crate dependency to v0.90, which required some statement changes and some new method names + * clarification in licensing section + * adds line in readme about word list licensing + +------------------------------------------------------------------- Old: ---- phraze-0.3.17.obscpio New: ---- phraze-0.3.18.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ phraze.spec ++++++ --- /var/tmp/diff_new_pack.eqwM0o/_old 2025-02-17 20:58:57.727570071 +0100 +++ /var/tmp/diff_new_pack.eqwM0o/_new 2025-02-17 20:58:57.727570071 +0100 @@ -1,7 +1,7 @@ # # spec file for package phraze # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: phraze -Version: 0.3.17 +Version: 0.3.18 Release: 0 Summary: Generate random passphrases License: MPL-2.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.eqwM0o/_old 2025-02-17 20:58:57.787572573 +0100 +++ /var/tmp/diff_new_pack.eqwM0o/_new 2025-02-17 20:58:57.791572739 +0100 @@ -2,7 +2,7 @@ <service mode="disabled" name="obs_scm"> <param name="url">https://github.com/sts10/phraze.git</param> <param name="scm">git</param> - <param name="revision">v0.3.17</param> + <param name="revision">v0.3.18</param> <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">.*v(\d+\.\d+\.\d+)</param> <param name="versionrewrite-replacement">\1</param> @@ -18,7 +18,7 @@ <service name="cargo_vendor" mode="disabled"> <param name="srcdir">phraze</param> <param name="compression">xz</param> - <param name="update">false</param> + <param name="update">true</param> </service> </services> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.eqwM0o/_old 2025-02-17 20:58:57.811573573 +0100 +++ /var/tmp/diff_new_pack.eqwM0o/_new 2025-02-17 20:58:57.819573907 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/sts10/phraze.git</param> - <param name="changesrevision">255999ac91de399caa8f13537e3be27eb5f191ea</param></service></servicedata> + <param name="changesrevision">20a494484db75fd6e272c3b58d78911d424f6538</param></service></servicedata> (No newline at EOF) ++++++ phraze-0.3.17.obscpio -> phraze-0.3.18.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phraze-0.3.17/.github/workflows/release.yml new/phraze-0.3.18/.github/workflows/release.yml --- old/phraze-0.3.17/.github/workflows/release.yml 2024-11-26 23:37:22.000000000 +0100 +++ new/phraze-0.3.18/.github/workflows/release.yml 2025-02-03 19:27:07.000000000 +0100 @@ -63,7 +63,7 @@ # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.25.1/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.28.0/cargo-dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@v4 with: @@ -107,6 +107,7 @@ # - N "local" tasks that build each platform's binaries and platform-specific installers matrix: ${{ fromJson(needs.plan.outputs.val).ci.github.artifacts_matrix }} runs-on: ${{ matrix.runner }} + container: ${{ matrix.container && matrix.container.image || null }} env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} BUILD_MANIFEST_NAME: target/distrib/${{ join(matrix.targets, '-') }}-dist-manifest.json @@ -117,8 +118,15 @@ - uses: actions/checkout@v4 with: submodules: recursive + - name: Install Rust non-interactively if not already installed + if: ${{ matrix.container }} + run: | + if ! command -v cargo > /dev/null 2>&1; then + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y + echo "$HOME/.cargo/bin" >> $GITHUB_PATH + fi - name: Install dist - run: ${{ matrix.install_dist }} + run: ${{ matrix.install_dist.run }} # Get the dist-manifest - name: Fetch local artifacts uses: actions/download-artifact@v4 @@ -143,7 +151,7 @@ run: | # Parse out what we just built and upload it to scratch storage echo "paths<<EOF" >> "$GITHUB_OUTPUT" - jq --raw-output ".upload_files[]" dist-manifest.json >> "$GITHUB_OUTPUT" + dist print-upload-files-from-manifest --manifest dist-manifest.json >> "$GITHUB_OUTPUT" echo "EOF" >> "$GITHUB_OUTPUT" cp dist-manifest.json "$BUILD_MANIFEST_NAME" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phraze-0.3.17/CHANGELOG.markdown new/phraze-0.3.18/CHANGELOG.markdown --- old/phraze-0.3.17/CHANGELOG.markdown 2024-11-26 23:37:22.000000000 +0100 +++ new/phraze-0.3.18/CHANGELOG.markdown 2025-02-03 19:27:07.000000000 +0100 @@ -1,3 +1,10 @@ +# v0.3.18 + +* 49cb652 - upgrades rand crate dependency to v0.9.0, which required some statement changes and some new method names. See [#29](https://github.com/sts10/phraze/pull/29). +* ab5ed13 - updates two of the built-in word lists, removing the awkward word 'hank' +* 6312ad8 - Uses `?` for conciseness in file reader, at suggestion of new version of Clippy +* 45758ab - makes a clarification in licensing section of README + # v0.3.17 * Attempts to use cargo-dist to create a musl binary (see issue: #28) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phraze-0.3.17/Cargo.lock new/phraze-0.3.18/Cargo.lock --- old/phraze-0.3.17/Cargo.lock 2024-11-26 23:37:22.000000000 +0100 +++ new/phraze-0.3.18/Cargo.lock 2025-02-03 19:27:07.000000000 +0100 @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "aho-corasick" @@ -163,7 +163,7 @@ "heck", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.96", ] [[package]] @@ -275,13 +275,14 @@ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8" dependencies = [ "cfg-if", "libc", "wasi", + "windows-targets 0.52.6", ] [[package]] @@ -364,9 +365,9 @@ [[package]] name = "libc" -version = "0.2.149" +version = "0.2.169" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" +checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" [[package]] name = "linux-raw-sys" @@ -418,7 +419,7 @@ [[package]] name = "phraze" -version = "0.3.17" +version = "0.3.18" dependencies = [ "clap", "clap_complete", @@ -465,38 +466,38 @@ [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.33" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ "proc-macro2", ] [[package]] name = "rand" -version = "0.8.5" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94" dependencies = [ - "libc", "rand_chacha", "rand_core", + "zerocopy", ] [[package]] name = "rand_chacha" -version = "0.3.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" dependencies = [ "ppv-lite86", "rand_core", @@ -504,11 +505,12 @@ [[package]] name = "rand_core" -version = "0.6.4" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +checksum = "b08f3c9802962f7e1b25113931d94f43ed9725bebc59db9d0c3e9a23b67e15ff" dependencies = [ "getrandom", + "zerocopy", ] [[package]] @@ -617,7 +619,7 @@ dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.96", ] [[package]] @@ -650,9 +652,9 @@ [[package]] name = "syn" -version = "2.0.38" +version = "2.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80" dependencies = [ "proc-macro2", "quote", @@ -717,9 +719,12 @@ [[package]] name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" +version = "0.13.3+wasi-0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2" +dependencies = [ + "wit-bindgen-rt", +] [[package]] name = "wasm-bindgen" @@ -742,7 +747,7 @@ "once_cell", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.96", "wasm-bindgen-shared", ] @@ -764,7 +769,7 @@ dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.96", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -822,7 +827,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", ] [[package]] @@ -831,13 +836,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -847,37 +868,114 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] name = "windows_aarch64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] name = "windows_i686_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] name = "windows_i686_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] name = "windows_x86_64_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] name = "windows_x86_64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "wit-bindgen-rt" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c" +dependencies = [ + "bitflags", +] + +[[package]] +name = "zerocopy" +version = "0.8.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a367f292d93d4eab890745e75a778da40909cab4d6ff8173693812f79c4a2468" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.8.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3931cb58c62c13adec22e38686b559c86a30565e16ad6e8510a337cedc611e1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", +] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phraze-0.3.17/Cargo.toml new/phraze-0.3.18/Cargo.toml --- old/phraze-0.3.17/Cargo.toml 2024-11-26 23:37:22.000000000 +0100 +++ new/phraze-0.3.18/Cargo.toml 2025-02-03 19:27:07.000000000 +0100 @@ -1,7 +1,7 @@ [package] name = "phraze" description = "Random passphrase generator" -version = "0.3.17" +version = "0.3.18" edition = "2021" authors = ["sts10 <sschlink...@gmail.com>"] license = "MPL-2.0" @@ -11,7 +11,7 @@ categories = ["command-line-utilities"] [dependencies] -rand = "0.8.5" +rand = "0.9.0" clap = { version = "4.5.18", features = ["derive"] } unicode-normalization = "0.1.24" include-lines = "1.1.2" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phraze-0.3.17/dist-workspace.toml new/phraze-0.3.18/dist-workspace.toml --- old/phraze-0.3.17/dist-workspace.toml 2024-11-26 23:37:22.000000000 +0100 +++ new/phraze-0.3.18/dist-workspace.toml 2025-02-03 19:27:07.000000000 +0100 @@ -4,7 +4,7 @@ # Config for 'dist' [dist] # The preferred dist version to use in CI (Cargo.toml SemVer syntax) -cargo-dist-version = "0.25.1" +cargo-dist-version = "0.28.0" # CI backends to support ci = "github" # The installers to generate for each app diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phraze-0.3.17/readme.markdown new/phraze-0.3.18/readme.markdown --- old/phraze-0.3.17/readme.markdown 2024-11-26 23:37:22.000000000 +0100 +++ new/phraze-0.3.18/readme.markdown 2025-02-03 19:27:07.000000000 +0100 @@ -526,14 +526,16 @@ You're welcome to consult [my personal notes on using cargo-dist](https://sts10.github.io/docs/cargo-dist-tips.html), but basically: First, install cargo-dist with`cargo install cargo-dist`. -When you're ready to cut a new release, test the current state of the project with `cargo dist build` and `cargo dist plan`. If that went well, create a new git tag that matches the current project version in `Cargo.toml` with `git tag vX.X.X`. Finally, run `git push --tags` to kick off the release process. GitHub will handle it from here -- check your project's GitHub Releases page in about 5 to 10 minutes. +When you're ready to cut a new release, test the current state of the project with `dist build` and `dist plan`. If that went well, create a new git tag that matches the current project version in `Cargo.toml` with `git tag vX.X.X`. Finally, run `git push --tags` to kick off the release process. GitHub will handle it from here -- check your project's GitHub Releases page in about 5 to 10 minutes. ## Licensing -Phraze's code is licensed under the Mozilla Public License v2.0. See included [LICENSE.txt](./LICENSE.txt) file or [this online version of the license](https://www.mozilla.org/en-US/MPL/2.0/). +Phraze's source code is licensed under the Mozilla Public License v2.0. See included [LICENSE.txt](./LICENSE.txt) file or [this online version of the license](https://www.mozilla.org/en-US/MPL/2.0/). ### Word list licensing +Phraze includes a number of word lists, which are licensed in a variety of ways. + * The Mnemonicode word list is [copyrighted](https://github.com/singpolyma/mnemonicode/blob/master/mn_wordlist.c) by Oren Tirosh under [the MIT License](https://mit-license.org/). * The word lists from the Electronic Frontier Foundation (EFF) are [distributed under the Creative Commons Attribution 3.0 License](https://www.eff.org/copyright). * All Orchard Street Wordlists are available under [the Creative Commons Attribution-ShareAlike 4.0 International License](http://creativecommons.org/licenses/by-sa/4.0/). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phraze-0.3.17/src/file_reader.rs new/phraze-0.3.18/src/file_reader.rs --- old/phraze-0.3.17/src/file_reader.rs 2024-11-26 23:37:22.000000000 +0100 +++ new/phraze-0.3.18/src/file_reader.rs 2025-02-03 19:27:07.000000000 +0100 @@ -40,11 +40,10 @@ <T as std::str::FromStr>::Err: std::fmt::Debug, { let mut vec = Vec::new(); - let f = match File::open(file_path) { - Ok(res) => res, - Err(e) => return Err(e), - }; + + let f = File::open(file_path)?; let file = BufReader::new(&f); + for line in file.lines() { match line?.parse() { Ok(l) => vec.push(l), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phraze-0.3.17/src/lib.rs new/phraze-0.3.18/src/lib.rs --- old/phraze-0.3.17/src/lib.rs 2024-11-26 23:37:22.000000000 +0100 +++ new/phraze-0.3.18/src/lib.rs 2025-02-03 19:27:07.000000000 +0100 @@ -6,7 +6,10 @@ use crate::cli::ListChoice; use crate::separators::make_separator; use include_lines::include_lines; -use rand::{seq::SliceRandom, thread_rng, Rng}; +// use rand::{seq::SliceRandom, thread_rng, Rng}; +use rand::prelude::*; +use rand::rng; +use rand::seq::IndexedRandom; /// Given user's inputs, figure out how many words the generated passphrase will need. If user /// specified an exact `number_of_words`, just return that `number_of_words`. If user is using a @@ -78,7 +81,8 @@ title_case: bool, list: &[T], // We accept either type by using `T`! ) -> String { - let mut rng = thread_rng(); + let mut rng = rng(); // How we make a RNG using rand v0.9.0 + // Create a blank String to put words into to create our passphrase let mut passphrase = String::new(); for i in 0..number_of_words_to_put_in_passphrase { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phraze-0.3.17/src/separators.rs new/phraze-0.3.18/src/separators.rs --- old/phraze-0.3.17/src/separators.rs 2024-11-26 23:37:22.000000000 +0100 +++ new/phraze-0.3.18/src/separators.rs 2025-02-03 19:27:07.000000000 +0100 @@ -1,8 +1,8 @@ //! This module contains some functions that help deal with the separating punction between words //! in a passphrase. Most of it handles cases where the user requests a random symbol or number or //! either. -use rand::prelude::SliceRandom; -use rand::Rng; +use rand::prelude::*; +use rand::seq::IndexedRandom; #[derive(PartialEq)] enum SeparatorType { @@ -36,12 +36,13 @@ /// Pick a random symbol for a separator between words. fn get_random_symbol(rng: &mut impl Rng) -> String { + // I could probably simplify this with a choose method const CHARSET: &[u8] = b"!@#$%&*(){}[]\\:;'<>?,./_-+="; - let idx = rng.gen_range(0..CHARSET.len()); + let idx = rng.random_range(0..CHARSET.len()); (CHARSET[idx] as char).to_string() } /// Pick a random digit (0 to 9) for a separator between words. fn get_random_number(rng: &mut impl Rng) -> String { - rng.gen_range(0..=9).to_string() + rng.random_range(0..=9).to_string() } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phraze-0.3.17/word-lists/orchard-street-alpha.txt new/phraze-0.3.18/word-lists/orchard-street-alpha.txt --- old/phraze-0.3.17/word-lists/orchard-street-alpha.txt 2024-11-26 23:37:22.000000000 +0100 +++ new/phraze-0.3.18/word-lists/orchard-street-alpha.txt 2025-02-03 19:27:07.000000000 +0100 @@ -107,6 +107,7 @@ bit bits blew +boat bog boil bold @@ -499,7 +500,6 @@ hand hang hangs -hank hasty hats hay diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phraze-0.3.17/word-lists/orchard-street-medium.txt new/phraze-0.3.18/word-lists/orchard-street-medium.txt --- old/phraze-0.3.17/word-lists/orchard-street-medium.txt 2024-11-26 23:37:22.000000000 +0100 +++ new/phraze-0.3.18/word-lists/orchard-street-medium.txt 2025-02-03 19:27:07.000000000 +0100 @@ -3056,6 +3056,7 @@ flute flux flying +foam focal focus focused @@ -3466,7 +3467,6 @@ hands handsome hang -hank happen happened happening ++++++ phraze.obsinfo ++++++ --- /var/tmp/diff_new_pack.eqwM0o/_old 2025-02-17 20:58:57.963579912 +0100 +++ /var/tmp/diff_new_pack.eqwM0o/_new 2025-02-17 20:58:57.967580079 +0100 @@ -1,5 +1,5 @@ name: phraze -version: 0.3.17 -mtime: 1732660642 -commit: 255999ac91de399caa8f13537e3be27eb5f191ea +version: 0.3.18 +mtime: 1738607227 +commit: 20a494484db75fd6e272c3b58d78911d424f6538 ++++++ vendor.tar.xz ++++++ /work/SRC/openSUSE:Factory/phraze/vendor.tar.xz /work/SRC/openSUSE:Factory/.phraze.new.8181/vendor.tar.xz differ: char 15, line 1