Merge branch 'update-deps3'

Author: benma

src/rust/Cargo.lock

@@ -40,11 +40,11 @@ num-traits = { version = "0.2", default-features = false, optional = true }
 bip32-ed25519 = { git = "https://github.com/digitalbitbox/rust-bip32-ed25519", tag = "v0.1.2", optional = true }
 bech32 = { version = "0.9", default-features = false, optional = true }
 blake2 = { version = "0.10.6", default-features = false, optional = true }
-minicbor = { version = "0.19.1", default-features = false, features = ["alloc"], optional = true }
+minicbor = { version = "0.20.0", default-features = false, features = ["alloc"], optional = true }
 crc = { version = "3.0.1", optional = true }
 ed25519-dalek = { version = "2.0.0", default-features = false, features = ["hazmat"], optional = true }
 lazy_static = { version = "1.4.0", optional = true }
-async-recursion = "1.0.4"
+async-recursion = "1.0.5"
 hmac = { version = "0.12.1", default-features = false, features = ["reset"] }
 
 miniscript = { version = "10.0.0", default-features = false, features = ["no-std"], optional = true }

src/rust/bitbox02-rust/Cargo.toml

@@ -1 +1 @@
-{"files":{"Cargo.toml":"72cecc6072af8afdfa75aedf9e5a086f9771ae86ae9553e4deb9dc3a29de97a8","LICENSE-APACHE":"b8601fc79bdf8d8088f0938bea861ffc63ed0eebbedf25f44ab2cf2e85bd7edc","LICENSE-MIT":"cdbd06e25b8c9c5d6019949d2de8123f56d29cee4166396423d2ba8c81700845","README.md":"ac0adb8b090a364b60e976def6fd07184a4f646e2c6b5f46d8a5805f6dc33d6d","rustfmt.toml":"53566290932187cfebcc93e4c2d02cbca6d6a7b1684a887ee7111103d2fbea5e","src/expand.rs":"04da560ad63a5cb319fee6190be9fd2e5cf18a0dca15302eceeeef26d6d86822","src/lib.rs":"4f55d5d142c310c52c14f88ff9cd871dadd5e689ca1544716d93cc004ba83195","src/parse.rs":"49a515be6450b000afa1aa8061b5645ba879d00db5c390d67eabe1c814bdcc8e","tests/compiletest.rs":"c30d5d523645a1986ecb62b1b73b01da387c30728af728e1b213ece1857d9d85","tests/core_module.rs":"829aaf27076dedf0f8dc24f5ff68a151de8927541d1f874f1dcc58591eee7bd0","tests/fibonacci.rs":"188dc22c7886d5cca61e45e217d35e8af98e9cd6a28f0e5323a6e7be2fc48155","tests/generic_parameters.rs":"c24519932b1b0e1debeffcbd6e7286e70803d3a5e432065edc5f5034b2edced4","tests/lifetimes.rs":"679083aae3c1fe485790def8b94f308b4718aac9581319a30eb76d8ead9889ec","tests/struct_methods.rs":"99cfa52dfda3aa29710d914106fe8124588d7fea2fe8a417e05d739b25d22f24","tests/ui/must_use.rs":"2cb4e2f35d190573ca4052f493465f7c0c616bd0a435a3cd47358cbd0736d7ca","tests/ui/must_use.stderr":"c70c724b2b75e42175df39c87b476437f12a0ebe5fb90cff45eb49a2cae94ce0","tests/ui/not_async.rs":"33465f333edbc81b1fb92caa50c650551a126be43efb67910815d0abdcbdef23","tests/ui/not_async.stderr":"fd8d5c56d2a69fbff9f444113f604c8a0b5d366283ac3e951cbba26ea7af67fb"},"package":"0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba"}
+{"files":{"Cargo.toml":"e9348b4bae50bdcae336b975a732acd99bf09c8f96a6aea671ff41e64e95b83e","LICENSE-APACHE":"b8601fc79bdf8d8088f0938bea861ffc63ed0eebbedf25f44ab2cf2e85bd7edc","LICENSE-MIT":"cdbd06e25b8c9c5d6019949d2de8123f56d29cee4166396423d2ba8c81700845","README.md":"ac0adb8b090a364b60e976def6fd07184a4f646e2c6b5f46d8a5805f6dc33d6d","rustfmt.toml":"53566290932187cfebcc93e4c2d02cbca6d6a7b1684a887ee7111103d2fbea5e","src/expand.rs":"19c5546c6cc91aedb029e22a234c5e729c17765cadc81729c934b7ce4753dfcc","src/lib.rs":"4f55d5d142c310c52c14f88ff9cd871dadd5e689ca1544716d93cc004ba83195","src/parse.rs":"49a515be6450b000afa1aa8061b5645ba879d00db5c390d67eabe1c814bdcc8e","tests/compiletest.rs":"c30d5d523645a1986ecb62b1b73b01da387c30728af728e1b213ece1857d9d85","tests/core_module.rs":"829aaf27076dedf0f8dc24f5ff68a151de8927541d1f874f1dcc58591eee7bd0","tests/fibonacci.rs":"188dc22c7886d5cca61e45e217d35e8af98e9cd6a28f0e5323a6e7be2fc48155","tests/generic_parameters.rs":"c24519932b1b0e1debeffcbd6e7286e70803d3a5e432065edc5f5034b2edced4","tests/lifetimes.rs":"679083aae3c1fe485790def8b94f308b4718aac9581319a30eb76d8ead9889ec","tests/macros_all_the_way_down.rs":"8daa3f1e909afdc22582e4bd4980119f4bfd612b7a9bc0e00d8821f964ada6ba","tests/struct_methods.rs":"99cfa52dfda3aa29710d914106fe8124588d7fea2fe8a417e05d739b25d22f24","tests/ui/must_use.rs":"2cb4e2f35d190573ca4052f493465f7c0c616bd0a435a3cd47358cbd0736d7ca","tests/ui/must_use.stderr":"bfcbb5717912185267002013c6533a4630b6907094a4ba019bb44f5fb0903cd5","tests/ui/not_async.rs":"33465f333edbc81b1fb92caa50c650551a126be43efb67910815d0abdcbdef23","tests/ui/not_async.stderr":"fd8d5c56d2a69fbff9f444113f604c8a0b5d366283ac3e951cbba26ea7af67fb"},"package":"5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0"}

