diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-30 03:57:19 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-30 03:57:19 +0000 |
commit | a0b8f38ab54ac451646aa00cd5e91b6c76f22a84 (patch) | |
tree | fc451898ccaf445814e26b46664d78702178101d /vendor/uuid | |
parent | Adding debian version 1.71.1+dfsg1-2. (diff) | |
download | rustc-a0b8f38ab54ac451646aa00cd5e91b6c76f22a84.tar.xz rustc-a0b8f38ab54ac451646aa00cd5e91b6c76f22a84.zip |
Merging upstream version 1.72.1+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'vendor/uuid')
-rw-r--r-- | vendor/uuid/.cargo-checksum.json | 2 | ||||
-rw-r--r-- | vendor/uuid/Cargo.lock | 210 | ||||
-rw-r--r-- | vendor/uuid/Cargo.toml | 35 | ||||
-rw-r--r-- | vendor/uuid/README.md | 6 | ||||
-rw-r--r-- | vendor/uuid/SECURITY.md | 13 | ||||
-rw-r--r-- | vendor/uuid/src/external.rs | 2 | ||||
-rw-r--r-- | vendor/uuid/src/external/arbitrary_support.rs | 2 | ||||
-rw-r--r-- | vendor/uuid/src/external/borsh_support.rs | 24 | ||||
-rw-r--r-- | vendor/uuid/src/lib.rs | 414 | ||||
-rw-r--r-- | vendor/uuid/src/timestamp.rs | 107 | ||||
-rw-r--r-- | vendor/uuid/src/v1.rs | 33 | ||||
-rw-r--r-- | vendor/uuid/src/v3.rs | 24 | ||||
-rw-r--r-- | vendor/uuid/src/v4.rs | 24 | ||||
-rw-r--r-- | vendor/uuid/src/v5.rs | 33 | ||||
-rw-r--r-- | vendor/uuid/src/v6.rs | 33 | ||||
-rw-r--r-- | vendor/uuid/src/v7.rs | 44 | ||||
-rw-r--r-- | vendor/uuid/src/v8.rs | 15 |
17 files changed, 806 insertions, 215 deletions
diff --git a/vendor/uuid/.cargo-checksum.json b/vendor/uuid/.cargo-checksum.json index a4a7a98f2..30ffae334 100644 --- a/vendor/uuid/.cargo-checksum.json +++ b/vendor/uuid/.cargo-checksum.json @@ -1 +1 @@ -{"files":{"CODE_OF_CONDUCT.md":"b360d72c37ca9eee599c13d4f7f4b95707c6414634e67befc6a63c1d430d299c","CONTRIBUTING.md":"be72ea4c22c397964f6f44b10562c4ad485dc1cc24b3dcca951e49907439d9ac","COPYRIGHT":"b4b2c0de2a05de3372d5c828128413ce82bb7dba2272487b7729f09cc3d3519d","Cargo.lock":"d378f47d420f9c8c01a75778a9de2b34957f90bcd406e1b0a410201a4388c70e","Cargo.toml":"12375ffeb20e0e346e1fdae9040bd658b9fe362512d28b4bf6f6c69e6e152344","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"436bc5a105d8e57dcd8778730f3754f7bf39c14d2f530e4cde4bd2d17a83ec3d","README.md":"7c75e8498b8c968174112b895e16943eeb426c801b5f7c70427305213fe84134","benches/format_str.rs":"f1320973392ce1cd0f0988747c6b4253d3b4ce34cf742dd558efad86f88a81e5","benches/parse_str.rs":"4e9e2f881c609ccdce502a6490e6b5f06cd8954e44f8a1b98d6c0e22f53a15d5","benches/v4.rs":"f59d7180882e12cb09761d941d7bece9690a97f7f29181e2692b38012b6363d7","examples/random_uuid.rs":"9f2282adaa253c803ca58b1ce1c50eb61aaf904a47aec10b777963a6f5ecf9ff","examples/sortable_uuid.rs":"bff06efa3bf3ced72dd4b27d470417bba4887f5110d79cda52688329aa922cea","examples/uuid_macro.rs":"75178c9756da545f94e31f9d322e9a97d8f76a08326f26f2d014088cb42e4ebf","examples/windows_guid.rs":"2e2a21779aec9772a7f0c9ec475b5dc44835640cb104352134986e809f0f7f59","src/builder.rs":"3b3626a94686e8d9a6ffaf2ecfcc3a8710ca93af93f73fba892286744364e919","src/error.rs":"621799694111aab9d6e570290f4d1b341fe6be58d2b3425fa7891ada7575cab7","src/external.rs":"9843b6893a7f07591abbbf8588da36f241563fe71e5e445fa500fdd7b65791e3","src/external/arbitrary_support.rs":"98cf90603e1b1c288847097b9da41d604fd1ddfa8b9e7a235d74c7b36f204777","src/external/serde_support.rs":"1263176b9916bf61fe3ab32140c22e2e757ea29ffff6f5459b1b720acbe2ed9d","src/external/slog_support.rs":"53c6251e424bdc9b6ba35defb4c723d4d34d44053badbf98e1c7c3e7c83fbb5e","src/fmt.rs":"d66a735d72a4c94629dbd18327e7b9c31aa26c0f0017ed67787b3291413f4f8f","src/lib.rs":"c06eff7b35a8c9399c627b4dcc833498f3e336b61ebab72dafc7962bffd7fbe5","src/macros.rs":"faa4e32837d38107a62402f2119726e007d4acde9abc2177686b25dec2b68039","src/md5.rs":"227a753edc428499108e6f25074bbeb6a80d55f52e18c717a1d88831ae77066a","src/parser.rs":"06c4bfdd6b74db9469a516f7015d328b1f1bd2750f609423c47e308bf98e8706","src/rng.rs":"b9f69610560aa5b5d9b2eaa16fb2239515bd163da126cf5c392e5fb9b0296c3e","src/sha1.rs":"e1a9657e11f1ed1ede33c0655f9c2641059b7c24f17be4ac425c930cc216e019","src/timestamp.rs":"31e4338f6695e2f1e736ba6d958a7ef6200d15e6a58c4229d8b0ca99691900a6","src/v1.rs":"784f8bee32039de761444ef0ed9e70035f8ff7d16beea3ab39bd7b30e0104fea","src/v3.rs":"d797bac7ba71c489a67cb6d0dbd23931fc151fd51994272215edf768ae9b54d2","src/v4.rs":"76d2e5cdc4935f06c6f3b9a34076a6795129698f6887556c4dbe4753dbef56ce","src/v5.rs":"76e4cbb4695ae7904334e089cb549e7c4382ea74045d437d0b4231ce4a64b17d","src/v6.rs":"38717015364f85aad712b27d1ce91ed9f4c9968957424233dad8ceef7ea221f3","src/v7.rs":"86a2db956f6e2d38d20bcc2b64b2f5dc512471717dfedbd21f9c7b07d065a9c0","src/v8.rs":"21a6e05bcfc1fd835df416d40e6403eef951f79abc36c170e4e767fbd197c43f","tests/macros.rs":"5dc3b4a3f0fdcedb47f680f0534d4074bab3a4b26257d8a4f89e9eaad3e6bca7","tests/ui/compile_fail/invalid_parse.rs":"eb81a6a1be99bcce58afa15e2cacab3e7d64f628d3eb31897d2a13feffb2032f","tests/ui/compile_fail/invalid_parse.stderr":"a0d2f080cf64a965028b2044f775d4f75fc541f560ec75baf783231590cd429e","tests/ui/compile_pass/renamed.rs":"f2bd73151e605035051d3aaf572133861457e6d199d0ff7ede748fc6c0f44c7b","tests/ui/compile_pass/valid.rs":"a0cfeeae38dc78151ecc21ad801e56d61993a7e393e0943a6b06f2811e004135"},"package":"5b55a3fef2a1e3b3a00ce878640918820d3c51081576ac657d23af9fc7928fdb"}
\ No newline at end of file +{"files":{"CODE_OF_CONDUCT.md":"b360d72c37ca9eee599c13d4f7f4b95707c6414634e67befc6a63c1d430d299c","CONTRIBUTING.md":"be72ea4c22c397964f6f44b10562c4ad485dc1cc24b3dcca951e49907439d9ac","COPYRIGHT":"b4b2c0de2a05de3372d5c828128413ce82bb7dba2272487b7729f09cc3d3519d","Cargo.lock":"78a27ca451134a94db6e99f459afcd28f5d51a8294b4523404d510423363800d","Cargo.toml":"f108fdbe6afd7eb86f9fb1775c47952868ba4016dc0b7768f426d86a38747f78","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"436bc5a105d8e57dcd8778730f3754f7bf39c14d2f530e4cde4bd2d17a83ec3d","README.md":"397e96b209aea3cc23262a69f13d2194200afd12d71d555719ddfe348265e16a","SECURITY.md":"64b91c6b5c428c9623d99a825c7e513965de3695bfa0105a348deaa8c678d767","benches/format_str.rs":"f1320973392ce1cd0f0988747c6b4253d3b4ce34cf742dd558efad86f88a81e5","benches/parse_str.rs":"4e9e2f881c609ccdce502a6490e6b5f06cd8954e44f8a1b98d6c0e22f53a15d5","benches/v4.rs":"f59d7180882e12cb09761d941d7bece9690a97f7f29181e2692b38012b6363d7","examples/random_uuid.rs":"9f2282adaa253c803ca58b1ce1c50eb61aaf904a47aec10b777963a6f5ecf9ff","examples/sortable_uuid.rs":"bff06efa3bf3ced72dd4b27d470417bba4887f5110d79cda52688329aa922cea","examples/uuid_macro.rs":"75178c9756da545f94e31f9d322e9a97d8f76a08326f26f2d014088cb42e4ebf","examples/windows_guid.rs":"2e2a21779aec9772a7f0c9ec475b5dc44835640cb104352134986e809f0f7f59","src/builder.rs":"3b3626a94686e8d9a6ffaf2ecfcc3a8710ca93af93f73fba892286744364e919","src/error.rs":"621799694111aab9d6e570290f4d1b341fe6be58d2b3425fa7891ada7575cab7","src/external.rs":"0f85a2ab77744b692c7a87cda1a92663678994c777fdfb036aa4a2a1fd1b7419","src/external/arbitrary_support.rs":"7e7fbcc4b8af5878b71858a1f5fa31e85d84fc2fd159614f8d450ba1fe06ac28","src/external/borsh_support.rs":"8ce22418e304ee6aab4b6f30ddaaffa6f8f4b6146e1435e8623718a87cccb3b3","src/external/serde_support.rs":"1263176b9916bf61fe3ab32140c22e2e757ea29ffff6f5459b1b720acbe2ed9d","src/external/slog_support.rs":"53c6251e424bdc9b6ba35defb4c723d4d34d44053badbf98e1c7c3e7c83fbb5e","src/fmt.rs":"d66a735d72a4c94629dbd18327e7b9c31aa26c0f0017ed67787b3291413f4f8f","src/lib.rs":"36307d3822a07955531b5d0578a906e4a579fdcdea12d51f4a8666294abb5b27","src/macros.rs":"faa4e32837d38107a62402f2119726e007d4acde9abc2177686b25dec2b68039","src/md5.rs":"227a753edc428499108e6f25074bbeb6a80d55f52e18c717a1d88831ae77066a","src/parser.rs":"06c4bfdd6b74db9469a516f7015d328b1f1bd2750f609423c47e308bf98e8706","src/rng.rs":"b9f69610560aa5b5d9b2eaa16fb2239515bd163da126cf5c392e5fb9b0296c3e","src/sha1.rs":"e1a9657e11f1ed1ede33c0655f9c2641059b7c24f17be4ac425c930cc216e019","src/timestamp.rs":"69966d6bf19820a0513cfd75b0163804842e8444a43b64665166a7366498f448","src/v1.rs":"d56d323df879d6526fa3cd5ff329b8ea1a306cd880474ad4b2e017659b7662ec","src/v3.rs":"b7d605c4d2f56a9e57bfe779ef2488fa612c7cb28568f68252093f48ac2edef4","src/v4.rs":"4f06567460871348df0ff2825e9faad9d950a9337e409cb2b568c86118addb97","src/v5.rs":"64e3feb673c8411954f930188e756803b90b57d13ec36652cd2c669e81654333","src/v6.rs":"9f7e41470629c4f011625896421bfcc4e6eedc85e0959af0808a5ac34381ab84","src/v7.rs":"e46924c0c9c9b1ac6746180d78cd3531920fbd8379f1629abdcec7914bae36c8","src/v8.rs":"8705405fef52e4706c7cf99f7ed231dde733b7cd08ced79be9e29c949be2280f","tests/macros.rs":"5dc3b4a3f0fdcedb47f680f0534d4074bab3a4b26257d8a4f89e9eaad3e6bca7","tests/ui/compile_fail/invalid_parse.rs":"eb81a6a1be99bcce58afa15e2cacab3e7d64f628d3eb31897d2a13feffb2032f","tests/ui/compile_fail/invalid_parse.stderr":"a0d2f080cf64a965028b2044f775d4f75fc541f560ec75baf783231590cd429e","tests/ui/compile_pass/renamed.rs":"f2bd73151e605035051d3aaf572133861457e6d199d0ff7ede748fc6c0f44c7b","tests/ui/compile_pass/valid.rs":"a0cfeeae38dc78151ecc21ad801e56d61993a7e393e0943a6b06f2811e004135"},"package":"d023da39d1fde5a8a3fe1f3e01ca9632ada0a63e9797de55a879d6e2236277be"}
\ No newline at end of file diff --git a/vendor/uuid/Cargo.lock b/vendor/uuid/Cargo.lock index a11795849..b870dd468 100644 --- a/vendor/uuid/Cargo.lock +++ b/vendor/uuid/Cargo.lock @@ -3,6 +3,17 @@ version = 3 [[package]] +name = "ahash" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", +] + +[[package]] name = "arbitrary" version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -10,18 +21,9 @@ checksum = "e2d098ff73c1ca148721f37baad5ea6a465a13f9573aba8641fbbbae8164a54e" [[package]] name = "atomic" -version = "0.5.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b88d82667eca772c4aa12f0f1348b3ae643424c8876448f3f7bd5787032e234c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba" [[package]] name = "basic-toml" @@ -51,10 +53,55 @@ dependencies = [ ] [[package]] +name = "borsh" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4114279215a005bc675e386011e594e1d9b800918cea18fcadadcce864a2046b" +dependencies = [ + "borsh-derive", + "hashbrown", +] + +[[package]] +name = "borsh-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0754613691538d51f329cce9af41d7b7ca150bc973056f1156611489475f54f7" +dependencies = [ + "borsh-derive-internal", + "borsh-schema-derive-internal", + "proc-macro-crate", + "proc-macro2", + "syn 1.0.109", +] + +[[package]] +name = "borsh-derive-internal" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afb438156919598d2c7bad7e1c0adf3d26ed3840dbc010db1a882a65583ca2fb" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "borsh-schema-derive-internal" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634205cc43f74a1b9046ef87c4540ebda95696ec0f315024860cad7c5b0f5ccd" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] name = "bumpalo" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "byteorder" @@ -90,9 +137,9 @@ dependencies = [ [[package]] name = "digest" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", "crypto-common", @@ -110,9 +157,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "js-sys", @@ -128,6 +175,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +dependencies = [ + "ahash", +] + +[[package]] name = "itoa" version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -135,27 +191,24 @@ checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "js-sys" -version = "0.3.61" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] [[package]] name = "libc" -version = "0.2.141" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "log" -version = "0.4.17" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" [[package]] name = "md-5" @@ -168,9 +221,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "ppv-lite86" @@ -179,19 +232,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] +name = "proc-macro-crate" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" +dependencies = [ + "toml", +] + +[[package]] name = "proc-macro2" -version = "1.0.56" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.26" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" dependencies = [ "proc-macro2", ] @@ -246,26 +308,26 @@ checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" [[package]] name = "serde" -version = "1.0.159" +version = "1.0.164" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" +checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" [[package]] name = "serde_derive" -version = "1.0.159" +version = "1.0.164" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" +checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.22", ] [[package]] name = "serde_json" -version = "1.0.95" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744" +checksum = "46266871c240a00b8f503b877622fe33430b3c7d963bdc0f2adc511e54a1eae3" dependencies = [ "itoa", "ryu", @@ -274,9 +336,9 @@ dependencies = [ [[package]] name = "serde_test" -version = "1.0.159" +version = "1.0.164" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f259aa64e48efaf5a4fea11f97cacb109f7fc3ae9db7244cbb40c01c7faf42bc" +checksum = "797c38160e2546a56e1e3439496439597e938669673ffd8af02a12f070da648f" dependencies = [ "serde", ] @@ -306,9 +368,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.13" +version = "2.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec" +checksum = "2efbeae7acf4eabd6bcdcbd11c92f45231ddda7539edc7806bd1a04a03b24616" dependencies = [ "proc-macro2", "quote", @@ -325,6 +387,15 @@ dependencies = [ ] [[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[package]] name = "trybuild" version = "1.0.80" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -347,17 +418,18 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "unicode-ident" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" [[package]] name = "uuid" -version = "1.3.1" +version = "1.4.0" dependencies = [ "arbitrary", "atomic", "bincode", + "borsh", "getrandom", "md-5", "rand", @@ -378,13 +450,13 @@ dependencies = [ [[package]] name = "uuid-macro-internal" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20e8a505384e9309dc842520c6c9348f4b141dee06aaa845522727b1b99ca235" +checksum = "8614dda80b9075fbca36bc31b58d1447715b1236af98dee21db521c47a0cc2c0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.22", ] [[package]] @@ -401,9 +473,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -411,24 +483,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.22", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.34" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" dependencies = [ "cfg-if", "js-sys", @@ -438,9 +510,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -448,28 +520,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.22", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "wasm-bindgen-test" -version = "0.3.34" +version = "0.3.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db36fc0f9fb209e88fb3642590ae0205bb5a56216dabd963ba15879fe53a30b" +checksum = "6e6e302a7ea94f83a6d09e78e7dc7d9ca7b186bc2829c24a22d0753efd680671" dependencies = [ "console_error_panic_hook", "js-sys", @@ -481,9 +553,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-test-macro" -version = "0.3.34" +version = "0.3.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0734759ae6b3b1717d661fe4f016efcfb9828f5edb4520c18eaee05af3b43be9" +checksum = "ecb993dd8c836930ed130e020e77d9b2e65dd0fbab1b67c790b0f5d80b11a575" dependencies = [ "proc-macro2", "quote", @@ -491,9 +563,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.61" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" dependencies = [ "js-sys", "wasm-bindgen", diff --git a/vendor/uuid/Cargo.toml b/vendor/uuid/Cargo.toml index b78368883..b806036c3 100644 --- a/vendor/uuid/Cargo.toml +++ b/vendor/uuid/Cargo.toml @@ -12,7 +12,7 @@ [package] edition = "2018" name = "uuid" -version = "1.3.1" +version = "1.4.0" authors = [ "Ashley Mannix<ashleymannix@live.com.au>", "Christopher Armstrong", @@ -39,19 +39,11 @@ license = "Apache-2.0 OR MIT" repository = "https://github.com/uuid-rs/uuid" [package.metadata.docs.rs] -rustc-args = [ - "--cfg", - "uuid_unstable", -] -rustdoc-args = [ - "--cfg", - "uuid_unstable", -] -targets = ["x86_64-unknown-linux-gnu"] features = [ "serde", "arbitrary", "slog", + "borsh", "v1", "v3", "v4", @@ -60,6 +52,15 @@ features = [ "v7", "v8", ] +rustc-args = [ + "--cfg", + "uuid_unstable", +] +rustdoc-args = [ + "--cfg", + "uuid_unstable", +] +targets = ["x86_64-unknown-linux-gnu"] [package.metadata.playground] features = [ @@ -83,6 +84,10 @@ optional = true default-features = false package = "atomic" +[dependencies.borsh] +version = "0.10.3" +optional = true + [dependencies.getrandom] version = "0.2" optional = true @@ -115,7 +120,7 @@ version = "2" optional = true [dependencies.uuid-macro-internal] -version = "1.3.1" +version = "1.4.0" optional = true package = "uuid-macro-internal" @@ -173,13 +178,13 @@ v7 = [ ] v8 = [] -[target."cfg(target_arch = \"wasm32\")".dev-dependencies.wasm-bindgen] +[target."cfg(all(target_arch = \"wasm32\", target_vendor = \"unknown\", target_os = \"unknown\"))".dev-dependencies.wasm-bindgen-test] +version = "0.3" + +[target."cfg(target = \"wasm32-unknown-unknown\")".dev-dependencies.wasm-bindgen] version = "0.2" package = "wasm-bindgen" -[target."cfg(target_arch = \"wasm32\")".dev-dependencies.wasm-bindgen-test] -version = "0.3" - [target."cfg(windows)".dev-dependencies.windows-sys] version = "0.48.0" features = ["Win32_System_Com"] diff --git a/vendor/uuid/README.md b/vendor/uuid/README.md index 45acb4b54..e448840e8 100644 --- a/vendor/uuid/README.md +++ b/vendor/uuid/README.md @@ -29,7 +29,7 @@ Add the following to your `Cargo.toml`: ```toml [dependencies.uuid] -version = "1.3.1" +version = "1.4.0" features = [ "v4", # Lets you generate random UUIDs "fast-rng", # Use a faster (but still sufficiently random) RNG @@ -66,7 +66,7 @@ assert_eq!(Some(Version::Random), my_uuid.get_version()); If you'd like to parse UUIDs _really_ fast, check out the [`uuid-simd`](https://github.com/nugine/uuid-simd) library. -For more details on using `uuid`, [see the library documentation](https://docs.rs/uuid/1.3.1/uuid). +For more details on using `uuid`, [see the library documentation](https://docs.rs/uuid/1.4.0/uuid). ## Minimum Supported Rust Version (MSRV) @@ -75,7 +75,7 @@ CI. It may be bumped in minor releases as necessary. ## References -* [`uuid` library docs](https://docs.rs/uuid/1.3.1/uuid). +* [`uuid` library docs](https://docs.rs/uuid/1.4.0/uuid). * [Wikipedia: Universally Unique Identifier](http://en.wikipedia.org/wiki/Universally_unique_identifier). * [RFC4122: A Universally Unique IDentifier (UUID) URN Namespace](http://tools.ietf.org/html/rfc4122). diff --git a/vendor/uuid/SECURITY.md b/vendor/uuid/SECURITY.md new file mode 100644 index 000000000..e61b9d515 --- /dev/null +++ b/vendor/uuid/SECURITY.md @@ -0,0 +1,13 @@ +# Security Policy + +## Supported Versions + +Security updates are applied only to the latest release. + +## Reporting a Vulnerability + +If you have discovered a security vulnerability in this project, please report it privately. **Do not disclose it as a public issue.** This gives us time to work with you to fix the issue before public exposure, reducing the chance that the exploit will be used before a patch is released. + +Please disclose it at [security advisory](https://github.com/uuid-rs/uuid/security/advisories/new). + +This project is maintained by a team of volunteers on a reasonable-effort basis. As such, please give us at least 90 days to work on a fix before public exposure. diff --git a/vendor/uuid/src/external.rs b/vendor/uuid/src/external.rs index 219a9236e..8ac12d0f4 100644 --- a/vendor/uuid/src/external.rs +++ b/vendor/uuid/src/external.rs @@ -1,5 +1,7 @@ #[cfg(feature = "arbitrary")] pub(crate) mod arbitrary_support; +#[cfg(all(uuid_unstable, feature = "borsh"))] +pub(crate) mod borsh_support; #[cfg(feature = "serde")] pub(crate) mod serde_support; #[cfg(feature = "slog")] diff --git a/vendor/uuid/src/external/arbitrary_support.rs b/vendor/uuid/src/external/arbitrary_support.rs index 38cce7c73..40c11f506 100644 --- a/vendor/uuid/src/external/arbitrary_support.rs +++ b/vendor/uuid/src/external/arbitrary_support.rs @@ -12,7 +12,7 @@ impl Arbitrary<'_> for Uuid { Ok(Builder::from_random_bytes(b).into_uuid()) } - fn size_hint(depth: usize) -> (usize, Option<usize>) { + fn size_hint(_: usize) -> (usize, Option<usize>) { (16, Some(16)) } } diff --git a/vendor/uuid/src/external/borsh_support.rs b/vendor/uuid/src/external/borsh_support.rs new file mode 100644 index 000000000..24a177f3b --- /dev/null +++ b/vendor/uuid/src/external/borsh_support.rs @@ -0,0 +1,24 @@ +#[cfg(test)] +mod borsh_tests { + use crate::Uuid; + use borsh::{BorshDeserialize, BorshSerialize}; + use std::string::ToString; + + #[test] + fn test_serialize() { + let uuid_str = "f9168c5e-ceb2-4faa-b6bf-329bf39fa1e4"; + let uuid = Uuid::parse_str(uuid_str).unwrap(); + let uuid_bytes = uuid.as_bytes().to_vec(); + let borsh_bytes = uuid.try_to_vec().unwrap(); + assert_eq!(uuid_bytes, borsh_bytes); + } + + #[test] + fn test_deserialize() { + let uuid_str = "f9168c5e-ceb2-4faa-b6bf-329bf39fa1e4"; + let uuid = Uuid::parse_str(uuid_str).unwrap(); + let uuid_bytes = uuid.as_bytes().to_vec(); + let deserialized = Uuid::try_from_slice(&uuid_bytes).unwrap().to_string(); + assert_eq!(uuid_str, deserialized); + } +} diff --git a/vendor/uuid/src/lib.rs b/vendor/uuid/src/lib.rs index 5e02a7751..aea15530c 100644 --- a/vendor/uuid/src/lib.rs +++ b/vendor/uuid/src/lib.rs @@ -39,7 +39,7 @@ //! //! ```toml //! [dependencies.uuid] -//! version = "1.3.1" +//! version = "1.4.0" //! features = [ //! "v4", # Lets you generate random UUIDs //! "fast-rng", # Use a faster (but still sufficiently random) RNG @@ -119,6 +119,8 @@ //! * `v8` - Version 8 UUIDs using user-defined data. //! * `zerocopy` - adds support for zero-copy deserialization using the //! `zerocopy` library. +//! * `borsh` - adds the ability to serialize and deserialize a UUID using +//! `borsh`. //! //! Unstable features may break between minor releases. //! @@ -138,7 +140,7 @@ //! //! ```toml //! [dependencies.uuid] -//! version = "1.3.1" +//! version = "1.4.0" //! features = [ //! "v4", //! "v7", @@ -153,7 +155,7 @@ //! //! ```toml //! [dependencies.uuid] -//! version = "1.3.1" +//! version = "1.4.0" //! default-features = false //! ``` //! @@ -211,7 +213,7 @@ #![doc( html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png", html_favicon_url = "https://www.rust-lang.org/favicon.ico", - html_root_url = "https://docs.rs/uuid/1.3.1" + html_root_url = "https://docs.rs/uuid/1.4.0" )] #[cfg(any(feature = "std", test))] @@ -431,7 +433,14 @@ pub enum Variant { /// /// The `Uuid` type is always guaranteed to be have the same ABI as [`Bytes`]. #[derive(Clone, Copy, Eq, Hash, Ord, PartialEq, PartialOrd)] -#[cfg_attr(all(uuid_unstable, feature = "zerocopy"), derive(AsBytes, FromBytes, Unaligned))] +#[cfg_attr( + all(uuid_unstable, feature = "zerocopy"), + derive(AsBytes, FromBytes, Unaligned) +)] +#[cfg_attr( + all(uuid_unstable, feature = "borsh"), + derive(borsh::BorshDeserialize, borsh::BorshSerialize) +)] #[repr(transparent)] pub struct Uuid(Bytes); @@ -687,22 +696,7 @@ impl Uuid { /// # } /// ``` pub const fn as_u128(&self) -> u128 { - (self.as_bytes()[0] as u128) << 120 - | (self.as_bytes()[1] as u128) << 112 - | (self.as_bytes()[2] as u128) << 104 - | (self.as_bytes()[3] as u128) << 96 - | (self.as_bytes()[4] as u128) << 88 - | (self.as_bytes()[5] as u128) << 80 - | (self.as_bytes()[6] as u128) << 72 - | (self.as_bytes()[7] as u128) << 64 - | (self.as_bytes()[8] as u128) << 56 - | (self.as_bytes()[9] as u128) << 48 - | (self.as_bytes()[10] as u128) << 40 - | (self.as_bytes()[11] as u128) << 32 - | (self.as_bytes()[12] as u128) << 24 - | (self.as_bytes()[13] as u128) << 16 - | (self.as_bytes()[14] as u128) << 8 - | (self.as_bytes()[15] as u128) + u128::from_be_bytes(*self.as_bytes()) } /// Returns a 128bit little-endian value containing the value. @@ -731,22 +725,7 @@ impl Uuid { /// # } /// ``` pub const fn to_u128_le(&self) -> u128 { - (self.as_bytes()[0] as u128) - | (self.as_bytes()[1] as u128) << 8 - | (self.as_bytes()[2] as u128) << 16 - | (self.as_bytes()[3] as u128) << 24 - | (self.as_bytes()[4] as u128) << 32 - | (self.as_bytes()[5] as u128) << 40 - | (self.as_bytes()[6] as u128) << 48 - | (self.as_bytes()[7] as u128) << 56 - | (self.as_bytes()[8] as u128) << 64 - | (self.as_bytes()[9] as u128) << 72 - | (self.as_bytes()[10] as u128) << 80 - | (self.as_bytes()[11] as u128) << 88 - | (self.as_bytes()[12] as u128) << 96 - | (self.as_bytes()[13] as u128) << 104 - | (self.as_bytes()[14] as u128) << 112 - | (self.as_bytes()[15] as u128) << 120 + u128::from_le_bytes(*self.as_bytes()) } /// Returns two 64bit values containing the value. @@ -976,7 +955,11 @@ mod tests { use crate::std::string::{String, ToString}; - #[cfg(target_arch = "wasm32")] + #[cfg(all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ))] use wasm_bindgen_test::*; macro_rules! check { @@ -1003,7 +986,14 @@ mod tests { } #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] fn test_uuid_compare() { let uuid1 = new(); let uuid2 = new2(); @@ -1016,7 +1006,14 @@ mod tests { } #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] fn test_uuid_default() { let default_uuid = Uuid::default(); let nil_uuid = Uuid::nil(); @@ -1025,7 +1022,14 @@ mod tests { } #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] fn test_uuid_display() { use crate::std::fmt::Write; @@ -1041,7 +1045,14 @@ mod tests { } #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] fn test_uuid_lowerhex() { use crate::std::fmt::Write; @@ -1055,7 +1066,14 @@ mod tests { // noinspection RsAssertEqual #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] fn test_uuid_operator_eq() { let uuid1 = new(); let uuid1_dup = uuid1.clone(); @@ -1072,7 +1090,14 @@ mod tests { } #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] fn test_uuid_to_string() { use crate::std::fmt::Write; @@ -1088,7 +1113,14 @@ mod tests { } #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] fn test_non_conforming() { let from_bytes = Uuid::from_bytes([4, 54, 67, 12, 43, 2, 2, 76, 32, 50, 87, 5, 1, 33, 43, 87]); @@ -1097,7 +1129,14 @@ mod tests { } #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] fn test_nil() { let nil = Uuid::nil(); let not_nil = new(); @@ -1108,12 +1147,24 @@ mod tests { assert_eq!(nil.get_version(), Some(Version::Nil)); assert_eq!(not_nil.get_version(), Some(Version::Random)); - assert_eq!(nil, Builder::from_bytes([0; 16]).with_version(Version::Nil).into_uuid()); + assert_eq!( + nil, + Builder::from_bytes([0; 16]) + .with_version(Version::Nil) + .into_uuid() + ); } #[test] #[cfg(uuid_unstable)] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] fn test_max() { let max = Uuid::max(); let not_max = new(); @@ -1124,11 +1175,23 @@ mod tests { assert_eq!(max.get_version(), Some(Version::Max)); assert_eq!(not_max.get_version(), Some(Version::Random)); - assert_eq!(max, Builder::from_bytes([0xff; 16]).with_version(Version::Max).into_uuid()); + assert_eq!( + max, + Builder::from_bytes([0xff; 16]) + .with_version(Version::Max) + .into_uuid() + ); } #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] fn test_predefined_namespaces() { assert_eq!( Uuid::NAMESPACE_DNS.hyphenated().to_string(), @@ -1150,7 +1213,14 @@ mod tests { #[cfg(feature = "v3")] #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] fn test_get_version_v3() { let uuid = Uuid::new_v3(&Uuid::NAMESPACE_DNS, "rust-lang.org".as_bytes()); @@ -1159,7 +1229,14 @@ mod tests { } #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] fn test_get_variant() { let uuid1 = new(); let uuid2 = Uuid::parse_str("550e8400-e29b-41d4-a716-446655440000").unwrap(); @@ -1177,7 +1254,14 @@ mod tests { } #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] fn test_to_simple_string() { let uuid1 = new(); let s = uuid1.simple().to_string(); @@ -1187,7 +1271,14 @@ mod tests { } #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] fn test_hyphenated_string() { let uuid1 = new(); let s = uuid1.hyphenated().to_string(); @@ -1197,7 +1288,14 @@ mod tests { } #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] fn test_upper_lower_hex() { use std::fmt::Write; @@ -1219,8 +1317,12 @@ mod tests { check!(buf, "{:X}", u, 36, |c| c.is_uppercase() || c.is_digit(10) || c == '-'); - check!(buf, "{:#x}", u, 36, |c| c.is_lowercase() || c.is_digit(10) || c == '-'); - check!(buf, "{:#X}", u, 36, |c| c.is_uppercase() || c.is_digit(10) || c == '-'); + check!(buf, "{:#x}", u, 36, |c| c.is_lowercase() + || c.is_digit(10) + || c == '-'); + check!(buf, "{:#X}", u, 36, |c| c.is_uppercase() + || c.is_digit(10) + || c == '-'); check!(buf, "{:X}", u.hyphenated(), 36, |c| c.is_uppercase() || c.is_digit(10) @@ -1246,7 +1348,14 @@ mod tests { } #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] fn test_to_urn_string() { let uuid1 = new(); let ss = uuid1.urn().to_string(); @@ -1258,7 +1367,14 @@ mod tests { } #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] fn test_to_simple_string_matching() { let uuid1 = new(); @@ -1271,7 +1387,14 @@ mod tests { } #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] fn test_string_roundtrip() { let uuid = new(); @@ -1285,7 +1408,14 @@ mod tests { } #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] fn test_from_fields() { let d1: u32 = 0xa1a2a3a4; let d2: u16 = 0xb1b2; @@ -1300,7 +1430,14 @@ mod tests { } #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] fn test_from_fields_le() { let d1: u32 = 0xa4a3a2a1; let d2: u16 = 0xb2b1; @@ -1315,7 +1452,14 @@ mod tests { } #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] fn test_as_fields() { let u = new(); let (d1, d2, d3, d4) = u.as_fields(); @@ -1328,7 +1472,14 @@ mod tests { } #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] fn test_fields_roundtrip() { let d1_in: u32 = 0xa1a2a3a4; let d2_in: u16 = 0xb1b2; @@ -1345,7 +1496,14 @@ mod tests { } #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] fn test_fields_le_roundtrip() { let d1_in: u32 = 0xa4a3a2a1; let d2_in: u16 = 0xb2b1; @@ -1362,7 +1520,14 @@ mod tests { } #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] fn test_fields_le_are_actually_le() { let d1_in: u32 = 0xa1a2a3a4; let d2_in: u16 = 0xb1b2; @@ -1379,7 +1544,14 @@ mod tests { } #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] fn test_from_u128() { let v_in: u128 = 0xa1a2a3a4b1b2c1c2d1d2d3d4d5d6d7d8; @@ -1391,7 +1563,14 @@ mod tests { } #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] fn test_from_u128_le() { let v_in: u128 = 0xd8d7d6d5d4d3d2d1c2c1b2b1a4a3a2a1; @@ -1403,7 +1582,14 @@ mod tests { } #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] fn test_from_u64_pair() { let high_in: u64 = 0xa1a2a3a4b1b2c1c2; let low_in: u64 = 0xd1d2d3d4d5d6d7d8; @@ -1416,7 +1602,14 @@ mod tests { } #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] fn test_u128_roundtrip() { let v_in: u128 = 0xa1a2a3a4b1b2c1c2d1d2d3d4d5d6d7d8; @@ -1427,7 +1620,14 @@ mod tests { } #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] fn test_u128_le_roundtrip() { let v_in: u128 = 0xd8d7d6d5d4d3d2d1c2c1b2b1a4a3a2a1; @@ -1438,7 +1638,14 @@ mod tests { } #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] fn test_u64_pair_roundtrip() { let high_in: u64 = 0xa1a2a3a4b1b2c1c2; let low_in: u64 = 0xd1d2d3d4d5d6d7d8; @@ -1451,7 +1658,14 @@ mod tests { } #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] fn test_u128_le_is_actually_le() { let v_in: u128 = 0xa1a2a3a4b1b2c1c2d1d2d3d4d5d6d7d8; @@ -1462,7 +1676,14 @@ mod tests { } #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] fn test_from_slice() { let b = [ 0xa1, 0xa2, 0xa3, 0xa4, 0xb1, 0xb2, 0xc1, 0xc2, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, @@ -1476,7 +1697,14 @@ mod tests { } #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] fn test_from_bytes() { let b = [ 0xa1, 0xa2, 0xa3, 0xa4, 0xb1, 0xb2, 0xc1, 0xc2, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, @@ -1490,7 +1718,14 @@ mod tests { } #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] fn test_as_bytes() { let u = new(); let ub = u.as_bytes(); @@ -1503,7 +1738,14 @@ mod tests { } #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] fn test_bytes_roundtrip() { let b_in: crate::Bytes = [ 0xa1, 0xa2, 0xa3, 0xa4, 0xb1, 0xb2, 0xc1, 0xc2, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, @@ -1518,7 +1760,14 @@ mod tests { } #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] fn test_bytes_le_roundtrip() { let b = [ 0xa1, 0xa2, 0xa3, 0xa4, 0xb1, 0xb2, 0xc1, 0xc2, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, @@ -1535,7 +1784,14 @@ mod tests { } #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] fn test_iterbytes_impl_for_uuid() { let mut set = std::collections::HashSet::new(); let id1 = new(); diff --git a/vendor/uuid/src/timestamp.rs b/vendor/uuid/src/timestamp.rs index 2f95ac4e9..84d3c8546 100644 --- a/vendor/uuid/src/timestamp.rs +++ b/vendor/uuid/src/timestamp.rs @@ -72,6 +72,11 @@ impl Timestamp { /// Construct a `Timestamp` from an RFC4122 timestamp and counter, as used /// in versions 1 and 6 UUIDs. + /// + /// # Overflow + /// + /// If conversion from RFC4122 ticks to the internal timestamp format would overflow + /// it will wrap. pub const fn from_rfc4122(ticks: u64, counter: u16) -> Self { #[cfg(not(any(feature = "v1", feature = "v6")))] { @@ -89,6 +94,11 @@ impl Timestamp { } /// Construct a `Timestamp` from a Unix timestamp, as used in version 7 UUIDs. + /// + /// # Overflow + /// + /// If conversion from RFC4122 ticks to the internal timestamp format would overflow + /// it will wrap. pub fn from_unix(context: impl ClockSequence<Output = u16>, seconds: u64, nanos: u32) -> Self { #[cfg(not(any(feature = "v1", feature = "v6")))] { @@ -110,6 +120,11 @@ impl Timestamp { /// Get the value of the timestamp as an RFC4122 timestamp and counter, /// as used in versions 1 and 6 UUIDs. + /// + /// # Overflow + /// + /// If conversion from RFC4122 ticks to the internal timestamp format would overflow + /// it will wrap. #[cfg(any(feature = "v1", feature = "v6"))] pub const fn to_rfc4122(&self) -> (u64, u16) { ( @@ -119,38 +134,39 @@ impl Timestamp { } /// Get the value of the timestamp as a Unix timestamp, as used in version 7 UUIDs. + /// + /// # Overflow + /// + /// If conversion from RFC4122 ticks to the internal timestamp format would overflow + /// it will wrap. pub const fn to_unix(&self) -> (u64, u32) { (self.seconds, self.nanos) } #[cfg(any(feature = "v1", feature = "v6"))] const fn unix_to_rfc4122_ticks(seconds: u64, nanos: u32) -> u64 { - let ticks = UUID_TICKS_BETWEEN_EPOCHS + seconds * 10_000_000 + nanos as u64 / 100; + let ticks = UUID_TICKS_BETWEEN_EPOCHS + .wrapping_add(seconds.wrapping_mul(10_000_000)) + .wrapping_add(nanos as u64 / 100); ticks } const fn rfc4122_to_unix(ticks: u64) -> (u64, u32) { ( - (ticks - UUID_TICKS_BETWEEN_EPOCHS) / 10_000_000, - ((ticks - UUID_TICKS_BETWEEN_EPOCHS) % 10_000_000) as u32 * 100, + ticks.wrapping_sub(UUID_TICKS_BETWEEN_EPOCHS) / 10_000_000, + (ticks.wrapping_sub(UUID_TICKS_BETWEEN_EPOCHS) % 10_000_000) as u32 * 100, ) } - #[deprecated(note = "use `to_unix` instead")] + #[deprecated(note = "use `to_unix` instead; this method will be removed in a future release")] /// Get the number of fractional nanoseconds in the Unix timestamp. /// /// This method is deprecated and probably doesn't do what you're expecting it to. /// It doesn't return the timestamp as nanoseconds since the Unix epoch, it returns /// the fractional seconds of the timestamp. pub const fn to_unix_nanos(&self) -> u32 { - // NOTE: This method never did what it said on the tin: instead of - // converting the timestamp into nanos it simply returned the nanoseconds - // part of the timestamp. - // - // We can't fix the behavior because the return type is too small to fit - // a useful value for nanoseconds since the epoch. - self.nanos + panic!("`Timestamp::to_unix_nanos` is deprecated and will be removed: use `Timestamp::to_unix` instead") } } @@ -238,7 +254,7 @@ pub(crate) const fn encode_unix_timestamp_millis(millis: u64, random_bytes: &[u8 let millis_low = (millis & 0xFFFF) as u16; let random_and_version = - (random_bytes[0] as u16 | ((random_bytes[1] as u16) << 8) & 0x0FFF) | (0x7 << 12); + (random_bytes[1] as u16 | ((random_bytes[0] as u16) << 8) & 0x0FFF) | (0x7 << 12); let mut d4 = [0; 8]; @@ -268,29 +284,48 @@ pub(crate) const fn decode_unix_timestamp_millis(uuid: &Uuid) -> u64 { millis } -#[cfg(all(feature = "std", feature = "js", target_arch = "wasm32"))] +#[cfg(all( + feature = "std", + feature = "js", + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ) +))] fn now() -> (u64, u32) { use wasm_bindgen::prelude::*; #[wasm_bindgen] extern "C" { - #[wasm_bindgen(js_namespace = Date)] - fn now() -> f64; + // NOTE: This signature works around https://bugzilla.mozilla.org/show_bug.cgi?id=1787770 + #[wasm_bindgen(js_namespace = Date, catch)] + fn now() -> Result<f64, JsValue>; } - let now = now(); + let now = now().unwrap_throw(); let secs = (now / 1_000.0) as u64; let nanos = ((now % 1_000.0) * 1_000_000.0) as u32; - dbg!((secs, nanos)) + (secs, nanos) } -#[cfg(all(feature = "std", any(not(feature = "js"), not(target_arch = "wasm32"))))] +#[cfg(all( + feature = "std", + any( + not(feature = "js"), + not(all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + )) + ) +))] fn now() -> (u64, u32) { - let dur = std::time::SystemTime::UNIX_EPOCH - .elapsed() - .expect("Getting elapsed time since UNIX_EPOCH. If this fails, we've somehow violated causality"); + let dur = std::time::SystemTime::UNIX_EPOCH.elapsed().expect( + "Getting elapsed time since UNIX_EPOCH. If this fails, we've somehow violated causality", + ); (dur.as_secs(), dur.subsec_nanos()) } @@ -407,3 +442,33 @@ pub mod context { } } } + +#[cfg(all(test, any(feature = "v1", feature = "v6")))] +mod tests { + use super::*; + + #[cfg(all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ))] + use wasm_bindgen_test::*; + + #[test] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] + fn rfc4122_unix_does_not_panic() { + // Ensure timestamp conversions never panic + Timestamp::unix_to_rfc4122_ticks(u64::MAX, 0); + Timestamp::unix_to_rfc4122_ticks(0, u32::MAX); + Timestamp::unix_to_rfc4122_ticks(u64::MAX, u32::MAX); + + Timestamp::rfc4122_to_unix(u64::MAX); + } +} diff --git a/vendor/uuid/src/v1.rs b/vendor/uuid/src/v1.rs index e19c8a3fb..45b4e3507 100644 --- a/vendor/uuid/src/v1.rs +++ b/vendor/uuid/src/v1.rs @@ -100,11 +100,22 @@ mod tests { use super::*; use crate::{std::string::ToString, Variant, Version}; - #[cfg(target_arch = "wasm32")] + #[cfg(all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ))] use wasm_bindgen_test::*; #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] fn test_new() { let time: u64 = 1_496_854_535; let time_fraction: u32 = 812_946_000; @@ -134,7 +145,14 @@ mod tests { } #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] #[cfg(all(feature = "std", feature = "rng"))] fn test_now() { let node = [1, 2, 3, 4, 5, 6]; @@ -146,7 +164,14 @@ mod tests { } #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] fn test_new_context() { let time: u64 = 1_496_854_535; let time_fraction: u32 = 812_946_000; diff --git a/vendor/uuid/src/v3.rs b/vendor/uuid/src/v3.rs index cc7cb9ac3..ed356d42a 100644 --- a/vendor/uuid/src/v3.rs +++ b/vendor/uuid/src/v3.rs @@ -42,7 +42,11 @@ impl Uuid { mod tests { use super::*; - #[cfg(target_arch = "wasm32")] + #[cfg(all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ))] use wasm_bindgen_test::*; use crate::{std::string::ToString, Variant, Version}; @@ -131,7 +135,14 @@ mod tests { ]; #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] fn test_new() { for &(ref ns, ref name, _) in FIXTURE { let uuid = Uuid::new_v3(*ns, name.as_bytes()); @@ -141,7 +152,14 @@ mod tests { } #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] fn test_hyphenated_string() { for &(ref ns, ref name, ref expected) in FIXTURE { let uuid = Uuid::new_v3(*ns, name.as_bytes()); diff --git a/vendor/uuid/src/v4.rs b/vendor/uuid/src/v4.rs index e78fb1e69..3c4247308 100644 --- a/vendor/uuid/src/v4.rs +++ b/vendor/uuid/src/v4.rs @@ -40,11 +40,22 @@ mod tests { use super::*; use crate::{Variant, Version}; - #[cfg(target_arch = "wasm32")] + #[cfg(all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ))] use wasm_bindgen_test::*; #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] fn test_new() { let uuid = Uuid::new_v4(); @@ -53,7 +64,14 @@ mod tests { } #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] fn test_get_version() { let uuid = Uuid::new_v4(); diff --git a/vendor/uuid/src/v5.rs b/vendor/uuid/src/v5.rs index c3dd44795..265aa1a41 100644 --- a/vendor/uuid/src/v5.rs +++ b/vendor/uuid/src/v5.rs @@ -41,7 +41,11 @@ impl Uuid { mod tests { use super::*; - #[cfg(target_arch = "wasm32")] + #[cfg(all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ))] use wasm_bindgen_test::*; use crate::{std::string::ToString, Variant, Version}; @@ -130,7 +134,14 @@ mod tests { ]; #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] fn test_get_version() { let uuid = Uuid::new_v5(&Uuid::NAMESPACE_DNS, "rust-lang.org".as_bytes()); @@ -139,7 +150,14 @@ mod tests { } #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] fn test_hyphenated() { for &(ref ns, ref name, ref expected) in FIXTURE { let uuid = Uuid::new_v5(*ns, name.as_bytes()); @@ -149,7 +167,14 @@ mod tests { } #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] fn test_new() { for &(ref ns, ref name, ref u) in FIXTURE { let uuid = Uuid::new_v5(*ns, name.as_bytes()); diff --git a/vendor/uuid/src/v6.rs b/vendor/uuid/src/v6.rs index 07644fd4f..ac1942c52 100644 --- a/vendor/uuid/src/v6.rs +++ b/vendor/uuid/src/v6.rs @@ -102,11 +102,22 @@ mod tests { use crate::{Context, Variant, Version}; use std::string::ToString; - #[cfg(target_arch = "wasm32")] + #[cfg(all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ))] use wasm_bindgen_test::*; #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] fn test_new() { let time: u64 = 1_496_854_535; let time_fraction: u32 = 812_946_000; @@ -136,7 +147,14 @@ mod tests { } #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] #[cfg(all(feature = "std", feature = "rng"))] fn test_now() { let node = [1, 2, 3, 4, 5, 6]; @@ -148,7 +166,14 @@ mod tests { } #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] fn test_new_context() { let time: u64 = 1_496_854_535; let time_fraction: u32 = 812_946_000; diff --git a/vendor/uuid/src/v7.rs b/vendor/uuid/src/v7.rs index 4497ea3f5..ea8f47465 100644 --- a/vendor/uuid/src/v7.rs +++ b/vendor/uuid/src/v7.rs @@ -3,7 +3,7 @@ //! Note that you need to enable the `v7` Cargo feature //! in order to use this module. -use crate::{std::convert::TryInto, rng, timestamp::Timestamp, Builder, Uuid}; +use crate::{rng, std::convert::TryInto, timestamp::Timestamp, Builder, Uuid}; impl Uuid { /// Create a new version 7 UUID using the current time value and random bytes. @@ -57,11 +57,22 @@ impl Uuid { mod tests { use super::*; use crate::{std::string::ToString, NoContext, Variant, Version}; - #[cfg(target_arch = "wasm32")] + #[cfg(all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ))] use wasm_bindgen_test::*; #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] fn test_new() { let ts: u64 = 1645557742000; @@ -82,7 +93,14 @@ mod tests { } #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] #[cfg(feature = "std")] fn test_now() { let uuid = Uuid::now_v7(); @@ -92,7 +110,14 @@ mod tests { } #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] fn test_sorting() { let time1: u64 = 1_496_854_535; let time_fraction1: u32 = 812_000_000; @@ -108,7 +133,14 @@ mod tests { } #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] fn test_new_timestamp_roundtrip() { let time: u64 = 1_496_854_535; let time_fraction: u32 = 812_000_000; diff --git a/vendor/uuid/src/v8.rs b/vendor/uuid/src/v8.rs index a54a97980..b853ac719 100644 --- a/vendor/uuid/src/v8.rs +++ b/vendor/uuid/src/v8.rs @@ -36,11 +36,22 @@ mod tests { use crate::{Variant, Version}; use std::string::ToString; - #[cfg(target_arch = "wasm32")] + #[cfg(all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ))] use wasm_bindgen_test::*; #[test] - #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] + #[cfg_attr( + all( + target_arch = "wasm32", + target_vendor = "unknown", + target_os = "unknown" + ), + wasm_bindgen_test + )] fn test_new() { let buf: [u8; 16] = [ 0xf, 0xe, 0xd, 0xc, 0xb, 0xa, 0x9, 0x8, 0x7, 0x6, 0x5, 0x4, 0x3, 0x2, 0x1, 0x0, |