Compare commits
4 Commits
0b181fab6e
...
78b9f39bea
| Author | SHA1 | Date | |
|---|---|---|---|
78b9f39bea
|
|||
|
af75747980
|
|||
|
529c6abcb3
|
|||
|
087b318e8d
|
192
Cargo.lock
generated
192
Cargo.lock
generated
@ -40,9 +40,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "allocator-api2"
|
name = "allocator-api2"
|
||||||
version = "0.2.18"
|
version = "0.2.16"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
|
checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "android-tzdata"
|
name = "android-tzdata"
|
||||||
@ -109,9 +109,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "anyhow"
|
name = "anyhow"
|
||||||
version = "1.0.82"
|
version = "1.0.81"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519"
|
checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"backtrace",
|
"backtrace",
|
||||||
]
|
]
|
||||||
@ -133,13 +133,13 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "async-trait"
|
name = "async-trait"
|
||||||
version = "0.1.80"
|
version = "0.1.79"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
|
checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
"syn 2.0.60",
|
"syn 2.0.58",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -216,9 +216,9 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "bumpalo"
|
name = "bumpalo"
|
||||||
version = "3.16.0"
|
version = "3.15.4"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
|
checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "bytemuck"
|
name = "bytemuck"
|
||||||
@ -234,9 +234,9 @@ checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cc"
|
name = "cc"
|
||||||
version = "1.0.95"
|
version = "1.0.90"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "d32a725bc159af97c3e629873bb9f88fb8cf8a4867175f76dc987815ea07c83b"
|
checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cfg-if"
|
name = "cfg-if"
|
||||||
@ -252,9 +252,9 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "chrono"
|
name = "chrono"
|
||||||
version = "0.4.38"
|
version = "0.4.37"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
|
checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"android-tzdata",
|
"android-tzdata",
|
||||||
"iana-time-zone",
|
"iana-time-zone",
|
||||||
@ -262,7 +262,7 @@ dependencies = [
|
|||||||
"num-traits",
|
"num-traits",
|
||||||
"serde",
|
"serde",
|
||||||
"wasm-bindgen",
|
"wasm-bindgen",
|
||||||
"windows-targets 0.52.5",
|
"windows-targets 0.52.4",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -296,7 +296,7 @@ dependencies = [
|
|||||||
"heck",
|
"heck",
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
"syn 2.0.60",
|
"syn 2.0.58",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -484,7 +484,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
"syn 2.0.60",
|
"syn 2.0.58",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -558,7 +558,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
"syn 2.0.60",
|
"syn 2.0.58",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -593,9 +593,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "getrandom"
|
name = "getrandom"
|
||||||
version = "0.2.14"
|
version = "0.2.12"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c"
|
checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cfg-if",
|
"cfg-if",
|
||||||
"js-sys",
|
"js-sys",
|
||||||
@ -919,7 +919,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
|
checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cfg-if",
|
"cfg-if",
|
||||||
"windows-targets 0.52.5",
|
"windows-targets 0.52.4",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -1214,9 +1214,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "proc-macro2"
|
name = "proc-macro2"
|
||||||
version = "1.0.81"
|
version = "1.0.79"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba"
|
checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"unicode-ident",
|
"unicode-ident",
|
||||||
]
|
]
|
||||||
@ -1229,9 +1229,9 @@ checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "quote"
|
name = "quote"
|
||||||
version = "1.0.36"
|
version = "1.0.35"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
|
checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
]
|
]
|
||||||
@ -1244,9 +1244,9 @@ checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "raw-window-handle"
|
name = "raw-window-handle"
|
||||||
version = "0.6.1"
|
version = "0.6.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "8cc3bcbdb1ddfc11e700e62968e6b4cc9c75bb466464ad28fb61c5b2c964418b"
|
checksum = "42a9830a0e1b9fb145ebb365b8bc4ccd75f290f98c0247deafbbe2c75cefb544"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "redox_syscall"
|
name = "redox_syscall"
|
||||||
@ -1435,29 +1435,29 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "serde"
|
name = "serde"
|
||||||
version = "1.0.198"
|
version = "1.0.197"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc"
|
checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"serde_derive",
|
"serde_derive",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "serde_derive"
|
name = "serde_derive"
|
||||||
version = "1.0.198"
|
version = "1.0.197"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9"
|
checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
"syn 2.0.60",
|
"syn 2.0.58",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "serde_json"
|
name = "serde_json"
|
||||||
version = "1.0.116"
|
version = "1.0.115"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813"
|
checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"indexmap",
|
"indexmap",
|
||||||
"itoa",
|
"itoa",
|
||||||
@ -1467,13 +1467,13 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "serde_repr"
|
name = "serde_repr"
|
||||||
version = "0.1.19"
|
version = "0.1.18"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
|
checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
"syn 2.0.60",
|
"syn 2.0.58",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -1487,9 +1487,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "signal-hook-registry"
|
name = "signal-hook-registry"
|
||||||
version = "1.4.2"
|
version = "1.4.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
|
checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"libc",
|
"libc",
|
||||||
]
|
]
|
||||||
@ -1586,9 +1586,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "syn"
|
name = "syn"
|
||||||
version = "2.0.60"
|
version = "2.0.58"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3"
|
checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
@ -1632,9 +1632,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "thirtyfour-macros"
|
name = "thirtyfour-macros"
|
||||||
version = "0.1.2"
|
version = "0.1.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "67c98f6ff7045a00ce7ef2fb2f5ebd5c3c6dfe8fc0c1858249e32555fa8059df"
|
checksum = "9cae91d1c7c61ec65817f1064954640ee350a50ae6548ff9a1bdd2489d6ffbb0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro-error",
|
"proc-macro-error",
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
@ -1644,22 +1644,22 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "thiserror"
|
name = "thiserror"
|
||||||
version = "1.0.59"
|
version = "1.0.58"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa"
|
checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"thiserror-impl",
|
"thiserror-impl",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "thiserror-impl"
|
name = "thiserror-impl"
|
||||||
version = "1.0.59"
|
version = "1.0.58"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66"
|
checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
"syn 2.0.60",
|
"syn 2.0.58",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -1674,9 +1674,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "time"
|
name = "time"
|
||||||
version = "0.3.36"
|
version = "0.3.34"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
|
checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"deranged",
|
"deranged",
|
||||||
"itoa",
|
"itoa",
|
||||||
@ -1695,9 +1695,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "time-macros"
|
name = "time-macros"
|
||||||
version = "0.2.18"
|
version = "0.2.17"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
|
checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"num-conv",
|
"num-conv",
|
||||||
"time-core",
|
"time-core",
|
||||||
@ -1745,7 +1745,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
"syn 2.0.60",
|
"syn 2.0.58",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -1784,7 +1784,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
"syn 2.0.60",
|
"syn 2.0.58",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -1831,7 +1831,7 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tswn"
|
name = "tswn"
|
||||||
version = "0.1.5"
|
version = "0.1.3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"base16384",
|
"base16384",
|
||||||
"chrono",
|
"chrono",
|
||||||
@ -1839,7 +1839,6 @@ dependencies = [
|
|||||||
"colored",
|
"colored",
|
||||||
"tracing",
|
"tracing",
|
||||||
"tracing-subscriber",
|
"tracing-subscriber",
|
||||||
"windows-sys 0.48.0",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -1964,7 +1963,7 @@ dependencies = [
|
|||||||
"once_cell",
|
"once_cell",
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
"syn 2.0.60",
|
"syn 2.0.58",
|
||||||
"wasm-bindgen-shared",
|
"wasm-bindgen-shared",
|
||||||
]
|
]
|
||||||
|
|
||||||
@ -1998,7 +1997,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
"syn 2.0.60",
|
"syn 2.0.58",
|
||||||
"wasm-bindgen-backend",
|
"wasm-bindgen-backend",
|
||||||
"wasm-bindgen-shared",
|
"wasm-bindgen-shared",
|
||||||
]
|
]
|
||||||
@ -2050,9 +2049,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wgpu"
|
name = "wgpu"
|
||||||
version = "0.19.4"
|
version = "0.19.3"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "cbd7311dbd2abcfebaabf1841a2824ed7c8be443a0f29166e5d3c6a53a762c01"
|
checksum = "a4b1213b52478a7631d6e387543ed8f642bc02c578ef4e3b49aca2a29a7df0cb"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"arrayvec",
|
"arrayvec",
|
||||||
"cfg-if",
|
"cfg-if",
|
||||||
@ -2075,9 +2074,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wgpu-core"
|
name = "wgpu-core"
|
||||||
version = "0.19.4"
|
version = "0.19.3"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "28b94525fc99ba9e5c9a9e24764f2bc29bad0911a7446c12f446a8277369bf3a"
|
checksum = "f9f6b033c2f00ae0bc8ea872c5989777c60bc241aac4e58b24774faa8b391f78"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"arrayvec",
|
"arrayvec",
|
||||||
"bit-vec",
|
"bit-vec",
|
||||||
@ -2101,9 +2100,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wgpu-hal"
|
name = "wgpu-hal"
|
||||||
version = "0.19.4"
|
version = "0.19.3"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "fc1a4924366df7ab41a5d8546d6534f1f33231aa5b3f72b9930e300f254e39c3"
|
checksum = "49f972c280505ab52ffe17e94a7413d9d54b58af0114ab226b9fc4999a47082e"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"android_system_properties",
|
"android_system_properties",
|
||||||
"arrayvec",
|
"arrayvec",
|
||||||
@ -2193,11 +2192,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "winapi-util"
|
name = "winapi-util"
|
||||||
version = "0.1.8"
|
version = "0.1.6"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
|
checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"windows-sys 0.52.0",
|
"winapi",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -2213,7 +2212,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
|
checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"windows-core",
|
"windows-core",
|
||||||
"windows-targets 0.52.5",
|
"windows-targets 0.52.4",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -2222,7 +2221,7 @@ version = "0.52.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
|
checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"windows-targets 0.52.5",
|
"windows-targets 0.52.4",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -2240,7 +2239,7 @@ version = "0.52.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
|
checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"windows-targets 0.52.5",
|
"windows-targets 0.52.4",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -2260,18 +2259,17 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows-targets"
|
name = "windows-targets"
|
||||||
version = "0.52.5"
|
version = "0.52.4"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
|
checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"windows_aarch64_gnullvm 0.52.5",
|
"windows_aarch64_gnullvm 0.52.4",
|
||||||
"windows_aarch64_msvc 0.52.5",
|
"windows_aarch64_msvc 0.52.4",
|
||||||
"windows_i686_gnu 0.52.5",
|
"windows_i686_gnu 0.52.4",
|
||||||
"windows_i686_gnullvm",
|
"windows_i686_msvc 0.52.4",
|
||||||
"windows_i686_msvc 0.52.5",
|
"windows_x86_64_gnu 0.52.4",
|
||||||
"windows_x86_64_gnu 0.52.5",
|
"windows_x86_64_gnullvm 0.52.4",
|
||||||
"windows_x86_64_gnullvm 0.52.5",
|
"windows_x86_64_msvc 0.52.4",
|
||||||
"windows_x86_64_msvc 0.52.5",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -2282,9 +2280,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows_aarch64_gnullvm"
|
name = "windows_aarch64_gnullvm"
|
||||||
version = "0.52.5"
|
version = "0.52.4"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
|
checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows_aarch64_msvc"
|
name = "windows_aarch64_msvc"
|
||||||
@ -2294,9 +2292,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows_aarch64_msvc"
|
name = "windows_aarch64_msvc"
|
||||||
version = "0.52.5"
|
version = "0.52.4"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
|
checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows_i686_gnu"
|
name = "windows_i686_gnu"
|
||||||
@ -2306,15 +2304,9 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows_i686_gnu"
|
name = "windows_i686_gnu"
|
||||||
version = "0.52.5"
|
version = "0.52.4"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
|
checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "windows_i686_gnullvm"
|
|
||||||
version = "0.52.5"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows_i686_msvc"
|
name = "windows_i686_msvc"
|
||||||
@ -2324,9 +2316,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows_i686_msvc"
|
name = "windows_i686_msvc"
|
||||||
version = "0.52.5"
|
version = "0.52.4"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
|
checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows_x86_64_gnu"
|
name = "windows_x86_64_gnu"
|
||||||
@ -2336,9 +2328,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows_x86_64_gnu"
|
name = "windows_x86_64_gnu"
|
||||||
version = "0.52.5"
|
version = "0.52.4"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
|
checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows_x86_64_gnullvm"
|
name = "windows_x86_64_gnullvm"
|
||||||
@ -2348,9 +2340,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows_x86_64_gnullvm"
|
name = "windows_x86_64_gnullvm"
|
||||||
version = "0.52.5"
|
version = "0.52.4"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
|
checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows_x86_64_msvc"
|
name = "windows_x86_64_msvc"
|
||||||
@ -2360,9 +2352,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows_x86_64_msvc"
|
name = "windows_x86_64_msvc"
|
||||||
version = "0.52.5"
|
version = "0.52.4"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
|
checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "xml-rs"
|
name = "xml-rs"
|
||||||
@ -2387,5 +2379,5 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
"syn 2.0.60",
|
"syn 2.0.58",
|
||||||
]
|
]
|
||||||
|
|||||||
@ -1,29 +1,20 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "tswn"
|
name = "tswn"
|
||||||
description = "tool shenjack work shop namerena"
|
description = "tool shenjack work shop namerena"
|
||||||
version = "0.1.5"
|
version = "0.1.3"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
clap = { version = "4.5.4", features = ["derive"] }
|
clap = { version = "4.5.1", features = ["derive"] }
|
||||||
base16384 = "0.1.0"
|
base16384 = "0.1.0"
|
||||||
|
|
||||||
tracing = "0.1.40"
|
tracing = "0.1.40"
|
||||||
tracing-subscriber = { version = "0.3.18", features = ["time"] }
|
tracing-subscriber = { version = "0.3.18", features = ["time"] }
|
||||||
chrono = "0.4"
|
chrono = "0.4.34"
|
||||||
colored = "2.1.0"
|
colored = "2.1.0"
|
||||||
|
|
||||||
# windows 下额外指定一个 windows 依赖 (微软赛高!)
|
|
||||||
# 用于在 bench 状态下指定核心(就是闲得)
|
|
||||||
|
|
||||||
[target.'cfg(windows)'.dependencies]
|
|
||||||
windows-sys = { version = "*", features = [
|
|
||||||
"Win32_Foundation",
|
|
||||||
"Win32_System_Threading",
|
|
||||||
] }
|
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
default = ["simd"]
|
default = ["simd"]
|
||||||
simd = []
|
simd = []
|
||||||
|
|||||||
1
miner/docs/.gitignore
vendored
1
miner/docs/.gitignore
vendored
@ -1 +0,0 @@
|
|||||||
runs
|
|
||||||
@ -1,169 +0,0 @@
|
|||||||
# tswn (miner bench)
|
|
||||||
|
|
||||||
## 方法
|
|
||||||
|
|
||||||
> --release
|
|
||||||
|
|
||||||
`--team shenjacks -q 5500 --end 100000000 --bench`
|
|
||||||
|
|
||||||
环境
|
|
||||||
|
|
||||||
> 5600x 4.3GHz
|
|
||||||
|
|
||||||
## 结果
|
|
||||||
|
|
||||||
### 0.1.5
|
|
||||||
|
|
||||||
> 要命
|
|
||||||
>
|
|
||||||
> 不过至少榨干了
|
|
||||||
>
|
|
||||||
> 虚评还没榨干呢就是了
|
|
||||||
|
|
||||||
```text
|
|
||||||
❯ .\runs\tswn-015.exe --team shenjacks -q 5500 --end 100000000 --bench
|
|
||||||
2024-04-25T16:57:24.563330Z INFO tswn: 输出文件: "./namerena/namerena-shenjacks-2024-04-26_00-57-24.txt"
|
|
||||||
2024-04-25T16:57:24.563545Z INFO tswn: 设置线程亲和性成功 4095
|
|
||||||
2024-04-25T16:57:24.563599Z INFO tswn: 开始: 0 结尾: 100000000
|
|
||||||
2024-04-25T16:57:24.563647Z INFO tswn: 线程数: 1
|
|
||||||
2024-04-25T16:57:24.563699Z INFO tswn: 八围预期: 640
|
|
||||||
2024-04-25T16:57:24.563743Z INFO tswn: 队伍名: shenjacks
|
|
||||||
2024-04-25T16:57:24.563785Z INFO tswn: 输出文件名: "./namerena/namerena-shenjacks-2024-04-26_00-57-24.txt"
|
|
||||||
2024-04-25T16:57:24.563829Z INFO tswn: 预期状态输出时间间隔: 10 秒
|
|
||||||
2024-04-25T16:57:24.563879Z INFO tswn: 是否启动 benchmark 模式: true
|
|
||||||
2024-04-25T16:57:24.563922Z INFO tswn: 开始 benchmark
|
|
||||||
2024-04-25T16:57:24.578851Z INFO tswn::cacluate: | 1|Id: 10000|671821.78/s 580.454E/d 0.01⬆️|0 |预计:0:2:28|
|
|
||||||
2024-04-25T16:57:34.578359Z INFO tswn::cacluate: | 1|Id: 6728210|671860.35/s 580.487E/d 10.00⬆️|0 |预计:0:2:18|
|
|
||||||
2024-04-25T16:57:44.575895Z INFO tswn::cacluate: | 1|Id: 13446810|672032.96/s 580.636E/d 10.00⬆️|0 |预计:0:2:8|
|
|
||||||
2024-04-25T16:57:54.591460Z INFO tswn::cacluate: | 1|Id: 20167130|670995.58/s 579.740E/d 10.02⬇️|0 |预计:0:1:58|
|
|
||||||
2024-04-25T16:58:04.566468Z INFO tswn::cacluate: | 1|Id: 26877080|672683.34/s 581.198E/d 9.97⬆️|0 |预计:0:1:48|
|
|
||||||
2024-04-25T16:58:14.569120Z INFO tswn::cacluate: | 1|Id: 33603910|672512.54/s 581.051E/d 10.00⬇️|0 |预计:0:1:38|
|
|
||||||
2024-04-25T16:58:24.568515Z INFO tswn::cacluate: | 1|Id: 40329030|672560.85/s 581.093E/d 10.00⬆️|0 |预计:0:1:28|
|
|
||||||
2024-04-25T16:58:34.568901Z INFO tswn::cacluate: | 1|Id: 47054630|672541.67/s 581.076E/d 10.00⬇️|0 |预计:0:1:18|
|
|
||||||
2024-04-25T16:58:44.567734Z INFO tswn::cacluate: | 1|Id: 53780040|672627.21/s 581.150E/d 10.00⬆️|0 |预计:0:1:8|
|
|
||||||
2024-04-25T16:58:54.566817Z INFO tswn::cacluate: | 1|Id: 60506310|672696.30/s 581.210E/d 10.00⬆️|0 |预计:0:0:58|
|
|
||||||
2024-04-25T16:59:04.552976Z INFO tswn::cacluate: | 1|Id: 67233270|673636.33/s 582.022E/d 9.99⬆️|0 |预计:0:0:48|
|
|
||||||
2024-04-25T16:59:14.573063Z INFO tswn::cacluate: | 1|Id: 73969630|672293.31/s 580.861E/d 10.02⬇️|0 |预计:0:0:38|
|
|
||||||
```
|
|
||||||
|
|
||||||
### 0.1.4
|
|
||||||
|
|
||||||
> 说啥来啥
|
|
||||||
|
|
||||||
```text
|
|
||||||
❯ .\runs\tswn-014.exe --team shenjacks -q 5500 --end 100000000 --bench
|
|
||||||
2024-04-25T16:41:01.955880Z INFO tswn: 输出文件: "./namerena/namerena-shenjacks-2024-04-26_00-41-01.txt"
|
|
||||||
2024-04-25T16:41:01.956097Z INFO tswn: 设置线程亲和性成功 4095
|
|
||||||
2024-04-25T16:41:01.956149Z INFO tswn: 开始: 0 结尾: 100000000
|
|
||||||
2024-04-25T16:41:01.956194Z INFO tswn: 线程数: 1
|
|
||||||
2024-04-25T16:41:01.956238Z INFO tswn: 八围预期: 640
|
|
||||||
2024-04-25T16:41:01.956281Z INFO tswn: 队伍名: shenjacks
|
|
||||||
2024-04-25T16:41:01.956324Z INFO tswn: 输出文件名: "./namerena/namerena-shenjacks-2024-04-26_00-41-01.txt"
|
|
||||||
2024-04-25T16:41:01.956368Z INFO tswn: 预期状态输出时间间隔: 10 秒
|
|
||||||
2024-04-25T16:41:01.956414Z INFO tswn: 是否启动 benchmark 模式: true
|
|
||||||
2024-04-25T16:41:01.956460Z INFO tswn: 开始 benchmark
|
|
||||||
2024-04-25T16:41:01.971405Z INFO tswn::cacluate: | 1|Id: 10000|671839.83/s 580.470E/d 0.01⬆️|0 |预计:0:2:28|
|
|
||||||
2024-04-25T16:41:11.993331Z INFO tswn::cacluate: | 1|Id: 6728390|670375.96/s 579.205E/d 10.02⬇️|0 |预计:0:2:19|
|
|
||||||
2024-04-25T16:41:21.985595Z INFO tswn::cacluate: | 1|Id: 13432140|670904.21/s 579.661E/d 9.99⬆️|0 |预计:0:2:9|
|
|
||||||
2024-04-25T16:41:32.000630Z INFO tswn::cacluate: | 1|Id: 20141180|669903.99/s 578.797E/d 10.01⬇️|0 |预计:0:1:59|
|
|
||||||
2024-04-25T16:41:41.977727Z INFO tswn::cacluate: | 1|Id: 26840210|671448.43/s 580.131E/d 9.98⬆️|0 |预计:0:1:48|
|
|
||||||
2024-04-25T16:41:51.971939Z INFO tswn::cacluate: | 1|Id: 33554690|671844.32/s 580.473E/d 9.99⬆️|0 |预计:0:1:38|
|
|
||||||
2024-04-25T16:42:01.998885Z INFO tswn::cacluate: | 1|Id: 40273130|670045.99/s 578.920E/d 10.03⬇️|0 |预计:0:1:29|
|
|
||||||
2024-04-25T16:42:11.987622Z INFO tswn::cacluate: | 1|Id: 46973580|670807.82/s 579.578E/d 9.99⬆️|0 |预计:0:1:19|
|
|
||||||
2024-04-25T16:42:21.991526Z INFO tswn::cacluate: | 1|Id: 53681650|670555.81/s 579.360E/d 10.00⬇️|0 |预计:0:1:9|
|
|
||||||
2024-04-25T16:42:31.964748Z INFO tswn::cacluate: | 1|Id: 60387200|672365.87/s 580.924E/d 9.97⬆️|0 |预计:0:0:58|
|
|
||||||
2024-04-25T16:42:41.948492Z INFO tswn::cacluate: | 1|Id: 67110850|673467.34/s 581.876E/d 9.98⬆️|0 |预计:0:0:48|
|
|
||||||
2024-04-25T16:42:51.961452Z INFO tswn::cacluate: | 1|Id: 73845520|672602.58/s 581.129E/d 10.01⬇️|0 |预计:0:0:38|
|
|
||||||
2024-04-25T16:43:01.963617Z INFO tswn::cacluate: | 1|Id: 80571540|672464.08/s 581.009E/d 10.00⬇️|0 |预计:0:0:28|
|
|
||||||
2024-04-25T16:43:11.971626Z INFO tswn::cacluate: | 1|Id: 87296180|671933.03/s 580.550E/d 10.01⬇️|0 |预计:0:0:18|
|
|
||||||
```
|
|
||||||
|
|
||||||
### 0.1.3
|
|
||||||
|
|
||||||
> 可算至少没有如升了
|
|
||||||
|
|
||||||
```text
|
|
||||||
❯ .\runs\tswn-013.exe --team shenjacks -q 5500 --end 100000000 --bench
|
|
||||||
2024-04-25T16:34:48.083060Z INFO tswn: 输出文件: "./namerena/namerena-shenjacks-2024-04-26_00-34-48.txt"
|
|
||||||
2024-04-25T16:34:48.083292Z INFO tswn: 设置线程亲和性成功 4095
|
|
||||||
2024-04-25T16:34:48.083349Z INFO tswn: 开始: 0 结尾: 100000000
|
|
||||||
2024-04-25T16:34:48.083397Z INFO tswn: 线程数: 1
|
|
||||||
2024-04-25T16:34:48.083441Z INFO tswn: 八围预期: 640
|
|
||||||
2024-04-25T16:34:48.083485Z INFO tswn: 队伍名: shenjacks
|
|
||||||
2024-04-25T16:34:48.083528Z INFO tswn: 输出文件名: "./namerena/namerena-shenjacks-2024-04-26_00-34-48.txt"
|
|
||||||
2024-04-25T16:34:48.083582Z INFO tswn: 预期状态输出时间间隔: 10 秒
|
|
||||||
2024-04-25T16:34:48.083630Z INFO tswn: 是否启动 benchmark 模式: true
|
|
||||||
2024-04-25T16:34:48.083675Z INFO tswn: 开始 benchmark
|
|
||||||
2024-04-25T16:34:48.098900Z INFO tswn::cacluate: | 1|Id: 10000|658761.53/s 569.170E/d 0.02⬆️|0 |预计:0:2:31|
|
|
||||||
2024-04-25T16:34:57.961474Z INFO tswn::cacluate: | 1|Id: 6597610|667946.59/s 577.106E/d 9.86⬆️|0 |预计:0:2:19|
|
|
||||||
2024-04-25T16:35:07.951406Z INFO tswn::cacluate: | 1|Id: 13277070|668626.78/s 577.694E/d 9.99⬆️|0 |预计:0:2:9|
|
|
||||||
2024-04-25T16:35:17.945802Z INFO tswn::cacluate: | 1|Id: 19963330|669008.84/s 578.024E/d 9.99⬆️|0 |预计:0:1:59|
|
|
||||||
2024-04-25T16:35:27.954792Z INFO tswn::cacluate: | 1|Id: 26653410|668414.35/s 577.510E/d 10.01⬇️|0 |预计:0:1:49|
|
|
||||||
2024-04-25T16:35:37.947746Z INFO tswn::cacluate: | 1|Id: 33337550|668892.23/s 577.923E/d 9.99⬆️|0 |预计:0:1:39|
|
|
||||||
2024-04-25T16:35:47.938790Z INFO tswn::cacluate: | 1|Id: 40026470|669498.85/s 578.447E/d 9.99⬆️|0 |预计:0:1:29|
|
|
||||||
2024-04-25T16:35:57.982945Z INFO tswn::cacluate: | 1|Id: 46721450|666561.93/s 575.910E/d 10.04⬇️|0 |预计:0:1:19|
|
|
||||||
2024-04-25T16:36:07.959973Z INFO tswn::cacluate: | 1|Id: 53387060|668105.84/s 577.243E/d 9.98⬆️|0 |预计:0:1:9|
|
|
||||||
2024-04-25T16:36:17.936227Z INFO tswn::cacluate: | 1|Id: 60068110|669702.86/s 578.623E/d 9.98⬆️|0 |预计:0:0:59|
|
|
||||||
2024-04-25T16:36:27.934845Z INFO tswn::cacluate: | 1|Id: 66765130|669801.76/s 578.709E/d 10.00⬆️|0 |预计:0:0:49|
|
|
||||||
```
|
|
||||||
|
|
||||||
### 0.1.2
|
|
||||||
|
|
||||||
> 咋到了这边就如改呢
|
|
||||||
|
|
||||||
```text
|
|
||||||
❯ .\runs\tswn-012.exe --team shenjacks -q 5500 --end 100000000 --bench
|
|
||||||
2024-04-25T16:29:10.751123Z INFO tswn: 输出文件: "./namerena/namerena-shenjacks-2024-04-26_00-29-10.txt"
|
|
||||||
2024-04-25T16:29:10.751340Z INFO tswn: 设置线程亲和性成功 4095
|
|
||||||
2024-04-25T16:29:10.751392Z INFO tswn: 开始: 0 结尾: 100000000
|
|
||||||
2024-04-25T16:29:10.751437Z INFO tswn: 线程数: 1
|
|
||||||
2024-04-25T16:29:10.751481Z INFO tswn: 八围预期: 640
|
|
||||||
2024-04-25T16:29:10.751525Z INFO tswn: 队伍名: shenjacks
|
|
||||||
2024-04-25T16:29:10.751569Z INFO tswn: 输出文件名: "./namerena/namerena-shenjacks-2024-04-26_00-29-10.txt"
|
|
||||||
2024-04-25T16:29:10.751616Z INFO tswn: 预期状态输出时间间隔: 10 秒
|
|
||||||
2024-04-25T16:29:10.751663Z INFO tswn: 是否启动 benchmark 模式: true
|
|
||||||
2024-04-25T16:29:10.751706Z INFO tswn: 开始 benchmark
|
|
||||||
2024-04-25T16:29:10.769613Z INFO tswn::cacluate: | 1|Id: 10000|559869.66/s 483.727E/d 0.02⬆️|0 |预计:0:2:58|
|
|
||||||
2024-04-25T16:29:20.792120Z INFO tswn::cacluate: | 1|Id: 5608690|558618.22/s 482.646E/d 10.02⬇️|0 |预计:0:2:48|
|
|
||||||
2024-04-25T16:29:30.783691Z INFO tswn::cacluate: | 1|Id: 11194870|559095.37/s 483.058E/d 9.99⬆️|0 |预计:0:2:38|
|
|
||||||
2024-04-25T16:29:40.782174Z INFO tswn::cacluate: | 1|Id: 16785820|559186.84/s 483.137E/d 10.00⬆️|0 |预计:0:2:28|
|
|
||||||
2024-04-25T16:29:50.778334Z INFO tswn::cacluate: | 1|Id: 22377680|559406.94/s 483.328E/d 10.00⬆️|0 |预计:0:2:18|
|
|
||||||
2024-04-25T16:30:00.784518Z INFO tswn::cacluate: | 1|Id: 27971740|559066.52/s 483.033E/d 10.01⬇️|0 |预计:0:2:8|
|
|
||||||
2024-04-25T16:30:10.782641Z INFO tswn::cacluate: | 1|Id: 33562400|559177.10/s 483.129E/d 10.00⬆️|0 |预计:0:1:58|
|
|
||||||
2024-04-25T16:30:20.780848Z INFO tswn::cacluate: | 1|Id: 39154170|559283.24/s 483.221E/d 10.00⬆️|0 |预计:0:1:48|
|
|
||||||
2024-04-25T16:30:30.780561Z INFO tswn::cacluate: | 1|Id: 44747000|559305.48/s 483.240E/d 10.00⬆️|0 |预计:0:1:38|
|
|
||||||
2024-04-25T16:30:40.788376Z INFO tswn::cacluate: | 1|Id: 50340050|558874.38/s 482.867E/d 10.01⬇️|0 |预计:0:1:28|
|
|
||||||
2024-04-25T16:30:50.781088Z INFO tswn::cacluate: | 1|Id: 55928790|559287.46/s 483.224E/d 9.99⬆️|0 |预计:0:1:18|
|
|
||||||
2024-04-25T16:31:00.787130Z INFO tswn::cacluate: | 1|Id: 61521660|558955.19/s 482.937E/d 10.01⬇️|0 |预计:0:1:8|
|
|
||||||
2024-04-25T16:31:10.774828Z INFO tswn::cacluate: | 1|Id: 67111210|559649.42/s 483.537E/d 9.99⬆️|0 |预计:0:0:58|
|
|
||||||
2024-04-25T16:31:20.780385Z INFO tswn::cacluate: | 1|Id: 72707700|559344.17/s 483.273E/d 10.01⬇️|0 |预计:0:0:48|
|
|
||||||
2024-04-25T16:31:30.789669Z INFO tswn::cacluate: | 1|Id: 78301140|558831.29/s 482.830E/d 10.01⬇️|0 |预计:0:0:38|
|
|
||||||
2024-04-25T16:31:40.769888Z INFO tswn::cacluate: | 1|Id: 83889450|559944.67/s 483.792E/d 9.98⬆️|0 |预计:0:0:28|
|
|
||||||
2024-04-25T16:31:50.780890Z INFO tswn::cacluate: | 1|Id: 89488890|559334.72/s 483.265E/d 10.01⬇️|0 |预计:0:0:18|
|
|
||||||
```
|
|
||||||
|
|
||||||
### 0.1.1
|
|
||||||
|
|
||||||
```text
|
|
||||||
❯ .\runs\tswn-011.exe --team shenjacks -q 5500 --end 100000000 --bench
|
|
||||||
2024-04-25T16:22:43.103952Z INFO tswn: 输出文件: "./namerena/namerena-shenjacks-2024-04-26_00-22-43.txt"
|
|
||||||
2024-04-25T16:22:43.104169Z INFO tswn: 设置线程亲和性成功 4095
|
|
||||||
2024-04-25T16:22:43.104223Z INFO tswn: 开始: 0 结尾: 100000000
|
|
||||||
2024-04-25T16:22:43.104270Z INFO tswn: 线程数: 1
|
|
||||||
2024-04-25T16:22:43.104313Z INFO tswn: 八围预期: 640
|
|
||||||
2024-04-25T16:22:43.104357Z INFO tswn: 队伍名: shenjacks
|
|
||||||
2024-04-25T16:22:43.104401Z INFO tswn: 输出文件名: "./namerena/namerena-shenjacks-2024-04-26_00-22-43.txt"
|
|
||||||
2024-04-25T16:22:43.104445Z INFO tswn: 预期状态输出时间间隔: 10 秒
|
|
||||||
2024-04-25T16:22:43.104494Z INFO tswn: 是否启动 benchmark 模式: true
|
|
||||||
2024-04-25T16:22:43.104539Z INFO tswn: 开始 benchmark
|
|
||||||
2024-04-25T16:22:43.122617Z INFO tswn::cacluate: | 1|Id: 10000|554545.05/s 479.127E/d 0.02⬆️|0 |预计:0:3:0|
|
|
||||||
2024-04-25T16:22:53.036437Z INFO tswn::cacluate: | 1|Id: 5555450|559371.31/s 483.297E/d 9.91⬆️|0 |预计:0:2:48|
|
|
||||||
2024-04-25T16:23:03.037739Z INFO tswn::cacluate: | 1|Id: 11149160|559304.37/s 483.239E/d 10.00⬇️|0 |预计:0:2:38|
|
|
||||||
2024-04-25T16:23:13.057818Z INFO tswn::cacluate: | 1|Id: 16742200|558189.62/s 482.276E/d 10.02⬇️|0 |预计:0:2:29|
|
|
||||||
2024-04-25T16:23:23.030494Z INFO tswn::cacluate: | 1|Id: 22324090|559724.72/s 483.602E/d 9.97⬆️|0 |预计:0:2:18|
|
|
||||||
2024-04-25T16:23:33.049657Z INFO tswn::cacluate: | 1|Id: 27921330|558661.02/s 482.683E/d 10.02⬇️|0 |预计:0:2:9|
|
|
||||||
2024-04-25T16:23:43.043393Z INFO tswn::cacluate: | 1|Id: 33507940|559017.44/s 482.991E/d 9.99⬆️|0 |预计:0:1:58|
|
|
||||||
2024-04-25T16:23:53.050200Z INFO tswn::cacluate: | 1|Id: 39098110|558643.05/s 482.668E/d 10.01⬇️|0 |预计:0:1:49|
|
|
||||||
2024-04-25T16:24:03.037297Z INFO tswn::cacluate: | 1|Id: 44684540|559371.02/s 483.297E/d 9.99⬆️|0 |预计:0:1:38|
|
|
||||||
2024-04-25T16:24:13.028762Z INFO tswn::cacluate: | 1|Id: 50278250|559855.15/s 483.715E/d 9.99⬆️|0 |预计:0:1:28|
|
|
||||||
```
|
|
||||||
@ -36,11 +36,6 @@ pub struct Command {
|
|||||||
/// 预期状态输出时间间隔 (秒)
|
/// 预期状态输出时间间隔 (秒)
|
||||||
#[arg(long, short = 'r', default_value_t = 10)]
|
#[arg(long, short = 'r', default_value_t = 10)]
|
||||||
pub report_interval: u64,
|
pub report_interval: u64,
|
||||||
/// 是否启动 benchmark 模式
|
|
||||||
///
|
|
||||||
/// Windows 下会强制单线程, 且设置线程亲和性为核心 0
|
|
||||||
#[arg(long = "bench", default_value_t = false)]
|
|
||||||
pub bench: bool,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Command {
|
impl Command {
|
||||||
@ -65,6 +60,7 @@ fn main() {
|
|||||||
let left = cli_arg.start % cli_arg.thread_count as u64;
|
let left = cli_arg.start % cli_arg.thread_count as u64;
|
||||||
cli_arg.end = cli_arg.end.wrapping_add(left);
|
cli_arg.end = cli_arg.end.wrapping_add(left);
|
||||||
|
|
||||||
|
let mut n = 0;
|
||||||
let mut threads = Vec::with_capacity(cli_arg.thread_count as usize);
|
let mut threads = Vec::with_capacity(cli_arg.thread_count as usize);
|
||||||
let now = chrono::Local::now().format("%Y-%m-%d_%H-%M-%S").to_string();
|
let now = chrono::Local::now().format("%Y-%m-%d_%H-%M-%S").to_string();
|
||||||
// namerena-<team>-<time>.txt
|
// namerena-<team>-<time>.txt
|
||||||
@ -77,46 +73,22 @@ fn main() {
|
|||||||
warn!("创建文件夹失败: {}", e);
|
warn!("创建文件夹失败: {}", e);
|
||||||
}
|
}
|
||||||
|
|
||||||
if cli_arg.bench {
|
|
||||||
cli_arg.thread_count = 1;
|
|
||||||
#[cfg(windows)]
|
|
||||||
unsafe {
|
|
||||||
use windows_sys::Win32::System::Threading::{GetCurrentThread, SetThreadAffinityMask};
|
|
||||||
|
|
||||||
let thread_id = GetCurrentThread();
|
|
||||||
let core_mask = 0x02;
|
|
||||||
match SetThreadAffinityMask(thread_id, core_mask) {
|
|
||||||
0 => warn!("设置线程亲和性失败 {}", std::io::Error::last_os_error()),
|
|
||||||
x => info!("设置线程亲和性成功 {}", x),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
info!("开始: {} 结尾: {}", cli_arg.start, cli_arg.end);
|
info!("开始: {} 结尾: {}", cli_arg.start, cli_arg.end);
|
||||||
info!("线程数: {}", cli_arg.thread_count);
|
info!("线程数: {}", cli_arg.thread_count);
|
||||||
info!("八围预期: {}", cli_arg.prop_expect);
|
info!("八围预期: {}", cli_arg.prop_expect);
|
||||||
info!("队伍名: {}", cli_arg.team);
|
info!("队伍名: {}", cli_arg.team);
|
||||||
info!("输出文件名: {:?}", out_path);
|
info!("输出文件名: {:?}", out_path);
|
||||||
info!("预期状态输出时间间隔: {} 秒", cli_arg.report_interval);
|
|
||||||
info!("是否启动 benchmark 模式: {}", cli_arg.bench);
|
|
||||||
|
|
||||||
if cli_arg.bench {
|
for i in 0..cli_arg.thread_count {
|
||||||
info!("开始 benchmark");
|
n += 1;
|
||||||
let config = cli_arg.as_cacl_config();
|
let config = cli_arg.as_cacl_config();
|
||||||
cacluate::cacl(config, 1, &out_path);
|
let out_path = out_path.clone();
|
||||||
} else {
|
let thread_name = format!("thread_{}", i);
|
||||||
let mut n = 0;
|
threads.push(std::thread::spawn(move || {
|
||||||
for i in 0..cli_arg.thread_count {
|
info!("线程 {} 开始计算", thread_name);
|
||||||
n += 1;
|
cacluate::cacl(config, n, &out_path);
|
||||||
let config = cli_arg.as_cacl_config();
|
info!("线程 {} 结束计算", thread_name);
|
||||||
let out_path = out_path.clone();
|
}));
|
||||||
let thread_name = format!("thread_{}", i);
|
|
||||||
threads.push(std::thread::spawn(move || {
|
|
||||||
info!("线程 {} 开始计算", thread_name);
|
|
||||||
cacluate::cacl(config, n, &out_path);
|
|
||||||
info!("线程 {} 结束计算", thread_name);
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
info!("开始计算");
|
info!("开始计算");
|
||||||
|
|
||||||
|
|||||||
@ -255,9 +255,10 @@ impl Namer {
|
|||||||
pub fn update_skill(&mut self) {
|
pub fn update_skill(&mut self) {
|
||||||
let skill_id = self.skl_id.as_mut();
|
let skill_id = self.skl_id.as_mut();
|
||||||
for i in 0..40 {
|
for i in 0..40 {
|
||||||
unsafe {
|
skill_id[i] = i as u8;
|
||||||
*skill_id.get_unchecked_mut(i) = i as u8;
|
// unsafe {
|
||||||
}
|
// *skill_id.get_unchecked_mut(i) = i as u8;
|
||||||
|
// }
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(feature = "simd")]
|
#[cfg(feature = "simd")]
|
||||||
@ -272,6 +273,8 @@ impl Namer {
|
|||||||
let simd_32 = u8x64::splat(32);
|
let simd_32 = u8x64::splat(32);
|
||||||
|
|
||||||
for i in (0..256).step_by(64) {
|
for i in (0..256).step_by(64) {
|
||||||
|
// let mut x = u8x64::from_slice(&simd_val[i..]);
|
||||||
|
// let mut y = u8x64::from_slice(&simd_val_b[i..]);
|
||||||
unsafe {
|
unsafe {
|
||||||
let mut x = u8x64::from_slice(simd_val.get_unchecked(i..));
|
let mut x = u8x64::from_slice(simd_val.get_unchecked(i..));
|
||||||
let mut y = u8x64::from_slice(simd_val_b.get_unchecked(i..));
|
let mut y = u8x64::from_slice(simd_val_b.get_unchecked(i..));
|
||||||
@ -280,16 +283,22 @@ impl Namer {
|
|||||||
x.copy_to_slice(simd_val.get_unchecked_mut(i..));
|
x.copy_to_slice(simd_val.get_unchecked_mut(i..));
|
||||||
y.copy_to_slice(simd_val_b.get_unchecked_mut(i..));
|
y.copy_to_slice(simd_val_b.get_unchecked_mut(i..));
|
||||||
}
|
}
|
||||||
|
// x.copy_to_slice(&mut simd_val[i..]);
|
||||||
|
// y.copy_to_slice(&mut simd_val_b[i..]);
|
||||||
}
|
}
|
||||||
|
|
||||||
let mut mod_count = 0;
|
let mut mod_count = 0;
|
||||||
for i in 0..256 {
|
for i in 0..256 {
|
||||||
unsafe {
|
if simd_val[i] != 0 {
|
||||||
if simd_val.get_unchecked(i) != &0 {
|
self.name_base[mod_count as usize] = simd_val_b[i];
|
||||||
*self.name_base.get_unchecked_mut(mod_count as usize) = *simd_val_b.get_unchecked(i);
|
mod_count += 1;
|
||||||
mod_count += 1;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
// unsafe {
|
||||||
|
// if simd_val.get_unchecked(i) != &0 {
|
||||||
|
// *self.name_base.get_unchecked_mut(mod_count as usize) = *simd_val_b.get_unchecked(i);
|
||||||
|
// mod_count += 1;
|
||||||
|
// }
|
||||||
|
// }
|
||||||
}
|
}
|
||||||
// const int N = 256, M = 128, K = 64, skill_cnt = 40, max_len = 25;
|
// const int N = 256, M = 128, K = 64, skill_cnt = 40, max_len = 25;
|
||||||
let mut a: u8 = 0;
|
let mut a: u8 = 0;
|
||||||
@ -299,21 +308,29 @@ impl Namer {
|
|||||||
for i in 0..40 {
|
for i in 0..40 {
|
||||||
let rnd = unsafe {
|
let rnd = unsafe {
|
||||||
a += 1;
|
a += 1;
|
||||||
|
// b = b.wrapping_add(self.val[a as usize]);
|
||||||
b = b.wrapping_add(*self.val.get_unchecked(a as usize));
|
b = b.wrapping_add(*self.val.get_unchecked(a as usize));
|
||||||
|
// self.val.swap(a as usize, b as usize);
|
||||||
self.val.swap_unchecked(a as usize, b as usize);
|
self.val.swap_unchecked(a as usize, b as usize);
|
||||||
|
// let u: u8 = self.val[((self.val[a as usize] as u16 + self.val[b as usize] as u16) & 255) as usize];
|
||||||
let u: u8 = *self.val.get_unchecked(
|
let u: u8 = *self.val.get_unchecked(
|
||||||
((*self.val.get_unchecked(a as usize) as u16 + *self.val.get_unchecked(b as usize) as u16) & 255)
|
((*self.val.get_unchecked(a as usize) as u16 + *self.val.get_unchecked(b as usize) as u16) & 255)
|
||||||
as usize,
|
as usize,
|
||||||
);
|
);
|
||||||
a += 1;
|
a += 1;
|
||||||
|
// b = b.wrapping_add(self.val[a as usize]);
|
||||||
b = b.wrapping_add(*self.val.get_unchecked(a as usize));
|
b = b.wrapping_add(*self.val.get_unchecked(a as usize));
|
||||||
|
// self.val.swap(a as usize, b as usize);
|
||||||
self.val.swap_unchecked(a as usize, b as usize);
|
self.val.swap_unchecked(a as usize, b as usize);
|
||||||
|
// let t = self.val[((self.val[a as usize] as u16 + self.val[b as usize] as u16) & 255) as usize];
|
||||||
let t: u8 = *self.val.get_unchecked(
|
let t: u8 = *self.val.get_unchecked(
|
||||||
((*self.val.get_unchecked(a as usize) as u16 + *self.val.get_unchecked(b as usize) as u16) & 255)
|
((*self.val.get_unchecked(a as usize) as u16 + *self.val.get_unchecked(b as usize) as u16) & 255)
|
||||||
as usize,
|
as usize,
|
||||||
);
|
);
|
||||||
(((u as u32) << 8 | t as u32) % 40) as u8
|
(((u as u32) << 8 | t as u32) % 40) as u8
|
||||||
};
|
};
|
||||||
|
// s = (s as u16 + rnd as u16 + skill_id[i] as u16) as u8 % 40;
|
||||||
|
// skill_id.swap(i as usize, s as usize);
|
||||||
unsafe {
|
unsafe {
|
||||||
s = (s as u16 + rnd as u16 + *skill_id.get_unchecked(i as usize) as u16) as u8 % 40;
|
s = (s as u16 + rnd as u16 + *skill_id.get_unchecked(i as usize) as u16) as u8 % 40;
|
||||||
skill_id.swap_unchecked(i as usize, s as usize);
|
skill_id.swap_unchecked(i as usize, s as usize);
|
||||||
@ -323,12 +340,10 @@ impl Namer {
|
|||||||
let mut last = -1;
|
let mut last = -1;
|
||||||
let mut j = 0;
|
let mut j = 0;
|
||||||
for i in (64..128).step_by(4) {
|
for i in (64..128).step_by(4) {
|
||||||
let p = unsafe {
|
let p = min(
|
||||||
min(
|
min(self.name_base[i + 0], self.name_base[i + 1]),
|
||||||
min(*self.name_base.get_unchecked(i + 0), *self.name_base.get_unchecked(i + 1)),
|
min(self.name_base[i + 2], self.name_base[i + 3]),
|
||||||
min(*self.name_base.get_unchecked(i + 2), *self.name_base.get_unchecked(i + 3)),
|
);
|
||||||
)
|
|
||||||
};
|
|
||||||
if p > 10 && skill_id[j] < 35 {
|
if p > 10 && skill_id[j] < 35 {
|
||||||
self.skl_freq[j] = p - 10;
|
self.skl_freq[j] = p - 10;
|
||||||
if skill_id[j] < 25 {
|
if skill_id[j] < 25 {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user