From b618ab93a5a7df1590bcdcef910d0c6f7cb23043 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Mon, 29 May 2023 17:54:00 +1000 Subject: [PATCH] Update hakari and licenses --- Cargo.lock | 14 +--- cargo/licenses.json | 141 +++++++++++++++++++++++++++++--- cargo/update-licenses.sh | 3 +- tools/workspace-hack/Cargo.toml | 11 ++- 4 files changed, 138 insertions(+), 31 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cd0241fc1..2bc1a892b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3121,7 +3121,6 @@ dependencies = [ "rand_chacha 0.2.2", "rand_core 0.5.1", "rand_hc", - "rand_pcg", ] [[package]] @@ -3182,15 +3181,6 @@ dependencies = [ "rand_core 0.5.1", ] -[[package]] -name = "rand_pcg" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" -dependencies = [ - "rand_core 0.5.1", -] - [[package]] name = "rayon" version = "1.7.0" @@ -4995,12 +4985,13 @@ version = "0.1.0" dependencies = [ "bytes", "cc", + "clap 4.2.1", + "clap_builder", "crossbeam-utils", "either", "flate2", "futures-channel", "futures-io", - "futures-task", "futures-util", "getrandom 0.2.8", "hashbrown", @@ -5012,7 +5003,6 @@ dependencies = [ "num-traits", "phf_shared 0.11.1", "prost", - "rand 0.7.3", "rand 0.8.5", "rand_core 0.6.4", "regex", diff --git a/cargo/licenses.json b/cargo/licenses.json index c2f0e4ec4..ebe9fe719 100644 --- a/cargo/licenses.json +++ b/cargo/licenses.json @@ -80,9 +80,45 @@ "license_file": null, "description": "Anki's Rust library i18n code" }, + { + "name": "anstream", + "version": "0.2.6", + "authors": null, + "repository": "https://github.com/rust-cli/anstyle.git", + "license": "Apache-2.0 OR MIT", + "license_file": null, + "description": "A simple cross platform library for writing colored text to a terminal." + }, + { + "name": "anstyle", + "version": "0.3.5", + "authors": null, + "repository": "https://github.com/rust-cli/anstyle.git", + "license": "Apache-2.0 OR MIT", + "license_file": null, + "description": "ANSI text styling" + }, + { + "name": "anstyle-parse", + "version": "0.1.1", + "authors": null, + "repository": "https://github.com/rust-cli/anstyle.git", + "license": "Apache-2.0 OR MIT", + "license_file": null, + "description": "Parse ANSI Style Escapes" + }, + { + "name": "anstyle-wincon", + "version": "0.2.0", + "authors": null, + "repository": "https://github.com/rust-cli/anstyle.git", + "license": "Apache-2.0 OR MIT", + "license_file": null, + "description": "Styling legacy Windows terminals" + }, { "name": "anyhow", - "version": "1.0.70", + "version": "1.0.71", "authors": "David Tolnay ", "repository": "https://github.com/dtolnay/anyhow", "license": "Apache-2.0 OR MIT", @@ -368,6 +404,42 @@ "license_file": null, "description": "Traits for describing block ciphers and stream ciphers" }, + { + "name": "clap", + "version": "4.2.1", + "authors": null, + "repository": "https://github.com/clap-rs/clap", + "license": "Apache-2.0 OR MIT", + "license_file": null, + "description": "A simple to use, efficient, and full-featured Command Line Argument Parser" + }, + { + "name": "clap_builder", + "version": "4.2.1", + "authors": null, + "repository": "https://github.com/clap-rs/clap", + "license": "Apache-2.0 OR MIT", + "license_file": null, + "description": "A simple to use, efficient, and full-featured Command Line Argument Parser" + }, + { + "name": "clap_derive", + "version": "4.2.0", + "authors": null, + "repository": "https://github.com/clap-rs/clap/tree/master/clap_derive", + "license": "Apache-2.0 OR MIT", + "license_file": null, + "description": "Parse command line argument by defining a struct, derive crate." + }, + { + "name": "clap_lex", + "version": "0.4.1", + "authors": null, + "repository": "https://github.com/clap-rs/clap/tree/master/clap_lex", + "license": "Apache-2.0 OR MIT", + "license_file": null, + "description": "Minimal, flexible command line parser" + }, { "name": "coarsetime", "version": "0.1.23", @@ -386,6 +458,24 @@ "license_file": null, "description": "Beautiful diagnostic reporting for text-based programming languages" }, + { + "name": "concolor-override", + "version": "1.0.0", + "authors": null, + "repository": "https://github.com/rust-cli/concolor", + "license": "Apache-2.0 OR MIT", + "license_file": null, + "description": "Global override of color control" + }, + { + "name": "concolor-query", + "version": "0.3.3", + "authors": null, + "repository": "https://github.com/rust-cli/concolor", + "license": "Apache-2.0 OR MIT", + "license_file": null, + "description": "Look up colored console capabilities" + }, { "name": "concurrent-queue", "version": "2.1.0", @@ -1692,13 +1782,13 @@ "description": "Percent encoding and decoding" }, { - "name": "percent-encoding", + "name": "percent-encoding-iri", "version": "2.2.0", "authors": "The rust-url developers", "repository": "https://github.com/servo/rust-url/", "license": "Apache-2.0 OR MIT", "license_file": null, - "description": "Percent encoding and decoding" + "description": "Percent encoding and decoding, preserving non-Latin characters." }, { "name": "petgraph", @@ -1997,15 +2087,6 @@ "license_file": null, "description": "HC128 random number generator" }, - { - "name": "rand_pcg", - "version": "0.2.1", - "authors": "The Rand Project Developers", - "repository": "https://github.com/rust-random/rand", - "license": "Apache-2.0 OR MIT", - "license_file": null, - "description": "Selected PCG random number generators" - }, { "name": "redox_syscall", "version": "0.2.16", @@ -2447,6 +2528,15 @@ "license_file": null, "description": "A codegen library for string-cache, developed as part of the Servo project." }, + { + "name": "strsim", + "version": "0.10.0", + "authors": "Danny Guo ", + "repository": "https://github.com/dguo/strsim-rs", + "license": "MIT", + "license_file": null, + "description": "Implementations of string similarity metrics. Includes Hamming, Levenshtein, OSA, Damerau-Levenshtein, Jaro, Jaro-Winkler, and Sørensen-Dice." + }, { "name": "strum", "version": "0.24.1", @@ -2528,6 +2618,15 @@ "license_file": null, "description": "A simple cross platform library for writing colored text to a terminal." }, + { + "name": "terminal_size", + "version": "0.2.6", + "authors": "Andrew Chin ", + "repository": "https://github.com/eminence/terminal-size", + "license": "Apache-2.0 OR MIT", + "license_file": null, + "description": "Gets the size of your Linux or Windows terminal" + }, { "name": "thiserror", "version": "1.0.40", @@ -2960,6 +3059,15 @@ "license_file": null, "description": "Incremental, zero-copy UTF-8 decoding with error handling" }, + { + "name": "utf8parse", + "version": "0.2.1", + "authors": "Joe Wilm |Christian Duerr ", + "repository": "https://github.com/alacritty/vte", + "license": "Apache-2.0 OR MIT", + "license_file": null, + "description": "Table-driven UTF-8 parser" + }, { "name": "utime", "version": "0.3.1", @@ -3194,6 +3302,15 @@ "license_file": null, "description": "Rust for Windows" }, + { + "name": "windows-sys", + "version": "0.48.0", + "authors": "Microsoft", + "repository": "https://github.com/microsoft/windows-rs", + "license": "Apache-2.0 OR MIT", + "license_file": null, + "description": "Rust for Windows" + }, { "name": "windows-targets", "version": "0.42.2", diff --git a/cargo/update-licenses.sh b/cargo/update-licenses.sh index 63a6120aa..230782746 100755 --- a/cargo/update-licenses.sh +++ b/cargo/update-licenses.sh @@ -4,4 +4,5 @@ cargo install cargo-license@0.5.1 cargo-license --features rustls --features native-tls --json --manifest-path ../rslib/Cargo.toml >licenses.json cargo install cargo-deny@0.13.5 -(cd .. && cargo deny check -A duplicate) +(cd .. && cargo deny check -A duplicate && cargo hakari generate) + diff --git a/tools/workspace-hack/Cargo.toml b/tools/workspace-hack/Cargo.toml index e20fe00c9..6551cf0e6 100644 --- a/tools/workspace-hack/Cargo.toml +++ b/tools/workspace-hack/Cargo.toml @@ -15,13 +15,14 @@ description = "workspace-hack package, managed by hakari" ### BEGIN HAKARI SECTION [dependencies] bytes = { version = "1" } +clap = { version = "4", features = ["cargo", "derive", "wrap_help"] } +clap_builder = { version = "4", default-features = false, features = ["cargo", "color", "std", "suggestions", "usage", "wrap_help"] } crossbeam-utils = { version = "0.8" } either = { version = "1" } flate2 = { version = "1" } futures-channel = { version = "0.3", features = ["sink"] } futures-io = { version = "0.3" } -futures-task = { version = "0.3", default-features = false, features = ["std"] } -futures-util = { version = "0.3", default-features = false, features = ["async-await-macro", "channel", "io", "sink"] } +futures-util = { version = "0.3", features = ["channel", "io", "sink"] } getrandom = { version = "0.2", default-features = false, features = ["std"] } hashbrown = { version = "0.12", features = ["raw"] } hmac = { version = "0.12", default-features = false, features = ["reset"] } @@ -32,8 +33,7 @@ log = { version = "0.4", default-features = false, features = ["std"] } num-traits = { version = "0.2" } phf_shared = { version = "0.11", default-features = false, features = ["std"] } prost = { version = "0.11" } -rand-c38e5c1d305a1b54 = { package = "rand", version = "0.8", features = ["small_rng"] } -rand-ca01ad9e24f5d932 = { package = "rand", version = "0.7", features = ["small_rng"] } +rand = { version = "0.8", features = ["small_rng"] } rand_core = { version = "0.6", default-features = false, features = ["std"] } regex = { version = "1" } regex-syntax = { version = "0.6" } @@ -66,8 +66,7 @@ itertools = { version = "0.10" } log = { version = "0.4", default-features = false, features = ["std"] } phf_shared = { version = "0.11", default-features = false, features = ["std"] } prost = { version = "0.11" } -rand-c38e5c1d305a1b54 = { package = "rand", version = "0.8", features = ["small_rng"] } -rand-ca01ad9e24f5d932 = { package = "rand", version = "0.7", features = ["small_rng"] } +rand = { version = "0.8", features = ["small_rng"] } rand_core = { version = "0.6", default-features = false, features = ["std"] } regex = { version = "1" } regex-syntax = { version = "0.6" }