From e73b5c4f8d2556dd4b40f8f38505facc81695119 Mon Sep 17 00:00:00 2001 From: Erich Gubler Date: Tue, 11 Jun 2024 15:57:34 -0400 Subject: [PATCH] build: drop `format` for `lazy_format` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This unifies `syn` duplicates into 2.x. 🙌🏻 --- Cargo.lock | 70 +++++++++++++++-------------------------------------- Cargo.toml | 2 +- deny.toml | 1 + src/main.rs | 2 +- 4 files changed, 22 insertions(+), 53 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b1f47c3..6c4a220 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -182,7 +182,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] @@ -243,7 +243,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] @@ -336,33 +336,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "format" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "901e1b63ac63f86d9fb836b1ae8b43e5a9f2338975e9de24f36a1af4acf23ac8" -dependencies = [ - "format-core", - "format-macro", -] - -[[package]] -name = "format-core" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e66b70d6700c47044b73e43dd0649e0d6bfef18f87919c23785cdbd1aaa9d3f5" - -[[package]] -name = "format-macro" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f9faac4e57f217563dd1fd58628a0c526aa37a681ffac76ca80d64907370a4c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "futures" version = "0.3.30" @@ -663,7 +636,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] @@ -749,6 +722,12 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "lazy_format" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e479e99b287d578ed5f6cd4c92cdf48db219088adb9c5b14f7c155b71dfba792" + [[package]] name = "lazy_static" version = "1.4.0" @@ -892,7 +871,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] @@ -1153,7 +1132,7 @@ checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] @@ -1225,17 +1204,6 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - [[package]] name = "syn" version = "2.0.66" @@ -1261,7 +1229,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] @@ -1343,7 +1311,7 @@ checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] @@ -1412,9 +1380,9 @@ dependencies = [ "bytes", "clap", "env_logger", - "format", "futures", "indicatif", + "lazy_format", "log", "regex", "reqwest", @@ -1513,7 +1481,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.66", + "syn", "wasm-bindgen-shared", ] @@ -1547,7 +1515,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -1758,7 +1726,7 @@ checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", "synstructure", ] @@ -1779,7 +1747,7 @@ checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", "synstructure", ] @@ -1802,5 +1770,5 @@ checksum = "97cf56601ee5052b4417d90c8755c6683473c926039908196cf35d99f893ebe7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] diff --git a/Cargo.toml b/Cargo.toml index cf9eb8a..cd3aa5d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,9 +13,9 @@ rust-version = "1.70.0" bytes = "1" clap = { version = "4.4.2", features = ["derive"] } env_logger = "0.10.0" -format = "0.2.4" futures = { version = "0.3.28", default-features = false, features = ["std"] } indicatif = { version = "0.17.6", features = ["futures"] } +lazy_format = "2.0.3" log = "0.4.20" regex = "1.9.4" reqwest = { version = "0.11.20", features = ["gzip", "json"] } diff --git a/deny.toml b/deny.toml index d4411a3..514b9d9 100644 --- a/deny.toml +++ b/deny.toml @@ -5,5 +5,6 @@ allow = [ "Apache-2.0", "BSD-3-Clause", "MIT", + "Unicode-3.0", "Unicode-DFS-2016", ] diff --git a/src/main.rs b/src/main.rs index b145992..2549225 100644 --- a/src/main.rs +++ b/src/main.rs @@ -10,9 +10,9 @@ use std::{ use bytes::Bytes; use clap::Parser; -use format::lazy_format; use futures::stream::StreamExt; use indicatif::ProgressBar; +use lazy_format::lazy_format; use regex::Regex; use reqwest::{Client, StatusCode, Url}; use serde::Deserialize;