src/rust/vendor/async-recursion/.cargo-checksum.json

@@ -12,7 +12,7 @@
 [package]
 edition = "2018"
 name = "async-recursion"
-version = "1.0.4"
+version = "1.0.5"
 authors = ["Robert Usher <266585+dcchut@users.noreply.github.com>"]
 description = "Recursion for async functions"
 documentation = "https://docs.rs/async-recursion"

src/rust/vendor/async-recursion/Cargo.toml

@@ -61,8 +61,18 @@ fn transform_sig(sig: &mut Signature, args: &RecursionArgs) {
 
     for arg in &mut sig.inputs {
         if let FnArg::Typed(pt) = arg {
-            if let Type::Reference(tr) = pt.ty.as_mut() {
-                ref_arguments.push(tr);
+            match pt.ty.as_mut() {
+                // rustc can give us a None-delimited group if this type comes from
+                // a macro_rules macro.  I don't this can happen for code the user has written.
+                Type::Group(tg) => {
+                    if let Type::Reference(tr) = &mut *tg.elem {
+                        ref_arguments.push(tr);
+                    }
+                }
+                Type::Reference(tr) => {
+                    ref_arguments.push(tr);
+                }
+                _ => {}
             }
         } else if let FnArg::Receiver(recv) = arg {
             if let Some((_, slt)) = &mut recv.reference {

src/rust/vendor/async-recursion/src/expand.rs

@@ -0,0 +1,26 @@
+use futures_executor::block_on;
+
+macro_rules! recurse {
+    ($name:ident, $param:ty) => {
+        #[::async_recursion::async_recursion]
+        async fn $name<F>(param: $param, f: &F)
+        where
+            F: Fn($param) + Sync + Send,
+        {
+            f(param);
+        }
+    };
+}
+
+recurse!(owned, usize);
+recurse!(by_ref, &usize);
+recurse!(by_ref_mut, &mut usize);
+
+#[test]
+fn async_in_macro() {
+    block_on(async move {
+        owned(5, &|_| ()).await;
+        by_ref(&5, &|_| ()).await;
+        by_ref_mut(&mut 5, &|_| ()).await;
+    });
+}

src/rust/vendor/async-recursion/tests/macros_all_the_way_down.rs

@@ -9,3 +9,7 @@ note: the lint level is defined here
   |
 1 | #![deny(unused_must_use)]
   |         ^^^^^^^^^^^^^^^
+help: use `let _ = ...` to ignore the resulting value
+  |
+9 |     let _ = apples(3);
+  |     +++++++

src/rust/vendor/async-recursion/tests/ui/must_use.stderr

@@ -1 +1 @@
-{"files":{"CONTRIBUTING.md":"8de12002f36c177f129fd187be0b5f09d4db581d6876f15067cfa4dab1bf9ee3","Cargo.lock":"adf0368e12cdd48dd9d9db04198ca5769ed1aa0b3fdd231363c83a2bb37bfac6","Cargo.toml":"bd803ec3d4356ec82b432c7d32cad3daf7ba9f08a8d7554365855b88fb7ee946","LICENSE.md":"79860758b46e85f70a1762c21a8fff4f2d220d89f9bdca096e12aed15b9951c5","README.md":"5fd8ca2a0f7db6659510c859fb48771037fe7ef615ec615aaa3e20e826167ee9","build.rs":"91e8453342562815fdfeb9c9aa134d1fcb6e5c38ed46a4bf8760cb6506a38b8e","src/bin/cbor-display.rs":"fbfca4f7ff46d7665178a6d162dad33be131cafdc04409f03b29a37e137ab270","src/bytes.rs":"37d39d2f3a9e5777aee65c51802c2cfb30341c09c78182862c62c8d2d4ea73d2","src/data.rs":"8dbd2eb119db89f70666410c9c99fae069457a6a698f039838568e4d617258db","src/decode.rs":"eceff80cc5971f86316016e98bf7311b194322e9fea725067e4558b3e115a90f","src/decode/decoder.rs":"59032182c7d46124af103092d37935b14e5fb7bc65e811d4b2c3d80dd4d490e5","src/decode/error.rs":"2877e65718e926d8c3f2093885c64e8b23bb2c03baff51d895ce6eb5c39e30ef","src/decode/tokens.rs":"e746ab7bc81b236f53817b57e6b13a5519080e04a718fd13af92f806be3a1b4f","src/encode.rs":"cfc232ce34d969ce0059ca15b828b3c33d4996361b66b49193b0011f67966a45","src/encode/encoder.rs":"410659be8c138ff92b5f595971e327e3dbfa962d1fe5608e0c116da258fc85cd","src/encode/error.rs":"7a1c85668ae54165a18cf968898f306a6a162edbe2491c522111384d5b4ad5f9","src/encode/write.rs":"ec071b4db772981c6900473a5a62366116fae247609f81e54b132238cd311c48","src/lib.rs":"86cc82cd1f96e6bdfd5029dc234efd6fecb73a157efa93b6463bc8ed967a9896"},"package":"d7005aaf257a59ff4de471a9d5538ec868a21586534fff7f85dd97d4043a6139"}
+{"files":{"CONTRIBUTING.md":"8de12002f36c177f129fd187be0b5f09d4db581d6876f15067cfa4dab1bf9ee3","Cargo.lock":"04eb40151cd149333b5c6c0919120c063aec71ec3a6d097ce06069d3fcfaf6f3","Cargo.toml":"f1ed31dabfb8451faa728ee27c6b02cadd13db9fc7b5b379808daf5dee98dc81","LICENSE.md":"79860758b46e85f70a1762c21a8fff4f2d220d89f9bdca096e12aed15b9951c5","README.md":"5fd8ca2a0f7db6659510c859fb48771037fe7ef615ec615aaa3e20e826167ee9","build.rs":"91e8453342562815fdfeb9c9aa134d1fcb6e5c38ed46a4bf8760cb6506a38b8e","src/bin/cbor-display.rs":"fbfca4f7ff46d7665178a6d162dad33be131cafdc04409f03b29a37e137ab270","src/bytes.rs":"37d39d2f3a9e5777aee65c51802c2cfb30341c09c78182862c62c8d2d4ea73d2","src/data.rs":"8dbd2eb119db89f70666410c9c99fae069457a6a698f039838568e4d617258db","src/decode.rs":"0a585d082f3be5b009509a5c6f3b2a66027a14603e347c61a37028868fdbde07","src/decode/decoder.rs":"0b5fcb3fac002554ede5be6154d995956ea15bc5fd3300ca6b8127ac6235f7d8","src/decode/error.rs":"2877e65718e926d8c3f2093885c64e8b23bb2c03baff51d895ce6eb5c39e30ef","src/decode/info.rs":"da6237a5fe75a5b58525cf6dcb782b83be84f8241cbb1594689f13abaf3e6cfd","src/decode/tokens.rs":"e746ab7bc81b236f53817b57e6b13a5519080e04a718fd13af92f806be3a1b4f","src/encode.rs":"8cba0e48b10920e8ac1a6c09710442c00c03f8653d39a65ab5fe0cb2452ed30b","src/encode/encoder.rs":"410659be8c138ff92b5f595971e327e3dbfa962d1fe5608e0c116da258fc85cd","src/encode/error.rs":"7a1c85668ae54165a18cf968898f306a6a162edbe2491c522111384d5b4ad5f9","src/encode/write.rs":"ec071b4db772981c6900473a5a62366116fae247609f81e54b132238cd311c48","src/lib.rs":"86cc82cd1f96e6bdfd5029dc234efd6fecb73a157efa93b6463bc8ed967a9896"},"package":"9d15f4203d71fdf90903c2696e55426ac97a363c67b218488a73b534ce7aca10"}

src/rust/vendor/minicbor/.cargo-checksum.json

@@ -12,7 +12,7 @@
 [package]
 edition = "2021"
 name = "minicbor"
-version = "0.19.1"
+version = "0.20.0"
 authors = ["Toralf Wittner <tw@dtex.org>"]
 build = "build.rs"
 description = "A small CBOR codec suitable for no_std environments."
@@ -28,7 +28,6 @@ keywords = [
 categories = ["encoding"]
 license = "BlueOak-1.0.0"
 repository = "https://gitlab.com/twittner/minicbor"
-resolver = "1"
 
 [package.metadata.docs.rs]
 features = [