From d5e30ba727edd89ea64f8915d3f5d16749f2d2c1 Mon Sep 17 00:00:00 2001 From: Valentin Brandl Date: Wed, 28 Sep 2022 10:43:49 +0200 Subject: [PATCH] Replace deprecated `badge` crate with `badgers` --- Cargo.lock | 56 ++++++++++++++++++++++++------------------------------ Cargo.toml | 2 +- src/lib.rs | 2 +- 3 files changed, 27 insertions(+), 33 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 019d9c4..40042c1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,6 +2,16 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "ab_glyph" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04a9283dace1c41c265496614998d5b9c4a97b3eb770e804f007c5144bf03f2b" +dependencies = [ + "ab_glyph_rasterizer", + "owned_ttf_parser", +] + [[package]] name = "ab_glyph_rasterizer" version = "0.1.5" @@ -36,7 +46,7 @@ dependencies = [ "actix-service", "actix-utils", "ahash", - "base64 0.13.0", + "base64", "bitflags", "brotli", "bytes", @@ -292,7 +302,7 @@ dependencies = [ "actix-tls", "actix-utils", "ahash", - "base64 0.13.0", + "base64", "bytes", "cfg-if", "cookie", @@ -314,22 +324,16 @@ dependencies = [ ] [[package]] -name = "badge" -version = "0.3.0" +name = "badgers" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0228ae65b89e72921e86c19c3574da63bda0628e9d7da5e164f569bbf4e477d" +checksum = "26315f90cbcd241425a27dcc1140dbc85505e87ddc90f324067df6a158572fb3" dependencies = [ - "base64 0.12.3", + "ab_glyph", + "base64", "once_cell", - "rusttype", ] -[[package]] -name = "base64" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" - [[package]] name = "base64" version = "0.13.0" @@ -897,7 +901,7 @@ dependencies = [ "actix-rt", "actix-web", "awc", - "badge", + "badgers", "bytes", "config", "dotenvy", @@ -1363,9 +1367,9 @@ dependencies = [ [[package]] name = "owned_ttf_parser" -version = "0.6.0" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f923fb806c46266c02ab4a5b239735c144bdeda724a50ed058e5226f594cde3" +checksum = "05e6affeb1632d6ff6a23d2cd40ffed138e82f1532571a26f527c8a284bb2fbb" dependencies = [ "ttf-parser", ] @@ -1631,7 +1635,7 @@ version = "0.11.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "431949c384f4e2ae07605ccaa56d1d9d2ecdb5cadd4f9577ccfab29f2e5149fc" dependencies = [ - "base64 0.13.0", + "base64", "bytes", "encoding_rs", "futures-core", @@ -1668,7 +1672,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88073939a61e5b7680558e6be56b419e208420c2adb92be54921fa6b72283f1a" dependencies = [ - "base64 0.13.0", + "base64", "bitflags", "serde", ] @@ -1679,7 +1683,7 @@ version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85517cd381cf0c34694881d8aaf173107c6af7670e66cec18d7a1a8bfce3b758" dependencies = [ - "base64 0.13.0", + "base64", "bytecount", "itertools", "md5", @@ -1706,16 +1710,6 @@ dependencies = [ "semver", ] -[[package]] -name = "rusttype" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc7c727aded0be18c5b80c1640eae0ac8e396abf6fa8477d96cb37d18ee5ec59" -dependencies = [ - "ab_glyph_rasterizer", - "owned_ttf_parser", -] - [[package]] name = "rustversion" version = "1.0.6" @@ -2133,9 +2127,9 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "ttf-parser" -version = "0.6.2" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e5d7cd7ab3e47dda6e56542f4bbf3824c15234958c6e1bd6aaa347e93499fdc" +checksum = "7b3e06c9b9d80ed6b745c7159c40b311ad2916abb34a49e9be2653b90db0d8dd" [[package]] name = "typenum" diff --git a/Cargo.toml b/Cargo.toml index 408db01..c58d756 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ name = "hoc" [dependencies] actix-rt = "2.7.0" actix-web = "4.2.1" -badge = "0.3.0" +badgers = "1.0.0" bytes = "1.2.1" config = { version = "0.13.2", features = ["toml"] } dotenvy = "0.15.5" diff --git a/src/lib.rs b/src/lib.rs index 80c273d..47c8409 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -32,7 +32,7 @@ use actix_web::{ middleware::{self, TrailingSlash}, web, App, HttpResponse, HttpServer, Responder, }; -use badge::{Badge, BadgeOptions}; +use badgers::{Badge, BadgeOptions}; use git2::{BranchType, Repository}; use number_prefix::NumberPrefix; use std::{