diff --git a/deps/rust_store/Cargo.lock b/deps/rust_store/Cargo.lock index 393705b..109392f 100644 --- a/deps/rust_store/Cargo.lock +++ b/deps/rust_store/Cargo.lock @@ -845,9 +845,9 @@ dependencies = [ [[package]] name = "object_store" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f930c88a43b1c3f6e776dfe495b4afab89882dbc81530c632db2ed65451ebcb4" +checksum = "2524735495ea1268be33d200e1ee97455096a0846295a21548cd2f3541de7050" dependencies = [ "async-trait", "base64", @@ -862,7 +862,7 @@ dependencies = [ "quick-xml", "rand", "reqwest", - "ring 0.16.20", + "ring", "serde", "serde_json", "snafu", @@ -975,9 +975,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quick-xml" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" dependencies = [ "memchr", "serde", @@ -1093,21 +1093,6 @@ dependencies = [ "quick-error", ] -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted 0.7.1", - "web-sys", - "winapi", -] - [[package]] name = "ring" version = "0.17.7" @@ -1117,8 +1102,8 @@ dependencies = [ "cc", "getrandom", "libc", - "spin 0.9.8", - "untrusted 0.9.0", + "spin", + "untrusted", "windows-sys 0.48.0", ] @@ -1177,7 +1162,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ "log", - "ring 0.17.7", + "ring", "rustls-webpki", "sct", ] @@ -1197,8 +1182,8 @@ version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring 0.17.7", - "untrusted 0.9.0", + "ring", + "untrusted", ] [[package]] @@ -1228,8 +1213,8 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.17.7", - "untrusted 0.9.0", + "ring", + "untrusted", ] [[package]] @@ -1374,12 +1359,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - [[package]] name = "spin" version = "0.9.8" @@ -1697,12 +1676,6 @@ dependencies = [ "tinyvec", ] -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - [[package]] name = "untrusted" version = "0.9.0" diff --git a/deps/rust_store/Cargo.toml b/deps/rust_store/Cargo.toml index 3899f4f..760cf73 100644 --- a/deps/rust_store/Cargo.toml +++ b/deps/rust_store/Cargo.toml @@ -18,7 +18,7 @@ tracing-subscriber = "0.3" futures-util = "0.3" # object_store = { git = "https://github.com/andrebsguedes/arrow-rs.git", branch = "dns", features = ["azure"] } reqwest = { version = "0.11", default-features = false, features = ["rustls-tls", "trust-dns"] } -object_store = { version = "0.7", features = ["azure"] } +object_store = { version = "0.8", features = ["azure"] } thiserror = "1" anyhow = "1" once_cell = "1.18" diff --git a/deps/rust_store/src/lib.rs b/deps/rust_store/src/lib.rs index 06756ed..63e9f83 100644 --- a/deps/rust_store/src/lib.rs +++ b/deps/rust_store/src/lib.rs @@ -238,7 +238,7 @@ pub extern "C" fn start() -> CResult { }; let len = chunk.len(); - if (received_bytes + len > slice.len()) { + if received_bytes + len > slice.len() { response._error("Supplied buffer was too small"); failed = true; break; @@ -248,7 +248,7 @@ pub extern "C" fn start() -> CResult { received_bytes += len; } bytes_sent.fetch_add(received_bytes, Ordering::AcqRel); - if (!failed) { + if !failed { response.success(received_bytes); } notifier.notify(); @@ -291,7 +291,7 @@ pub extern "C" fn start() -> CResult { let mut tries = 10; loop { match client.put(&p, slice.into()).await { - Ok(()) => { + Ok(_) => { bytes_sent.fetch_add(len, Ordering::AcqRel); response.success(len); notifier.notify();