diff --git a/Cargo.lock b/Cargo.lock index 197d2fa..7ee9396 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,18 +4,18 @@ version = 3 [[package]] name = "addr2line" -version = "0.22.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" dependencies = [ "gimli", ] [[package]] -name = "adler" -version = "1.0.2" +name = "adler2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" [[package]] name = "aes" @@ -57,9 +57,9 @@ checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "10f00e1f6e58a40e807377c75c6a7f97bf9044fab57816f2414e6f5f4499d7b8" [[package]] name = "async-stream" @@ -85,9 +85,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.81" +version = "0.1.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" dependencies = [ "proc-macro2", "quote", @@ -147,17 +147,17 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.73" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cc", "cfg-if", "libc", "miniz_oxide", "object", "rustc-demangle", + "windows-targets", ] [[package]] @@ -251,9 +251,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.7" +version = "1.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26a5c3fd7bfa1ce3897a3a3501d362b2d87b7f2583ebcb4a949ec25911025cbc" +checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476" +dependencies = [ + "shlex", +] [[package]] name = "cexpr" @@ -303,15 +306,15 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" dependencies = [ "libc", ] @@ -345,7 +348,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -484,9 +487,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.29.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" +checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" [[package]] name = "glob" @@ -506,7 +509,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 2.3.0", + "indexmap 2.5.0", "slab", "tokio", "tokio-util", @@ -550,7 +553,7 @@ version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" dependencies = [ - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -659,9 +662,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.3.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", "hashbrown 0.14.5", @@ -706,9 +709,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.155" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libloading" @@ -723,7 +726,7 @@ dependencies = [ [[package]] name = "libsql" version = "0.5.1" -source = "git+https://github.com/tursodatabase/libsql/?rev=42a6f1bcd47df94909dc91e2b8811d1dcd9043dc#42a6f1bcd47df94909dc91e2b8811d1dcd9043dc" +source = "git+https://github.com/tursodatabase/libsql/?rev=1013a3afd17dc944db80105c2a4c78394c47eacd#1013a3afd17dc944db80105c2a4c78394c47eacd" dependencies = [ "anyhow", "async-stream", @@ -759,8 +762,8 @@ dependencies = [ [[package]] name = "libsql-ffi" -version = "0.4.0" -source = "git+https://github.com/tursodatabase/libsql/?rev=42a6f1bcd47df94909dc91e2b8811d1dcd9043dc#42a6f1bcd47df94909dc91e2b8811d1dcd9043dc" +version = "0.4.1" +source = "git+https://github.com/tursodatabase/libsql/?rev=1013a3afd17dc944db80105c2a4c78394c47eacd#1013a3afd17dc944db80105c2a4c78394c47eacd" dependencies = [ "bindgen", "cc", @@ -769,7 +772,7 @@ dependencies = [ [[package]] name = "libsql-hrana" version = "0.2.0" -source = "git+https://github.com/tursodatabase/libsql/?rev=42a6f1bcd47df94909dc91e2b8811d1dcd9043dc#42a6f1bcd47df94909dc91e2b8811d1dcd9043dc" +source = "git+https://github.com/tursodatabase/libsql/?rev=1013a3afd17dc944db80105c2a4c78394c47eacd#1013a3afd17dc944db80105c2a4c78394c47eacd" dependencies = [ "base64 0.21.7", "bytes", @@ -779,7 +782,7 @@ dependencies = [ [[package]] name = "libsql-js" -version = "0.4.2-pre.3" +version = "0.4.3" dependencies = [ "libsql", "neon", @@ -792,7 +795,7 @@ dependencies = [ [[package]] name = "libsql-rusqlite" version = "0.32.0" -source = "git+https://github.com/tursodatabase/libsql/?rev=42a6f1bcd47df94909dc91e2b8811d1dcd9043dc#42a6f1bcd47df94909dc91e2b8811d1dcd9043dc" +source = "git+https://github.com/tursodatabase/libsql/?rev=1013a3afd17dc944db80105c2a4c78394c47eacd#1013a3afd17dc944db80105c2a4c78394c47eacd" dependencies = [ "bitflags 2.6.0", "fallible-iterator 0.2.0", @@ -805,12 +808,12 @@ dependencies = [ [[package]] name = "libsql-sqlite3-parser" version = "0.13.0" -source = "git+https://github.com/tursodatabase/libsql/?rev=42a6f1bcd47df94909dc91e2b8811d1dcd9043dc#42a6f1bcd47df94909dc91e2b8811d1dcd9043dc" +source = "git+https://github.com/tursodatabase/libsql/?rev=1013a3afd17dc944db80105c2a4c78394c47eacd#1013a3afd17dc944db80105c2a4c78394c47eacd" dependencies = [ "bitflags 2.6.0", "cc", "fallible-iterator 0.3.0", - "indexmap 2.3.0", + "indexmap 2.5.0", "log", "memchr", "phf", @@ -822,7 +825,7 @@ dependencies = [ [[package]] name = "libsql-sys" version = "0.7.0" -source = "git+https://github.com/tursodatabase/libsql/?rev=42a6f1bcd47df94909dc91e2b8811d1dcd9043dc#42a6f1bcd47df94909dc91e2b8811d1dcd9043dc" +source = "git+https://github.com/tursodatabase/libsql/?rev=1013a3afd17dc944db80105c2a4c78394c47eacd#1013a3afd17dc944db80105c2a4c78394c47eacd" dependencies = [ "bytes", "libsql-ffi", @@ -835,7 +838,7 @@ dependencies = [ [[package]] name = "libsql_replication" version = "0.5.0" -source = "git+https://github.com/tursodatabase/libsql/?rev=42a6f1bcd47df94909dc91e2b8811d1dcd9043dc#42a6f1bcd47df94909dc91e2b8811d1dcd9043dc" +source = "git+https://github.com/tursodatabase/libsql/?rev=1013a3afd17dc944db80105c2a4c78394c47eacd#1013a3afd17dc944db80105c2a4c78394c47eacd" dependencies = [ "aes", "async-stream", @@ -914,23 +917,23 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.4" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" dependencies = [ - "adler", + "adler2", ] [[package]] name = "mio" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" dependencies = [ "hermit-abi", "libc", "wasi", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -980,9 +983,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.2" +version = "0.36.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f203fa8daa7bb185f760ae12bd8e097f63d17041dcdcaf675ac54cdf863170e" +checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" dependencies = [ "memchr", ] @@ -1122,9 +1125,9 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.20" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" +checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" dependencies = [ "proc-macro2", "syn", @@ -1164,9 +1167,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -1266,7 +1269,7 @@ dependencies = [ "libc", "spin", "untrusted", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -1283,15 +1286,15 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "3f55e80d50763938498dd5ebb18647174e0c76dc38c5505294bb224624f30f36" dependencies = [ "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -1310,9 +1313,9 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.7.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a88d6d420651b496bdd98684116959239430022a115c1240e6c3993be0b15fba" +checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" dependencies = [ "openssl-probe", "rustls-pemfile", @@ -1339,9 +1342,9 @@ checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" [[package]] name = "rustls-webpki" -version = "0.102.6" +version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ "ring", "rustls-pki-types", @@ -1362,11 +1365,11 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "schannel" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" dependencies = [ - "windows-sys", + "windows-sys 0.59.0", ] [[package]] @@ -1412,18 +1415,18 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "serde" -version = "1.0.204" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.204" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", @@ -1432,9 +1435,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.122" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "itoa", "memchr", @@ -1494,7 +1497,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -1511,9 +1514,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "2.0.72" +version = "2.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" dependencies = [ "proc-macro2", "quote", @@ -1569,9 +1572,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.39.2" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", "bytes", @@ -1582,7 +1585,7 @@ dependencies = [ "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -1619,9 +1622,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" dependencies = [ "futures-core", "pin-project-lite", @@ -1630,9 +1633,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" dependencies = [ "bytes", "futures-core", @@ -1735,15 +1738,15 @@ dependencies = [ [[package]] name = "tower-layer" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" @@ -1879,9 +1882,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "webpki-roots" -version = "0.26.3" +version = "0.26.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" +checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a" dependencies = [ "rustls-pki-types", ] @@ -1929,6 +1932,15 @@ dependencies = [ "windows-targets", ] +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets", +] + [[package]] name = "windows-targets" version = "0.52.6" diff --git a/Cargo.toml b/Cargo.toml index 6890885..706ef23 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "libsql-js" -version = "0.4.2-pre.3" +version = "0.4.3" description = "" authors = ["Pekka Enberg "] license = "MIT" @@ -12,7 +12,7 @@ crate-type = ["cdylib"] [dependencies] tracing-subscriber = { version = "0.3", features = ["env-filter"] } -libsql = { git = "https://github.com/tursodatabase/libsql/", rev = "42a6f1bcd47df94909dc91e2b8811d1dcd9043dc", features = ["encryption"] } +libsql = { git = "https://github.com/tursodatabase/libsql/", rev = "1013a3afd17dc944db80105c2a4c78394c47eacd", features = ["encryption"] } tracing = "0.1" once_cell = "1.18.0" tokio = { version = "1.29.1", features = [ "rt-multi-thread" ] } diff --git a/package.json b/package.json index ff8c8a3..f11e4a9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "libsql", - "version": "0.4.2-pre.3", + "version": "0.4.3", "description": "A better-sqlite3 compatible API for libSQL that supports Bun, Deno, and Node", "os": [ "darwin", diff --git a/src/errors.rs b/src/errors.rs index 8088cdf..6b2864f 100644 --- a/src/errors.rs +++ b/src/errors.rs @@ -1,10 +1,4 @@ -use neon::{ - context::Context, - handle::Handle, - object::Object, - result::NeonResult, - types::{JsError, JsFunction, JsObject}, -}; +use neon::{context::Context, object::Object, result::NeonResult, types::JsError}; pub fn throw_database_closed_error<'a, C: Context<'a>, T>(cx: &mut C) -> NeonResult { let err = JsError::type_error(cx, "The database connection is not open")?; diff --git a/src/statement.rs b/src/statement.rs index 1c3204e..798c836 100644 --- a/src/statement.rs +++ b/src/statement.rs @@ -274,14 +274,18 @@ impl Rows { keys.push(cx.string(column_name)); } for idx in 0..count { - match rows.next().await.or_else(|err| throw_libsql_error(&mut cx, err))? { + match rows + .next() + .await + .or_else(|err| throw_libsql_error(&mut cx, err))? + { Some(row) => { if raw { let mut result = cx.empty_array(); convert_row_raw(&mut cx, safe_ints, &mut result, &rows, &row)?; result_arr.set(&mut cx, idx, result)?; } else { - let mut result = cx.empty_object(); + let result = cx.empty_object(); for idx in 0..rows.column_count() { let v = row .get_value(idx) @@ -297,7 +301,9 @@ impl Rows { } libsql::Value::Real(v) => cx.number(v).upcast(), libsql::Value::Text(v) => cx.string(v).upcast(), - libsql::Value::Blob(v) => JsArrayBuffer::from_slice(&mut cx, &v)?.upcast(), + libsql::Value::Blob(v) => { + JsArrayBuffer::from_slice(&mut cx, &v)?.upcast() + } }; result.set(&mut cx, keys[idx as usize], v)?; } @@ -306,7 +312,7 @@ impl Rows { } None => { break; - }, + } }; } Ok(())