diff --git a/Cargo.lock b/Cargo.lock index 3e6f532054..dd9ff6a382 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -108,9 +108,9 @@ dependencies = [ [[package]] name = "actix-router" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8be584b3b6c705a18eabc11c4059cf83b255bdd8511673d1d569f4ce40c69de" +checksum = "2ad299af73649e1fc893e333ccf86f377751eb95ff875d095131574c6f43452c" dependencies = [ "bytestring", "http", @@ -324,12 +324,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4d7d63395147b81a9e570bcc6243aaf71c017bd666d4909cfef0085bdda8d73" -[[package]] -name = "arrayref" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" - [[package]] name = "arrayvec" version = "0.5.2" @@ -465,17 +459,6 @@ dependencies = [ "typenum", ] -[[package]] -name = "blake2b_simd" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" -dependencies = [ - "arrayref", - "arrayvec", - "constant_time_eq", -] - [[package]] name = "block-buffer" version = "0.9.0" @@ -639,12 +622,6 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28b9d6de7f49e22cf97ad17fc4036ece69300032f45f78f30b4a4482cdc3f4a6" -[[package]] -name = "constant_time_eq" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" - [[package]] name = "cookie" version = "0.14.3" @@ -875,20 +852,20 @@ dependencies = [ ] [[package]] -name = "dirs" -version = "2.0.2" +name = "dirs-next" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" dependencies = [ - "cfg-if 0.1.10", - "dirs-sys", + "cfg-if 1.0.0", + "dirs-sys-next", ] [[package]] -name = "dirs-sys" -version = "0.3.5" +name = "dirs-sys-next" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" dependencies = [ "libc", "redox_users", @@ -921,9 +898,9 @@ checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" [[package]] name = "encoding_rs" -version = "0.8.26" +version = "0.8.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "801bbab217d7f79c0062f4f7205b5d4427c6d1a7bd7aafdd1475f7c59d62b283" +checksum = "80df024fbc5ac80f87dfef0d9f5209a252f2a497f7f42944cff24d8253cac065" dependencies = [ "cfg-if 1.0.0", ] @@ -942,9 +919,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26ecb66b4bdca6c1409b40fb255eefc2bd4f6d135dab3c3124f80ffa2a9661e" +checksum = "17392a012ea30ef05a610aa97dfb49496e71c9f676b27879922ea5bdf60d9d3f" dependencies = [ "atty", "humantime", @@ -1211,7 +1188,7 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" [[package]] name = "googleapis-raw" -version = "0.0.5" +version = "0.0.6" dependencies = [ "futures 0.3.12", "grpcio", @@ -1427,9 +1404,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" +checksum = "de910d521f7cc3135c4de8db1cb910e0b5ed1dc6f57c381cd07e8e661ce10094" dependencies = [ "matches", "unicode-bidi", @@ -1468,10 +1445,24 @@ dependencies = [ [[package]] name = "indoc" -version = "1.0.3" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47741a8bc60fb26eb8d6e0238bbb26d8575ff623fdc97b1a2c00c050b9684ed8" +dependencies = [ + "indoc-impl", + "proc-macro-hack", +] + +[[package]] +name = "indoc-impl" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5a75aeaaef0ce18b58056d306c27b07436fbb34b8816c53094b76dd81803136" +checksum = "ce046d161f000fffde5f432a0d034d0341dc152643b2598ed5bfce44c4f3a8f0" dependencies = [ + "proc-macro-hack", + "proc-macro2", + "quote", + "syn", "unindent", ] @@ -1586,22 +1577,22 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "lexical-core" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db65c6da02e61f55dae90a0ae427b2a5f6b3e8db09f58d10efab23af92592616" +checksum = "21f866863575d0e1d654fbeeabdc927292fdf862873dc3c96c6f753357e13374" dependencies = [ "arrayvec", "bitflags", - "cfg-if 0.1.10", + "cfg-if 1.0.0", "ryu", "static_assertions", ] [[package]] name = "libc" -version = "0.2.85" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ccac4b00700875e6a07c6cde370d44d32fa01c5a65cdd2fca6858c479d28bb3" +checksum = "b7282d924be3275cec7f6756ff4121987bc6481325397dde6ba3e7802b1a8b1c" [[package]] name = "libloading" @@ -1954,23 +1945,36 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ccb628cad4f84851442432c60ad8e1f607e29752d0bf072cbd0baf28aa34272" +checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" dependencies = [ "cfg-if 1.0.0", "instant", "libc", - "redox_syscall 0.1.57", + "redox_syscall", "smallvec", "winapi 0.3.9", ] [[package]] name = "paste" -version = "1.0.4" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5d65c4d95931acda4498f675e332fcbdc9a06705cd07086c510e9b6009cd1c1" +checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880" +dependencies = [ + "paste-impl", + "proc-macro-hack", +] + +[[package]] +name = "paste-impl" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" +dependencies = [ + "proc-macro-hack", +] [[package]] name = "peeking_take_while" @@ -1980,9 +1984,9 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "pem" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c220d01f863d13d96ca82359d1e81e64a7c6bf0637bcde7b2349630addf0c6" +checksum = "fd56cbd21fea48d0c440b41cd69c589faacade08c992d9a54e471b79d0fd13eb" dependencies = [ "base64 0.13.0", "once_cell", @@ -2118,15 +2122,15 @@ dependencies = [ [[package]] name = "protobuf" -version = "2.20.0" +version = "2.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86473d5f16580f10b131a0bf0afb68f8e029d1835d33a00f37281b05694e5312" +checksum = "73f72884896d22e0da0e5b266cb9a780b791f6c3b2f5beab6368d6cd4f0dbb86" [[package]] name = "pyo3" -version = "0.13.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00ca634cf3acd58a599b535ed6cb188223298977d471d146121792bfa23b754c" +checksum = "4837b8e8e18a102c23f79d1e9a110b597ea3b684c95e874eb1ad88f8683109c3" dependencies = [ "cfg-if 1.0.0", "ctor", @@ -2141,9 +2145,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.13.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "483ac516dbda6789a5b4be0271e7a31b9ad4ec8c0a5955050e8076f72bdbef8f" +checksum = "a47f2c300ceec3e58064fd5f8f5b61230f2ffd64bde4970c81fdd0563a2db1bb" dependencies = [ "pyo3-macros-backend", "quote", @@ -2152,9 +2156,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.13.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15230cabcda008f03565ed8bac40f094cbb5ee1b46e6551f1ec3a0e922cf7df9" +checksum = "87b097e5d84fcbe3e167f400fbedd657820a375b034c78bd852050749a575d66" dependencies = [ "proc-macro2", "quote", @@ -2169,9 +2173,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df" +checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" dependencies = [ "proc-macro2", ] @@ -2208,7 +2212,7 @@ checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e" dependencies = [ "libc", "rand_chacha 0.3.0", - "rand_core 0.6.1", + "rand_core 0.6.2", "rand_hc 0.3.0", ] @@ -2229,7 +2233,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d" dependencies = [ "ppv-lite86", - "rand_core 0.6.1", + "rand_core 0.6.2", ] [[package]] @@ -2243,9 +2247,9 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c026d7df8b298d90ccbbc5190bd04d85e159eaf5576caeacf8741da93ccbd2e5" +checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7" dependencies = [ "getrandom 0.2.2", ] @@ -2265,7 +2269,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73" dependencies = [ - "rand_core 0.6.1", + "rand_core 0.6.2", ] [[package]] @@ -2279,28 +2283,21 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.1.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" - -[[package]] -name = "redox_syscall" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ec8ca9416c5ea37062b502703cd7fcb207736bc294f6e0cf367ac6fc234570" +checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9" dependencies = [ "bitflags", ] [[package]] name = "redox_users" -version = "0.3.5" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" +checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" dependencies = [ - "getrandom 0.1.16", - "redox_syscall 0.1.57", - "rust-argon2", + "getrandom 0.2.2", + "redox_syscall", ] [[package]] @@ -2391,18 +2388,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "rust-argon2" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" -dependencies = [ - "base64 0.13.0", - "blake2b_simd", - "constant_time_eq", - "crossbeam-utils 0.8.1", -] - [[package]] name = "rust-ini" version = "0.13.0" @@ -2430,6 +2415,12 @@ dependencies = [ "semver", ] +[[package]] +name = "rustversion" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb5d2a036dc6d2d8fd16fde3498b04306e29bd193bf306a57427019b823d5acd" + [[package]] name = "ryu" version = "1.0.5" @@ -2641,9 +2632,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.61" +version = "1.0.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fceb2595057b6891a4ee808f70054bd2d12f0e97f1cbb78689b59f676df325a" +checksum = "ea1c6153794552ea7cf7cf63b1231a25de00ec90db326ba6264440fa08e31486" dependencies = [ "itoa", "ryu", @@ -2673,9 +2664,9 @@ dependencies = [ [[package]] name = "sha-1" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4b312c3731e3fe78a185e6b9b911a7aa715b8e31cce117975219aab2acf285d" +checksum = "dfebf75d25bd900fd1e7d11501efab59bc846dbc76196839663e6637bba9f25f" dependencies = [ "block-buffer", "cfg-if 1.0.0", @@ -2817,9 +2808,9 @@ dependencies = [ [[package]] name = "slog-term" -version = "2.6.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab1d807cf71129b05ce36914e1dbb6fbfbdecaf686301cb457f4fa967f9f5b6" +checksum = "95c1e7e5aab61ced6006149ea772770b84a0d16ce0f7885def313e4829946d76" dependencies = [ "atty", "chrono", @@ -2853,9 +2844,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "standback" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c66a8cff4fa24853fdf6b51f75c6d7f8206d7c75cab4e467bcd7f25c2b1febe0" +checksum = "a2beb4d1860a61f571530b3f855a1b538d0200f7871c63331ecd6f17b1f014f8" dependencies = [ "version_check 0.9.2", ] @@ -3028,18 +3019,19 @@ dependencies = [ "cfg-if 1.0.0", "libc", "rand 0.8.3", - "redox_syscall 0.2.4", + "redox_syscall", "remove_dir_all", "winapi 0.3.9", ] [[package]] name = "term" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0863a3345e70f61d613eab32ee046ccd1bcc5f9105fe402c61fcd0c13eeb8b5" +checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" dependencies = [ - "dirs", + "dirs-next", + "rustversion", "winapi 0.3.9", ] @@ -3074,9 +3066,9 @@ dependencies = [ [[package]] name = "thread_local" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8208a331e1cb318dd5bd76951d2b8fc48ca38a69f5f4e4af1b6a9f8c6236915" +checksum = "8018d24e04c95ac8790716a5987d0fec4f8b27249ffa0f7d33f1369bdfb88cbd" dependencies = [ "once_cell", ] @@ -3228,9 +3220,9 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" [[package]] name = "tracing" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f47026cdc4080c07e49b37087de021820269d996f581aac150ef9e5583eefe3" +checksum = "f7d40a22fd029e33300d8d89a5cc8ffce18bb7c587662f54629e94c9de5487f3" dependencies = [ "cfg-if 1.0.0", "log", @@ -3267,7 +3259,7 @@ dependencies = [ "backtrace", "enum-as-inner", "futures 0.3.12", - "idna 0.2.0", + "idna 0.2.1", "lazy_static", "log", "rand 0.7.3", @@ -3338,9 +3330,9 @@ dependencies = [ [[package]] name = "unicode-normalization" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a13e63ab62dbe32aeee58d1c5408d35c36c392bba5d9d3142287219721afe606" +checksum = "07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef" dependencies = [ "tinyvec", ] @@ -3387,7 +3379,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5909f2b0817350449ed73e8bcd81c8c3c8d9a7a5d8acba4b27db277f1868976e" dependencies = [ "form_urlencoded", - "idna 0.2.0", + "idna 0.2.1", "matches", "percent-encoding 2.1.0", "serde 1.0.123", @@ -3415,7 +3407,7 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "841d6937c33ec6039d8071bcf72933146b5bbe378d645d8fa59bdadabfc2a249" dependencies = [ - "idna 0.2.0", + "idna 0.2.1", "lazy_static", "regex", "serde 1.0.123", diff --git a/Dockerfile b/Dockerfile index f1e044c5f7..286c3fd6c4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.49-buster as builder +FROM rust:1.50-buster as builder WORKDIR /app ADD . /app ENV PATH=$PATH:/root/.cargo/bin diff --git a/src/bin/purge_ttl.rs b/src/bin/purge_ttl.rs index a38208a52a..cedaa1517f 100644 --- a/src/bin/purge_ttl.rs +++ b/src/bin/purge_ttl.rs @@ -119,16 +119,13 @@ fn begin_transaction( Ok((req, id)) } -fn continue_transaction( - session: &Session, - transaction_id: Vec, -) -> Result> { +fn continue_transaction(session: &Session, transaction_id: Vec) -> ExecuteSqlRequest { let mut ts = TransactionSelector::new(); ts.set_id(transaction_id); let mut req = ExecuteSqlRequest::new(); req.set_session(session.get_name().to_string()); req.set_transaction(ts); - Ok(req) + req } fn commit_transaction( @@ -217,7 +214,7 @@ fn delete_incremental( delete_sql.trim_end_matches(&", ".to_string()).to_string() ); trace!("Deleting chunk with: {}", delete_sql); - let mut delete_req = continue_transaction(&session, txn.clone())?; + let mut delete_req = continue_transaction(&session, txn.clone()); delete_req.set_sql(delete_sql); client.execute_sql(&delete_req)?; info!("{}: removed {} rows", table, total); diff --git a/src/web/error.rs b/src/web/error.rs index af8cf75e4b..422a10aef1 100644 --- a/src/web/error.rs +++ b/src/web/error.rs @@ -29,7 +29,10 @@ impl HawkError { } pub fn is_reportable(&self) -> bool { - matches!(&self.kind(), HawkErrorKind::TruncatedId | HawkErrorKind::Parse(_)) + matches!( + &self.kind(), + HawkErrorKind::TruncatedId | HawkErrorKind::Parse(_) + ) } pub fn metric_label(&self) -> Option { diff --git a/src/web/extractors.rs b/src/web/extractors.rs index d6487b3cba..87b4aa6191 100644 --- a/src/web/extractors.rs +++ b/src/web/extractors.rs @@ -1616,6 +1616,7 @@ where } /// Deserialize a value as True if it exists, False otherwise +#[allow(clippy::unnecessary_wraps)] // serde::Deserialize requires Result fn deserialize_present_value<'de, D>(deserializer: D) -> Result where D: Deserializer<'de>, diff --git a/vendor/mozilla-rust-sdk/googleapis-raw/Cargo.toml b/vendor/mozilla-rust-sdk/googleapis-raw/Cargo.toml index 409eaabf13..b29ddea369 100644 --- a/vendor/mozilla-rust-sdk/googleapis-raw/Cargo.toml +++ b/vendor/mozilla-rust-sdk/googleapis-raw/Cargo.toml @@ -1,13 +1,13 @@ [package] name = "googleapis-raw" -version = "0.0.5" +version = "0.0.6" authors = ["Ferrous Systems"] edition = "2018" [dependencies] futures = "0.3.8" grpcio = "0.7.1" -protobuf = "2.20.0" +protobuf = "2.22.0" [dev-dependencies] slog = "2.7" diff --git a/vendor/mozilla-rust-sdk/googleapis-raw/src/empty.rs b/vendor/mozilla-rust-sdk/googleapis-raw/src/empty.rs index 958f3223e0..4d7406cccc 100644 --- a/vendor/mozilla-rust-sdk/googleapis-raw/src/empty.rs +++ b/vendor/mozilla-rust-sdk/googleapis-raw/src/empty.rs @@ -1,4 +1,4 @@ -// This file is generated by rust-protobuf 2.20.0. Do not edit +// This file is generated by rust-protobuf 2.22.0. Do not edit // @generated // https://github.com/rust-lang/rust-clippy/issues/702 @@ -21,7 +21,7 @@ /// Generated files are compatible only with the same version /// of protobuf runtime. -// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_20_0; +// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_22_0; #[derive(PartialEq,Clone,Default)] pub struct Empty { diff --git a/vendor/mozilla-rust-sdk/googleapis-raw/src/iam/v1/iam_policy.rs b/vendor/mozilla-rust-sdk/googleapis-raw/src/iam/v1/iam_policy.rs index c90329557d..dabd76a3bb 100644 --- a/vendor/mozilla-rust-sdk/googleapis-raw/src/iam/v1/iam_policy.rs +++ b/vendor/mozilla-rust-sdk/googleapis-raw/src/iam/v1/iam_policy.rs @@ -1,4 +1,4 @@ -// This file is generated by rust-protobuf 2.20.0. Do not edit +// This file is generated by rust-protobuf 2.22.0. Do not edit // @generated // https://github.com/rust-lang/rust-clippy/issues/702 @@ -21,7 +21,7 @@ /// Generated files are compatible only with the same version /// of protobuf runtime. -// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_20_0; +// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_22_0; #[derive(PartialEq,Clone,Default)] pub struct SetIamPolicyRequest { diff --git a/vendor/mozilla-rust-sdk/googleapis-raw/src/iam/v1/policy.rs b/vendor/mozilla-rust-sdk/googleapis-raw/src/iam/v1/policy.rs index 656366bf96..86b168fce2 100644 --- a/vendor/mozilla-rust-sdk/googleapis-raw/src/iam/v1/policy.rs +++ b/vendor/mozilla-rust-sdk/googleapis-raw/src/iam/v1/policy.rs @@ -1,4 +1,4 @@ -// This file is generated by rust-protobuf 2.20.0. Do not edit +// This file is generated by rust-protobuf 2.22.0. Do not edit // @generated // https://github.com/rust-lang/rust-clippy/issues/702 @@ -21,7 +21,7 @@ /// Generated files are compatible only with the same version /// of protobuf runtime. -// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_20_0; +// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_22_0; #[derive(PartialEq,Clone,Default)] pub struct Policy { diff --git a/vendor/mozilla-rust-sdk/googleapis-raw/src/lib.rs b/vendor/mozilla-rust-sdk/googleapis-raw/src/lib.rs index cab8a1c467..81af8fac7d 100644 --- a/vendor/mozilla-rust-sdk/googleapis-raw/src/lib.rs +++ b/vendor/mozilla-rust-sdk/googleapis-raw/src/lib.rs @@ -3,7 +3,7 @@ // This appears as a comment in each generated file. Add it once here // to save a bit of time and effort. -const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_20_0; +const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_22_0; pub mod empty; pub(crate) mod iam; diff --git a/vendor/mozilla-rust-sdk/googleapis-raw/src/longrunning/operations.rs b/vendor/mozilla-rust-sdk/googleapis-raw/src/longrunning/operations.rs index aa12409b53..cb0bb2ead5 100644 --- a/vendor/mozilla-rust-sdk/googleapis-raw/src/longrunning/operations.rs +++ b/vendor/mozilla-rust-sdk/googleapis-raw/src/longrunning/operations.rs @@ -1,4 +1,4 @@ -// This file is generated by rust-protobuf 2.20.0. Do not edit +// This file is generated by rust-protobuf 2.22.0. Do not edit // @generated // https://github.com/rust-lang/rust-clippy/issues/702 @@ -21,7 +21,7 @@ /// Generated files are compatible only with the same version /// of protobuf runtime. -// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_20_0; +// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_22_0; #[derive(PartialEq,Clone,Default)] pub struct Operation { diff --git a/vendor/mozilla-rust-sdk/googleapis-raw/src/rpc/code.rs b/vendor/mozilla-rust-sdk/googleapis-raw/src/rpc/code.rs index 52c54a279c..d983e1ed50 100644 --- a/vendor/mozilla-rust-sdk/googleapis-raw/src/rpc/code.rs +++ b/vendor/mozilla-rust-sdk/googleapis-raw/src/rpc/code.rs @@ -1,4 +1,4 @@ -// This file is generated by rust-protobuf 2.20.0. Do not edit +// This file is generated by rust-protobuf 2.22.0. Do not edit // @generated // https://github.com/rust-lang/rust-clippy/issues/702 @@ -21,7 +21,7 @@ /// Generated files are compatible only with the same version /// of protobuf runtime. -// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_20_0; +// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_22_0; #[derive(Clone,PartialEq,Eq,Debug,Hash)] pub enum Code { diff --git a/vendor/mozilla-rust-sdk/googleapis-raw/src/rpc/error_details.rs b/vendor/mozilla-rust-sdk/googleapis-raw/src/rpc/error_details.rs index 64e8633d59..aad96dee6d 100644 --- a/vendor/mozilla-rust-sdk/googleapis-raw/src/rpc/error_details.rs +++ b/vendor/mozilla-rust-sdk/googleapis-raw/src/rpc/error_details.rs @@ -1,4 +1,4 @@ -// This file is generated by rust-protobuf 2.20.0. Do not edit +// This file is generated by rust-protobuf 2.22.0. Do not edit // @generated // https://github.com/rust-lang/rust-clippy/issues/702 @@ -21,7 +21,7 @@ /// Generated files are compatible only with the same version /// of protobuf runtime. -// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_20_0; +// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_22_0; #[derive(PartialEq,Clone,Default)] pub struct RetryInfo { diff --git a/vendor/mozilla-rust-sdk/googleapis-raw/src/rpc/status.rs b/vendor/mozilla-rust-sdk/googleapis-raw/src/rpc/status.rs index 7f8742af8a..09982e3141 100644 --- a/vendor/mozilla-rust-sdk/googleapis-raw/src/rpc/status.rs +++ b/vendor/mozilla-rust-sdk/googleapis-raw/src/rpc/status.rs @@ -1,4 +1,4 @@ -// This file is generated by rust-protobuf 2.20.0. Do not edit +// This file is generated by rust-protobuf 2.22.0. Do not edit // @generated // https://github.com/rust-lang/rust-clippy/issues/702 @@ -21,7 +21,7 @@ /// Generated files are compatible only with the same version /// of protobuf runtime. -// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_20_0; +// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_22_0; #[derive(PartialEq,Clone,Default)] pub struct Status { diff --git a/vendor/mozilla-rust-sdk/googleapis-raw/src/spanner/admin/database/v1/spanner_database_admin.rs b/vendor/mozilla-rust-sdk/googleapis-raw/src/spanner/admin/database/v1/spanner_database_admin.rs index aecf1fea7b..be0549c2c9 100644 --- a/vendor/mozilla-rust-sdk/googleapis-raw/src/spanner/admin/database/v1/spanner_database_admin.rs +++ b/vendor/mozilla-rust-sdk/googleapis-raw/src/spanner/admin/database/v1/spanner_database_admin.rs @@ -1,4 +1,4 @@ -// This file is generated by rust-protobuf 2.20.0. Do not edit +// This file is generated by rust-protobuf 2.22.0. Do not edit // @generated // https://github.com/rust-lang/rust-clippy/issues/702 @@ -21,7 +21,7 @@ /// Generated files are compatible only with the same version /// of protobuf runtime. -// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_20_0; +// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_22_0; #[derive(PartialEq,Clone,Default)] pub struct Database { diff --git a/vendor/mozilla-rust-sdk/googleapis-raw/src/spanner/admin/instance/v1/spanner_instance_admin.rs b/vendor/mozilla-rust-sdk/googleapis-raw/src/spanner/admin/instance/v1/spanner_instance_admin.rs index ab582c8df6..394ffbf407 100644 --- a/vendor/mozilla-rust-sdk/googleapis-raw/src/spanner/admin/instance/v1/spanner_instance_admin.rs +++ b/vendor/mozilla-rust-sdk/googleapis-raw/src/spanner/admin/instance/v1/spanner_instance_admin.rs @@ -1,4 +1,4 @@ -// This file is generated by rust-protobuf 2.20.0. Do not edit +// This file is generated by rust-protobuf 2.22.0. Do not edit // @generated // https://github.com/rust-lang/rust-clippy/issues/702 @@ -21,7 +21,7 @@ /// Generated files are compatible only with the same version /// of protobuf runtime. -// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_20_0; +// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_22_0; #[derive(PartialEq,Clone,Default)] pub struct InstanceConfig { diff --git a/vendor/mozilla-rust-sdk/googleapis-raw/src/spanner/v1/keys.rs b/vendor/mozilla-rust-sdk/googleapis-raw/src/spanner/v1/keys.rs index 6dd98447b3..fc72332fad 100644 --- a/vendor/mozilla-rust-sdk/googleapis-raw/src/spanner/v1/keys.rs +++ b/vendor/mozilla-rust-sdk/googleapis-raw/src/spanner/v1/keys.rs @@ -1,4 +1,4 @@ -// This file is generated by rust-protobuf 2.20.0. Do not edit +// This file is generated by rust-protobuf 2.22.0. Do not edit // @generated // https://github.com/rust-lang/rust-clippy/issues/702 @@ -21,7 +21,7 @@ /// Generated files are compatible only with the same version /// of protobuf runtime. -// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_20_0; +// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_22_0; #[derive(PartialEq,Clone,Default)] pub struct KeyRange { diff --git a/vendor/mozilla-rust-sdk/googleapis-raw/src/spanner/v1/mutation.rs b/vendor/mozilla-rust-sdk/googleapis-raw/src/spanner/v1/mutation.rs index 0bda6a685a..f7a71df578 100644 --- a/vendor/mozilla-rust-sdk/googleapis-raw/src/spanner/v1/mutation.rs +++ b/vendor/mozilla-rust-sdk/googleapis-raw/src/spanner/v1/mutation.rs @@ -1,4 +1,4 @@ -// This file is generated by rust-protobuf 2.20.0. Do not edit +// This file is generated by rust-protobuf 2.22.0. Do not edit // @generated // https://github.com/rust-lang/rust-clippy/issues/702 @@ -21,7 +21,7 @@ /// Generated files are compatible only with the same version /// of protobuf runtime. -// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_20_0; +// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_22_0; #[derive(PartialEq,Clone,Default)] pub struct Mutation { diff --git a/vendor/mozilla-rust-sdk/googleapis-raw/src/spanner/v1/query_plan.rs b/vendor/mozilla-rust-sdk/googleapis-raw/src/spanner/v1/query_plan.rs index e1ecf5e3b6..e548f7c4b7 100644 --- a/vendor/mozilla-rust-sdk/googleapis-raw/src/spanner/v1/query_plan.rs +++ b/vendor/mozilla-rust-sdk/googleapis-raw/src/spanner/v1/query_plan.rs @@ -1,4 +1,4 @@ -// This file is generated by rust-protobuf 2.20.0. Do not edit +// This file is generated by rust-protobuf 2.22.0. Do not edit // @generated // https://github.com/rust-lang/rust-clippy/issues/702 @@ -21,7 +21,7 @@ /// Generated files are compatible only with the same version /// of protobuf runtime. -// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_20_0; +// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_22_0; #[derive(PartialEq,Clone,Default)] pub struct PlanNode { diff --git a/vendor/mozilla-rust-sdk/googleapis-raw/src/spanner/v1/result_set.rs b/vendor/mozilla-rust-sdk/googleapis-raw/src/spanner/v1/result_set.rs index 2ec58e29d2..d36dbd2ff5 100644 --- a/vendor/mozilla-rust-sdk/googleapis-raw/src/spanner/v1/result_set.rs +++ b/vendor/mozilla-rust-sdk/googleapis-raw/src/spanner/v1/result_set.rs @@ -1,4 +1,4 @@ -// This file is generated by rust-protobuf 2.20.0. Do not edit +// This file is generated by rust-protobuf 2.22.0. Do not edit // @generated // https://github.com/rust-lang/rust-clippy/issues/702 @@ -21,7 +21,7 @@ /// Generated files are compatible only with the same version /// of protobuf runtime. -// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_20_0; +// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_22_0; #[derive(PartialEq,Clone,Default)] pub struct ResultSet { diff --git a/vendor/mozilla-rust-sdk/googleapis-raw/src/spanner/v1/spanner.rs b/vendor/mozilla-rust-sdk/googleapis-raw/src/spanner/v1/spanner.rs index a78c5051a2..f3435f3d7b 100644 --- a/vendor/mozilla-rust-sdk/googleapis-raw/src/spanner/v1/spanner.rs +++ b/vendor/mozilla-rust-sdk/googleapis-raw/src/spanner/v1/spanner.rs @@ -1,4 +1,4 @@ -// This file is generated by rust-protobuf 2.20.0. Do not edit +// This file is generated by rust-protobuf 2.22.0. Do not edit // @generated // https://github.com/rust-lang/rust-clippy/issues/702 @@ -21,7 +21,7 @@ /// Generated files are compatible only with the same version /// of protobuf runtime. -// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_20_0; +// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_22_0; #[derive(PartialEq,Clone,Default)] pub struct CreateSessionRequest { diff --git a/vendor/mozilla-rust-sdk/googleapis-raw/src/spanner/v1/transaction.rs b/vendor/mozilla-rust-sdk/googleapis-raw/src/spanner/v1/transaction.rs index 6004982c2a..6fd4dd2ba2 100644 --- a/vendor/mozilla-rust-sdk/googleapis-raw/src/spanner/v1/transaction.rs +++ b/vendor/mozilla-rust-sdk/googleapis-raw/src/spanner/v1/transaction.rs @@ -1,4 +1,4 @@ -// This file is generated by rust-protobuf 2.20.0. Do not edit +// This file is generated by rust-protobuf 2.22.0. Do not edit // @generated // https://github.com/rust-lang/rust-clippy/issues/702 @@ -21,7 +21,7 @@ /// Generated files are compatible only with the same version /// of protobuf runtime. -// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_20_0; +// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_22_0; #[derive(PartialEq,Clone,Default)] pub struct TransactionOptions { diff --git a/vendor/mozilla-rust-sdk/googleapis-raw/src/spanner/v1/type_pb.rs b/vendor/mozilla-rust-sdk/googleapis-raw/src/spanner/v1/type_pb.rs index fdfa2be228..4fcd36acb7 100644 --- a/vendor/mozilla-rust-sdk/googleapis-raw/src/spanner/v1/type_pb.rs +++ b/vendor/mozilla-rust-sdk/googleapis-raw/src/spanner/v1/type_pb.rs @@ -1,4 +1,4 @@ -// This file is generated by rust-protobuf 2.20.0. Do not edit +// This file is generated by rust-protobuf 2.22.0. Do not edit // @generated // https://github.com/rust-lang/rust-clippy/issues/702 @@ -21,7 +21,7 @@ /// Generated files are compatible only with the same version /// of protobuf runtime. -// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_20_0; +// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_22_0; #[derive(PartialEq,Clone,Default)] pub struct Type { diff --git a/vendor/mozilla-rust-sdk/googleapis/Cargo.toml b/vendor/mozilla-rust-sdk/googleapis/Cargo.toml index 8910fa3868..3cf83805ec 100644 --- a/vendor/mozilla-rust-sdk/googleapis/Cargo.toml +++ b/vendor/mozilla-rust-sdk/googleapis/Cargo.toml @@ -9,5 +9,5 @@ futures = "0.3.8" grpcio = "0.7.1" [dependencies.googleapis-raw] -version = "0.0.5" +version = "0.0.6" path = "../googleapis-raw"