From 1864dc7bdd8f946698e7507872516d18db8a8997 Mon Sep 17 00:00:00 2001 From: lan496 Date: Wed, 12 Feb 2025 19:53:59 +0900 Subject: [PATCH] Bump up crates --- Cargo.lock | 285 +++++++++++++++++---------------- justfile | 4 + moyo/Cargo.toml | 14 +- moyo/src/math/delaunay.rs | 36 ++--- moyo/src/math/hnf.rs | 6 +- moyo/src/math/minkowski.rs | 36 ++--- moyo/src/math/niggli.rs | 36 ++--- moyo/src/math/snf.rs | 6 +- moyopy/Cargo.toml | 4 +- moyopy/python/moyopy/_data.pyi | 2 +- moyopy/src/data.rs | 1 + 11 files changed, 218 insertions(+), 212 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f84f5b3..3ae07ee 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -343,6 +343,12 @@ dependencies = [ "syn", ] +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + [[package]] name = "fixed" version = "1.28.0" @@ -356,54 +362,12 @@ dependencies = [ "typenum", ] -[[package]] -name = "futures" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" -dependencies = [ - "futures-core", - "futures-sink", -] - [[package]] name = "futures-core" version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" -[[package]] -name = "futures-executor" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" - [[package]] name = "futures-macro" version = "0.3.31" @@ -415,12 +379,6 @@ dependencies = [ "syn", ] -[[package]] -name = "futures-sink" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" - [[package]] name = "futures-task" version = "0.3.31" @@ -439,13 +397,9 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ - "futures-channel", "futures-core", - "futures-io", "futures-macro", - "futures-sink", "futures-task", - "memchr", "pin-project-lite", "pin-utils", "slab", @@ -466,13 +420,14 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.15" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8" dependencies = [ "cfg-if", "libc", "wasi", + "windows-targets", ] [[package]] @@ -491,11 +446,17 @@ dependencies = [ "crunchy", ] +[[package]] +name = "hashbrown" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" + [[package]] name = "heck" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hermit-abi" @@ -509,6 +470,16 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" +[[package]] +name = "indexmap" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652" +dependencies = [ + "equivalent", + "hashbrown", +] + [[package]] name = "indoc" version = "2.0.5" @@ -556,6 +527,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.14" @@ -610,16 +590,6 @@ version = "0.2.169" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" -[[package]] -name = "lock_api" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" -dependencies = [ - "autocfg", - "scopeguard", -] - [[package]] name = "log" version = "0.4.25" @@ -667,7 +637,7 @@ dependencies = [ "approx", "criterion", "env_logger", - "itertools 0.13.0", + "itertools 0.14.0", "kiddo", "log", "nalgebra", @@ -811,29 +781,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" -[[package]] -name = "parking_lot" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets", -] - [[package]] name = "paste" version = "1.0.15" @@ -892,7 +839,16 @@ version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" dependencies = [ - "zerocopy", + "zerocopy 0.7.35", +] + +[[package]] +name = "proc-macro-crate" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" +dependencies = [ + "toml_edit", ] [[package]] @@ -906,15 +862,15 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.21.2" +version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5e00b96a521718e08e03b1a622f01c8a8deb50719335de3f60b3b3950f069d8" +checksum = "57fe09249128b3173d092de9523eaa75136bf7ba85e0d69eca241c7939c933cc" dependencies = [ "cfg-if", "indoc", "libc", "memoffset", - "parking_lot", + "once_cell", "portable-atomic", "pyo3-build-config", "pyo3-ffi", @@ -924,9 +880,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.21.2" +version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7883df5835fafdad87c0d888b266c8ec0f4c9ca48a5bed6bbb592e8dedee1b50" +checksum = "1cd3927b5a78757a0d71aa9dff669f903b1eb64b54142a9bd9f757f8fde65fd7" dependencies = [ "once_cell", "target-lexicon", @@ -934,9 +890,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.21.2" +version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01be5843dc60b916ab4dad1dca6d20b9b4e6ddc8e15f50c47fe6d85f1fb97403" +checksum = "dab6bb2102bd8f991e7749f130a70d05dd557613e39ed2deeee8e9ca0c4d548d" dependencies = [ "libc", "pyo3-build-config", @@ -944,9 +900,9 @@ dependencies = [ [[package]] name = "pyo3-log" -version = "0.10.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2af49834b8d2ecd555177e63b273b708dea75150abc6f5341d0a6e1a9623976c" +checksum = "be5bb22b77965a7b5394e9aae9897a0607b51df5167561ffc3b02643b4200bc7" dependencies = [ "arc-swap", "log", @@ -955,9 +911,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.21.2" +version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77b34069fc0682e11b31dbd10321cbf94808394c56fd996796ce45217dfac53c" +checksum = "91871864b353fd5ffcb3f91f2f703a22a9797c91b9ab497b1acac7b07ae509c7" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -967,9 +923,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.21.2" +version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08260721f32db5e1a5beae69a55553f56b99bd0e1c3e6e0a5e8851a9d0f5a85c" +checksum = "43abc3b80bc20f3facd86cd3c60beed58c3e2aa26213f3cda368de39c60a27e4" dependencies = [ "heck", "proc-macro2", @@ -989,20 +945,20 @@ dependencies = [ [[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 0.8.17", ] [[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", @@ -1010,11 +966,12 @@ dependencies = [ [[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 0.8.17", ] [[package]] @@ -1043,15 +1000,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "redox_syscall" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" -dependencies = [ - "bitflags", -] - [[package]] name = "regex" version = "1.11.1" @@ -1104,24 +1052,25 @@ checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2" [[package]] name = "rstest" -version = "0.18.2" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97eeab2f3c0a199bc4be135c36c924b6590b88c377d416494288c14f2db30199" +checksum = "03e905296805ab93e13c1ec3a03f4b6c4f35e9498a3d5fa96dc626d22c03cd89" dependencies = [ - "futures", "futures-timer", + "futures-util", "rstest_macros", "rustc_version", ] [[package]] name = "rstest_macros" -version = "0.18.2" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d428f8247852f894ee1be110b375111b586d4fa431f6c46e64ba5a0dcccbe605" +checksum = "ef0053bbffce09062bee4bcc499b0fbe7a57b879f1efe088d6d8d4c7adcdef9b" dependencies = [ "cfg-if", "glob", + "proc-macro-crate", "proc-macro2", "quote", "regex", @@ -1170,12 +1119,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - [[package]] name = "semver" version = "1.0.25" @@ -1259,15 +1202,15 @@ checksum = "d372029cb5195f9ab4e4b9aef550787dce78b124fcaee8d82519925defcd6f0d" [[package]] name = "strum" -version = "0.25.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +checksum = "ce1475c515a4f03a8a7129bb5228b81a781a86cb0b3fbbc19e1c556d491a401f" [[package]] name = "strum_macros" -version = "0.25.3" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" +checksum = "9688894b43459159c82bfa5a5fa0435c19cbe3c9b427fa1dd7b1ce0c279b18a7" dependencies = [ "heck", "proc-macro2", @@ -1317,18 +1260,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.69" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.69" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" +checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2" dependencies = [ "proc-macro2", "quote", @@ -1355,6 +1298,23 @@ dependencies = [ "serde_json", ] +[[package]] +name = "toml_datetime" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" + +[[package]] +name = "toml_edit" +version = "0.22.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow", +] + [[package]] name = "tracing" version = "0.1.41" @@ -1470,9 +1430,12 @@ dependencies = [ [[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" @@ -1720,6 +1683,24 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +[[package]] +name = "winnow" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59690dea168f2198d1a3b0cac23b8063efcd11012f10ae4698f284808c8ef603" +dependencies = [ + "memchr", +] + +[[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.7.35" @@ -1727,7 +1708,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ "byteorder", - "zerocopy-derive", + "zerocopy-derive 0.7.35", +] + +[[package]] +name = "zerocopy" +version = "0.8.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa91407dacce3a68c56de03abe2760159582b846c6a4acd2f456618087f12713" +dependencies = [ + "zerocopy-derive 0.8.17", ] [[package]] @@ -1740,3 +1730,14 @@ dependencies = [ "quote", "syn", ] + +[[package]] +name = "zerocopy-derive" +version = "0.8.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06718a168365cad3d5ff0bb133aad346959a2074bd4a85c121255a11304a8626" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] diff --git a/justfile b/justfile index 88fe39b..3b498b4 100644 --- a/justfile +++ b/justfile @@ -26,6 +26,10 @@ test: doc: cargo doc --open +[group('rust')] +upgrade: + cargo upgrade -i + [group('rust')] [working-directory: 'moyo'] profile: diff --git a/moyo/Cargo.toml b/moyo/Cargo.toml index 6b385e5..c4110f4 100644 --- a/moyo/Cargo.toml +++ b/moyo/Cargo.toml @@ -19,17 +19,17 @@ serde.workspace = true serde_json.workspace = true approx.workspace = true log.workspace = true -itertools = "0.13" -thiserror = "1.0" +itertools = "0.14" +thiserror = "2.0" union-find = "0.4" -strum = "0.25" -strum_macros = "0.25" +strum = "0.27" +strum_macros = "0.27" kiddo = "5.0.3" -once_cell = "1.20.2" +once_cell = "1.20.3" [dev-dependencies] -rand = "0.8" -rstest = "0.18" +rand = "0.9" +rstest = "0.24" criterion = { version = "0.5", features = ["html_reports"] } env_logger = "0.11" test-log = "0.2" diff --git a/moyo/src/math/delaunay.rs b/moyo/src/math/delaunay.rs index c0dd998..915f43e 100644 --- a/moyo/src/math/delaunay.rs +++ b/moyo/src/math/delaunay.rs @@ -126,15 +126,15 @@ mod tests { for _ in 0..256 { let basis = Matrix3::::new( - rng.gen::() as f64, - rng.gen::() as f64, - rng.gen::() as f64, - rng.gen::() as f64, - rng.gen::() as f64, - rng.gen::() as f64, - rng.gen::() as f64, - rng.gen::() as f64, - rng.gen::() as f64, + rng.random::() as f64, + rng.random::() as f64, + rng.random::() as f64, + rng.random::() as f64, + rng.random::() as f64, + rng.random::() as f64, + rng.random::() as f64, + rng.random::() as f64, + rng.random::() as f64, ); let (reduced_basis, trans_mat) = delaunay_reduce(&basis); assert_relative_eq!( @@ -146,15 +146,15 @@ mod tests { for _ in 0..256 { let basis = Matrix3::::new( - rng.gen(), - rng.gen(), - rng.gen(), - rng.gen(), - rng.gen(), - rng.gen(), - rng.gen(), - rng.gen(), - rng.gen(), + rng.random(), + rng.random(), + rng.random(), + rng.random(), + rng.random(), + rng.random(), + rng.random(), + rng.random(), + rng.random(), ); let (reduced_basis, trans_mat) = delaunay_reduce(&basis); assert_relative_eq!( diff --git a/moyo/src/math/hnf.rs b/moyo/src/math/hnf.rs index 71fe29e..0e6b1bc 100644 --- a/moyo/src/math/hnf.rs +++ b/moyo/src/math/hnf.rs @@ -133,13 +133,13 @@ mod tests { let mut rng: StdRng = SeedableRng::from_seed([0; 32]); for _ in 0..256 { - let m = SMatrix::::from_fn(|_, _| rng.gen_range(-4..4)); + let m = SMatrix::::from_fn(|_, _| rng.random_range(-4..4)); let _ = HNF::new(&m); - let m = SMatrix::::from_fn(|_, _| rng.gen_range(-4..4)); + let m = SMatrix::::from_fn(|_, _| rng.random_range(-4..4)); let _ = HNF::new(&m); - let m = SMatrix::::from_fn(|_, _| rng.gen_range(-4..4)); + let m = SMatrix::::from_fn(|_, _| rng.random_range(-4..4)); let _ = HNF::new(&m); } } diff --git a/moyo/src/math/minkowski.rs b/moyo/src/math/minkowski.rs index a6a3e96..0242cc4 100644 --- a/moyo/src/math/minkowski.rs +++ b/moyo/src/math/minkowski.rs @@ -213,15 +213,15 @@ mod tests { for _ in 0..256 { let basis = Matrix3::::new( - rng.gen::() as f64, - rng.gen::() as f64, - rng.gen::() as f64, - rng.gen::() as f64, - rng.gen::() as f64, - rng.gen::() as f64, - rng.gen::() as f64, - rng.gen::() as f64, - rng.gen::() as f64, + rng.random::() as f64, + rng.random::() as f64, + rng.random::() as f64, + rng.random::() as f64, + rng.random::() as f64, + rng.random::() as f64, + rng.random::() as f64, + rng.random::() as f64, + rng.random::() as f64, ); let (reduced_basis, trans_mat) = minkowski_reduce(&basis); assert!(is_minkowski_reduced(&reduced_basis)); @@ -230,15 +230,15 @@ mod tests { for _ in 0..256 { let basis = Matrix3::::new( - rng.gen(), - rng.gen(), - rng.gen(), - rng.gen(), - rng.gen(), - rng.gen(), - rng.gen(), - rng.gen(), - rng.gen(), + rng.random(), + rng.random(), + rng.random(), + rng.random(), + rng.random(), + rng.random(), + rng.random(), + rng.random(), + rng.random(), ); let (reduced_basis, trans_mat) = minkowski_reduce(&basis); assert!(is_minkowski_reduced(&reduced_basis)); diff --git a/moyo/src/math/niggli.rs b/moyo/src/math/niggli.rs index 4c6acdd..71f7b24 100644 --- a/moyo/src/math/niggli.rs +++ b/moyo/src/math/niggli.rs @@ -471,15 +471,15 @@ mod tests { for _ in 0..256 { let basis = Matrix3::::new( - rng.gen::() as f64, - rng.gen::() as f64, - rng.gen::() as f64, - rng.gen::() as f64, - rng.gen::() as f64, - rng.gen::() as f64, - rng.gen::() as f64, - rng.gen::() as f64, - rng.gen::() as f64, + rng.random::() as f64, + rng.random::() as f64, + rng.random::() as f64, + rng.random::() as f64, + rng.random::() as f64, + rng.random::() as f64, + rng.random::() as f64, + rng.random::() as f64, + rng.random::() as f64, ); let (reduced_basis, trans_mat) = niggli_reduce(&basis); @@ -489,15 +489,15 @@ mod tests { for _ in 0..256 { let basis = Matrix3::::new( - rng.gen(), - rng.gen(), - rng.gen(), - rng.gen(), - rng.gen(), - rng.gen(), - rng.gen(), - rng.gen(), - rng.gen(), + rng.random(), + rng.random(), + rng.random(), + rng.random(), + rng.random(), + rng.random(), + rng.random(), + rng.random(), + rng.random(), ); let (reduced_basis, trans_mat) = niggli_reduce(&basis); assert!(is_niggli_reduced(&reduced_basis)); diff --git a/moyo/src/math/snf.rs b/moyo/src/math/snf.rs index edb7816..e726540 100644 --- a/moyo/src/math/snf.rs +++ b/moyo/src/math/snf.rs @@ -133,13 +133,13 @@ mod tests { let mut rng: StdRng = SeedableRng::from_seed([0; 32]); for _ in 0..256 { - let m = SMatrix::::from_fn(|_, _| rng.gen_range(-4..4)); + let m = SMatrix::::from_fn(|_, _| rng.random_range(-4..4)); let _ = SNF::new(&m); - let m = SMatrix::::from_fn(|_, _| rng.gen_range(-4..4)); + let m = SMatrix::::from_fn(|_, _| rng.random_range(-4..4)); let _ = SNF::new(&m); - let m = SMatrix::::from_fn(|_, _| rng.gen_range(-4..4)); + let m = SMatrix::::from_fn(|_, _| rng.random_range(-4..4)); let _ = SNF::new(&m); } } diff --git a/moyopy/Cargo.toml b/moyopy/Cargo.toml index 6a410e8..50e1b43 100644 --- a/moyopy/Cargo.toml +++ b/moyopy/Cargo.toml @@ -22,8 +22,8 @@ serde.workspace = true serde_json.workspace = true approx.workspace = true log.workspace = true -pyo3-log = "0.10" +pyo3-log = "0.12" [dependencies.pyo3] -version = "0.21" +version = "0.23" features = ["abi3-py39"] diff --git a/moyopy/python/moyopy/_data.pyi b/moyopy/python/moyopy/_data.pyi index 44914ca..d3ad900 100644 --- a/moyopy/python/moyopy/_data.pyi +++ b/moyopy/python/moyopy/_data.pyi @@ -126,4 +126,4 @@ class MagneticSpaceGroupType: def construct_type(self) -> int: """Construct type of magnetic space group from 1 to 4.""" -def operations_from_number(number: int, setting: Setting) -> Operations: ... +def operations_from_number(number: int, *, setting: Setting | None = None) -> Operations: ... diff --git a/moyopy/src/data.rs b/moyopy/src/data.rs index c5bf6d3..f6fc560 100644 --- a/moyopy/src/data.rs +++ b/moyopy/src/data.rs @@ -15,6 +15,7 @@ use moyo::base::{MoyoError, Operation}; use moyo::data::{hall_symbol_entry, HallSymbol, Setting}; #[pyfunction] +#[pyo3(signature = (number, *, setting=None))] pub fn operations_from_number( number: i32, setting: Option,