From 78cc93fb6c93ca3568ac4e18d493d40d1f971e33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kornel=20Lesin=CC=81ski?= Date: Fri, 29 May 2020 12:56:16 +0100 Subject: [PATCH] Remove ifmt https://github.com/rust-lang/rust/issues/72622 also removes unused deps --- Cargo.lock | 38 ------------------------------------ crev-lib/Cargo.toml | 2 -- crev-lib/src/tests/issues.rs | 5 ++--- crev-wot/Cargo.toml | 13 ------------ 4 files changed, 2 insertions(+), 56 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bb85d4d1..3f02bf6f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -607,7 +607,6 @@ dependencies = [ "directories 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "git2 0.13.5 (registry+https://github.com/rust-lang/crates.io-index)", - "ifmt 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "insideout 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "miscreant 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -619,7 +618,6 @@ dependencies = [ "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde_cbor 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", - "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)", "walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -655,25 +653,12 @@ dependencies = [ "chrono 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", "crev-common 0.17.0", "crev-data 0.17.0", - "crev-recursive-digest 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "default 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "directories 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "git2 0.13.5 (registry+https://github.com/rust-lang/crates.io-index)", - "ifmt 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "insideout 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "miscreant 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 1.13.0 (registry+https://github.com/rust-lang/crates.io-index)", - "resiter 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rust-argon2 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_cbor 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", - "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)", - "walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1486,27 +1471,6 @@ dependencies = [ "unicode-normalization 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "ifmt" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "ifmt-impl 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "ifmt-impl" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "ignore" version = "0.4.12" @@ -3573,8 +3537,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum ident_case 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" "checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" "checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" -"checksum ifmt 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dda89846430e4fa5ca690abccd921be478d8e08a0e94c3954a084e66fa64d0a2" -"checksum ifmt-impl 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a3a96905e6a8b78f16b8f402c5e9d2de74dcb08958007b661b572ded6ef62c3b" "checksum ignore 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "7c81b30e645a7b49ad57340fd900717e6b3404bfe8322035ef189d434c412aa1" "checksum im-rc 14.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5df50c85553397f6320fad21751d7ba9007de512c7971cb8746238f1a155d3c9" "checksum indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712d7b3ea5827fcb9d4fda14bf4da5f136f0db2ae9c8f4bd4e2d1c6fde4e6db2" diff --git a/crev-lib/Cargo.toml b/crev-lib/Cargo.toml index 2e9d6f9f..f970260a 100644 --- a/crev-lib/Cargo.toml +++ b/crev-lib/Cargo.toml @@ -23,7 +23,6 @@ default = "0.1.2" directories = "2.0.2" fnv = "1.0.6" git2 = "0.13" -ifmt = "0.3.0" insideout = "0.2.0" log = "0.4.8" num_cpus = "1.12.0" @@ -33,7 +32,6 @@ semver = "0.9.0" serde = "1.0.106" serde_cbor = "0.11.1" serde_yaml = "0.8.11" -tempdir = "0.3.7" walkdir = "2.3.1" thiserror = "1.0.17" rayon = "1.3.0" diff --git a/crev-lib/src/tests/issues.rs b/crev-lib/src/tests/issues.rs index 16ad09c9..3532d1e3 100644 --- a/crev-lib/src/tests/issues.rs +++ b/crev-lib/src/tests/issues.rs @@ -6,7 +6,6 @@ use crev_data::{ TrustLevel, UnlockedId, }; use crev_wot::FetchSource; -use ifmt::iformat; use semver::Version; const SOURCE: &str = "SOURCE_ID"; @@ -17,7 +16,7 @@ fn build_advisory(id: impl Into, range: VersionRange) -> Advisory { Advisory::builder() .range(range) .ids(vec![id.clone()]) - .comment(iformat!("comment for {id}")) + .comment(format!("comment for {}", id)) .build() } @@ -25,7 +24,7 @@ fn build_issue(id: impl Into) -> Issue { let id = id.into(); Issue::builder() .id(id.clone()) - .comment(iformat!("issue {id}")) + .comment(format!("issue {}", id)) .build() } diff --git a/crev-wot/Cargo.toml b/crev-wot/Cargo.toml index 3fde49ba..b98ade7f 100644 --- a/crev-wot/Cargo.toml +++ b/crev-wot/Cargo.toml @@ -13,25 +13,12 @@ readme = "../README.md" [dependencies] crev-common = { path = "../crev-common", version = "0.17.0" } -miscreant = { version = "0.4", features = ["soft-aes"] } crev-data = { path = "../crev-data", version = "0.17.0" } blake2 = "0.8.1" chrono = "0.4.11" -crev-recursive-digest = "0.4.0" default = "0.1.2" -directories = "2.0.2" -fnv = "1.0.6" -git2 = "0.13" -ifmt = "0.3.0" -insideout = "0.2.0" log = "0.4.8" -num_cpus = "1.12.0" -resiter = "0.4.0" -rust-argon2 = "0.8.2" semver = "0.9.0" serde = "1.0.106" -serde_cbor = "0.11.1" serde_yaml = "0.8.11" -tempdir = "0.3.7" -walkdir = "2.3.1" thiserror = "1.0.17"