diff --git a/Cargo.lock b/Cargo.lock index 605d2b6b81..28dc50c4d1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -143,11 +143,11 @@ dependencies = [ [[package]] name = "async-native-tls" -version = "0.3.3" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e9e7a929bd34c68a82d58a4de7f86fffdaf97fb2af850162a7bb19dd7269b33" +checksum = "d57d4cec3c647232e1094dc013546c0b33ce785d8aeb251e1f20dfaf8a9a13fe" dependencies = [ - "async-std", + "futures-util", "native-tls", "thiserror", "url", @@ -218,9 +218,9 @@ dependencies = [ [[package]] name = "atoi" -version = "0.4.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "616896e05fc0e2649463a93a15183c6a16bf03413a7af88ef1285ddedfa9cda5" +checksum = "d7c57d12312ff59c811c0643f4d80830505833c9ffaebd193d819392b265be8e" dependencies = [ "num-traits", ] @@ -441,13 +441,13 @@ dependencies = [ [[package]] name = "console" -version = "0.14.1" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3993e6445baa160675931ec041a5e03ca84b9c6e32a056150d3aa2bdda0a1f45" +checksum = "a28b32d32ca44b70c3e4acd7db1babf555fa026e385fb95f18028f88848b3c31" dependencies = [ "encode_unicode", - "lazy_static", "libc", + "once_cell", "regex", "terminal_size", "unicode-width", @@ -654,10 +654,10 @@ dependencies = [ ] [[package]] -name = "difference" -version = "2.0.0" +name = "difflib" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" +checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" [[package]] name = "digest" @@ -719,9 +719,9 @@ checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f" [[package]] name = "downcast" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bb454f0228b18c7f4c3b0ebbee346ed9c52e7443b0999cd543ff3571205701d" +checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" [[package]] name = "either" @@ -749,25 +749,12 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.7.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" +checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3" dependencies = [ "atty", - "humantime 1.3.0", - "log", - "regex", - "termcolor", -] - -[[package]] -name = "env_logger" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" -dependencies = [ - "atty", - "humantime 2.1.0", + "humantime", "log", "regex", "termcolor", @@ -790,9 +777,9 @@ dependencies = [ [[package]] name = "float-cmp" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1267f4ac4f343772758f7b1bdcbe767c218bbab93bb432acbf5162bbf85a6c4" +checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" dependencies = [ "num-traits", ] @@ -1030,17 +1017,23 @@ name = "hashbrown" version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" + +[[package]] +name = "hashbrown" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c21d40587b92fa6a6c6e3c1bdbf87d75511db5672f9c93175574b3a00df1758" dependencies = [ "ahash", ] [[package]] name = "hashlink" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7249a3129cbc1ffccd74857f81464a323a152173cdb134e0fd81bc803b29facf" +checksum = "d452c155cb93fecdfb02a73dd57b5d8e442c2063bd7aac72f1bc5e4263a43086" dependencies = [ - "hashbrown", + "hashbrown 0.12.0", ] [[package]] @@ -1094,15 +1087,6 @@ dependencies = [ "digest", ] -[[package]] -name = "humantime" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" -dependencies = [ - "quick-error", -] - [[package]] name = "humantime" version = "2.1.0" @@ -1127,7 +1111,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.11.2", ] [[package]] @@ -1353,11 +1337,11 @@ dependencies = [ [[package]] name = "mockall" -version = "0.8.3" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cabea45a7fc0e37093f4f30a5e2b62602253f91791c057d5f0470c63260c3d" +checksum = "3d4d70639a72f972725db16350db56da68266ca368b2a1fe26724a903ad3d6b8" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "downcast", "fragile", "lazy_static", @@ -1368,11 +1352,11 @@ dependencies = [ [[package]] name = "mockall_derive" -version = "0.8.3" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c461918bf7f59eefb1459252756bf2351a995d6bd510d0b2061bd86bcdabfa6" +checksum = "79ef208208a0dea3f72221e26e904cdc6db2e481d9ade89081ddd494f1dbaa6b" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "proc-macro2", "quote", "syn", @@ -1768,12 +1752,13 @@ checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba" [[package]] name = "predicates" -version = "1.0.8" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f49cfaf7fdaa3bfacc6fa3e7054e65148878354a5cfddcf661df4c851f8021df" +checksum = "a5aab5be6e4732b473071984b3164dbbfb7a3674d30ea5ff44410b6bcd960c3c" dependencies = [ - "difference", + "difflib", "float-cmp", + "itertools", "normalize-line-endings", "predicates-core", "regex", @@ -1837,12 +1822,6 @@ dependencies = [ "rustyline", ] -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - [[package]] name = "quote" version = "1.0.14" @@ -2302,7 +2281,7 @@ dependencies = [ "anyhow", "async-std", "dotenv", - "env_logger 0.8.4", + "env_logger", "futures", "hex", "paste", @@ -2536,7 +2515,7 @@ dependencies = [ "anyhow", "async-std", "dotenv", - "env_logger 0.7.1", + "env_logger", "sqlx", "tokio", ] diff --git a/Cargo.toml b/Cargo.toml index d983e6de42..6f4116700d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -139,7 +139,7 @@ sqlx-macros = { version = "0.5.12", path = "sqlx-macros", default-features = fal anyhow = "1.0.52" time_ = { version = "0.3.2", package = "time" } futures = "0.3.19" -env_logger = "0.8.4" +env_logger = "0.9.0" async-std = { version = "1.10.0", features = ["attributes"] } tokio = { version = "1.15.0", features = ["full"] } dotenv = "0.15.0" diff --git a/examples/postgres/mockable-todos/Cargo.toml b/examples/postgres/mockable-todos/Cargo.toml index 0e5194cc17..1bee44af31 100644 --- a/examples/postgres/mockable-todos/Cargo.toml +++ b/examples/postgres/mockable-todos/Cargo.toml @@ -13,4 +13,4 @@ sqlx = { path = "../../../", features = ["postgres", "offline", "runtime-async-s structopt = { version = "0.3", features = ["paw"] } dotenv = "0.15.0" async-trait = "0.1.41" -mockall = "0.8.3" +mockall = "0.11" diff --git a/sqlx-cli/Cargo.toml b/sqlx-cli/Cargo.toml index 9ee835471d..e308072b55 100644 --- a/sqlx-cli/Cargo.toml +++ b/sqlx-cli/Cargo.toml @@ -38,7 +38,7 @@ chrono = "0.4.19" anyhow = "1.0.52" url = { version = "2.2.2", default-features = false } async-trait = "0.1.52" -console = "0.14.1" +console = "0.15.0" promptly = "0.3.0" serde_json = "1.0.73" serde = { version = "1.0.132", features = ["derive"] } diff --git a/sqlx-core/Cargo.toml b/sqlx-core/Cargo.toml index 4c6138ad55..e7a5bcd134 100644 --- a/sqlx-core/Cargo.toml +++ b/sqlx-core/Cargo.toml @@ -116,8 +116,8 @@ offline = ["serde", "either/serde"] [dependencies] paste = "1.0.6" ahash = "0.7.6" -atoi = "0.4.0" -sqlx-rt = { path = "../sqlx-rt", version = "0.5.12" } +atoi = "1.0" +sqlx-rt = { path = "../sqlx-rt", version = "0.5.12"} base64 = { version = "0.13.0", default-features = false, optional = true, features = ["std"] } bigdecimal_ = { version = "0.3.0", optional = true, package = "bigdecimal" } rust_decimal = { version = "1.19.0", optional = true } @@ -179,7 +179,7 @@ whoami = { version = "1.2.1", optional = true } stringprep = "0.1.2" bstr = { version = "0.2.17", default-features = false, features = ["std"], optional = true } git2 = { version = "0.14", default-features = false, optional = true } -hashlink = "0.7.0" +hashlink = "0.8.0" # NOTE: *must* remain below 1.7.0 to allow users to avoid the `ahash` cyclic dependency problem by pinning the version # https://github.com/tkaitchuck/aHash/issues/95#issuecomment-874150078 indexmap = "1.6.0" diff --git a/sqlx-rt/Cargo.toml b/sqlx-rt/Cargo.toml index f87df6adad..2b8ef91e41 100644 --- a/sqlx-rt/Cargo.toml +++ b/sqlx-rt/Cargo.toml @@ -31,7 +31,7 @@ _tls-native-tls = ["native-tls"] _tls-rustls = [] [dependencies] -async-native-tls = { version = "0.3.3", optional = true } +async-native-tls = { version = "0.4.0", optional = true } futures-rustls = { version = "0.22.0", optional = true } actix-rt = { version = "2.0.0", default-features = false, optional = true } async-std = { version = "1.7.0", features = ["unstable"], optional = true } diff --git a/sqlx-test/Cargo.toml b/sqlx-test/Cargo.toml index 1d1ac558a4..e0dcf11f28 100644 --- a/sqlx-test/Cargo.toml +++ b/sqlx-test/Cargo.toml @@ -6,7 +6,7 @@ publish = false [dependencies] sqlx = { default-features = false, path = ".." } -env_logger = "0.7.1" +env_logger = "0.9.0" dotenv = "0.15.0" anyhow = "1.0.26" async-std = { version = "1.8.0", features = [ "attributes" ] }