From 40b4ed19ddf7d2c5fb94f0e16c9e91b607cd3d02 Mon Sep 17 00:00:00 2001 From: SplittyDev Date: Sun, 2 Jun 2024 04:08:18 +0700 Subject: [PATCH 1/2] Update icons --- badgers/src/icons/cssgg_icons.rs | 6 +++--- badgers/src/icons/feather_icons.rs | 5 +++-- badgers/vendor/cssgg | 2 +- badgers/vendor/feather | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/badgers/src/icons/cssgg_icons.rs b/badgers/src/icons/cssgg_icons.rs index e04dd4a..7b72e6a 100644 --- a/badgers/src/icons/cssgg_icons.rs +++ b/badgers/src/icons/cssgg_icons.rs @@ -148,7 +148,6 @@ pub const CSSGG_ICONS: IconSet = IconSet { "cssgg-menu-motion" => r##""##, "cssgg-menu-left-alt" => r##""##, "cssgg-chevron-left-o" => r##""##, - "cssgg-zeit" => r##""##, "cssgg-export" => r##""##, "cssgg-smart-home-cooker" => r##""##, "cssgg-brackets" => r##""##, @@ -354,7 +353,7 @@ pub const CSSGG_ICONS: IconSet = IconSet { "cssgg-arrow-bottom-left-r" => r##""##, "cssgg-external" => r##""##, "cssgg-format-right" => r##""##, - "cssgg-format-bold" => r##""##, + "cssgg-format-bold" => r##""##, "cssgg-arrows-merge-alt-h" => r##""##, "cssgg-user-remove" => r##""##, "cssgg-record" => r##""##, @@ -479,7 +478,7 @@ pub const CSSGG_ICONS: IconSet = IconSet { "cssgg-camera" => r##""##, "cssgg-printer" => r##""##, "cssgg-trees" => r##""##, - "cssgg-border-top" => r##""##, + "cssgg-border-top" => r##""##, "cssgg-format-slash" => r##""##, "cssgg-redo" => r##""##, "cssgg-arrow-bottom-left-o" => r##""##, @@ -506,6 +505,7 @@ pub const CSSGG_ICONS: IconSet = IconSet { "cssgg-corner-left-down" => r##""##, "cssgg-screen-mirror" => r##""##, "cssgg-edit-flip-v" => r##""##, + "cssgg-vercel" => r##""##, "cssgg-path-front" => r##""##, "cssgg-hashtag" => r##""##, "cssgg-carousel" => r##""##, diff --git a/badgers/src/icons/feather_icons.rs b/badgers/src/icons/feather_icons.rs index 1d6fa76..f02f916 100644 --- a/badgers/src/icons/feather_icons.rs +++ b/badgers/src/icons/feather_icons.rs @@ -5,7 +5,7 @@ //! ```plain,no_run //! The MIT License (MIT) //! -//! Copyright (c) 2013-2017 Cole Bemis +//! Copyright (c) 2013-2023 Cole Bemis //! //! Permission is hereby granted, free of charge, to any person obtaining a copy //! of this software and associated documentation files (the "Software"), to deal @@ -24,6 +24,7 @@ //! LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, //! OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE //! SOFTWARE. +//! //! ``` use phf::phf_map; @@ -241,7 +242,7 @@ pub const FEATHER_ICONS: IconSet = IconSet { "feather-alert-circle" => r##""##, "feather-chevrons-up" => r##""##, "feather-upload-cloud" => r##""##, - "feather-twitch" => r##""##, + "feather-twitch" => r##""##, "feather-youtube" => r##""##, "feather-unlock" => r##""##, "feather-compass" => r##""##, diff --git a/badgers/vendor/cssgg b/badgers/vendor/cssgg index 8a69135..deea4fa 160000 --- a/badgers/vendor/cssgg +++ b/badgers/vendor/cssgg @@ -1 +1 @@ -Subproject commit 8a6913598e4e2b10aaf69b9cb7e10e7213828965 +Subproject commit deea4fa5f39a2980d7586aed18d65cdba6fd85e3 diff --git a/badgers/vendor/feather b/badgers/vendor/feather index db2364f..1b00239 160000 --- a/badgers/vendor/feather +++ b/badgers/vendor/feather @@ -1 +1 @@ -Subproject commit db2364f996e407cb933a37b6cafc96659debf771 +Subproject commit 1b002399e8758fb2bccea4d07312dc9e0f43dcb8 From 16325db9b9787f4e30c70b9e075916261cdac4f2 Mon Sep 17 00:00:00 2001 From: SplittyDev Date: Sun, 2 Jun 2024 04:09:57 +0700 Subject: [PATCH 2/2] Update badgers, worker, and cli --- Cargo.lock | 115 +++++++++++++++++++++++--------------- badgers-cli/Cargo.toml | 4 +- badgers-worker/Cargo.toml | 2 +- badgers/Cargo.toml | 2 +- 4 files changed, 73 insertions(+), 50 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7cefe75..7e73e37 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -100,9 +100,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.71" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +checksum = "17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11" dependencies = [ "addr2line", "cc", @@ -115,22 +115,22 @@ dependencies = [ [[package]] name = "badgers-cli" -version = "0.2.1" +version = "0.2.2" dependencies = [ "clap", - "spacebadgers", + "spacebadgers 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "badgers-worker" -version = "1.4.1" +version = "1.4.2" dependencies = [ "base64", "cfg-if", "console_error_panic_hook", "serde", "serde_json", - "spacebadgers", + "spacebadgers 1.3.4", "urlencoding", "worker", ] @@ -161,9 +161,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.97" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4" +checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" [[package]] name = "cfg-if" @@ -334,9 +334,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crunchy" @@ -346,9 +346,9 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] name = "either" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" [[package]] name = "encode_unicode" @@ -434,9 +434,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "half" @@ -509,9 +509,9 @@ checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" [[package]] name = "insta" -version = "1.38.0" +version = "1.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eab73f58e59ca6526037208f0e98851159ec1633cf17b6cd2e1f2c3fd5d53cc" +checksum = "810ae6042d48e2c9e9215043563a58a80b877bc863228a74cf10c49d4620a6f5" dependencies = [ "console", "lazy_static", @@ -568,9 +568,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.154" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "linked-hash-map" @@ -598,9 +598,9 @@ checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" dependencies = [ "adler", ] @@ -616,9 +616,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.2" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e" dependencies = [ "memchr", ] @@ -724,9 +724,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "plotters" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" +checksum = "a15b6eccb8484002195a3e44fe65a4ce8e93a625797a063735536fd59cb01cf3" dependencies = [ "num-traits", "plotters-backend", @@ -737,24 +737,24 @@ dependencies = [ [[package]] name = "plotters-backend" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" +checksum = "414cec62c6634ae900ea1c56128dfe87cf63e7caece0852ec76aba307cebadb7" [[package]] name = "plotters-svg" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" +checksum = "81b30686a7d9c3e010b84284bdd26a29f2138574f52f5eb6f794fc0ad924e705" dependencies = [ "plotters-backend", ] [[package]] name = "proc-macro2" -version = "1.0.82" +version = "1.0.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" +checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" dependencies = [ "unicode-ident", ] @@ -855,9 +855,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.201" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "780f1cebed1629e4753a1a38a3c72d30b97ec044f0aef68cb26650a3c5cf363c" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] @@ -886,9 +886,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.201" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", @@ -941,7 +941,7 @@ dependencies = [ [[package]] name = "spacebadgers" -version = "1.3.3" +version = "1.3.4" dependencies = [ "criterion", "htmlize", @@ -949,10 +949,33 @@ dependencies = [ "insta", "phf", "serde", - "spacebadgers-utils", + "spacebadgers-utils 1.0.1", + "walkdir", +] + +[[package]] +name = "spacebadgers" +version = "1.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebd2159f28166b53d0c745e2a952639e9025b721fd5a2d0765ff3d2d1cbe450a" +dependencies = [ + "htmlize", + "indoc", + "phf", + "spacebadgers-utils 1.0.0", "walkdir", ] +[[package]] +name = "spacebadgers-utils" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f382c5ac20abbd1d5caf1e4888da69e68da6fc919bcfe77df5fa3b688f5439a2" +dependencies = [ + "once_cell", + "regex", +] + [[package]] name = "spacebadgers-utils" version = "1.0.1" @@ -970,9 +993,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "syn" -version = "2.0.61" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", @@ -981,18 +1004,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.60" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.60" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", @@ -1026,9 +1049,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.37.0" +version = "1.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" dependencies = [ "backtrace", "pin-project-lite", diff --git a/badgers-cli/Cargo.toml b/badgers-cli/Cargo.toml index 00dcc0c..618946c 100644 --- a/badgers-cli/Cargo.toml +++ b/badgers-cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "badgers-cli" -version = "0.2.1" +version = "0.2.2" edition = "2021" description = "Command-line SVG badge generation" @@ -15,4 +15,4 @@ authors.workspace = true clap = { version = "4.5", features = ["derive"] } [dependencies.spacebadgers] -workspace = true +version = "1" diff --git a/badgers-worker/Cargo.toml b/badgers-worker/Cargo.toml index d0f783e..e5beaf6 100644 --- a/badgers-worker/Cargo.toml +++ b/badgers-worker/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "badgers-worker" -version = "1.4.1" +version = "1.4.2" edition = "2021" description = "Spacebadgers worker" diff --git a/badgers/Cargo.toml b/badgers/Cargo.toml index 7e41818..2ad2d73 100644 --- a/badgers/Cargo.toml +++ b/badgers/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "spacebadgers" -version = "1.3.3" +version = "1.3.4" edition = "2021" description = "Fast SVG badge generator" build = "build.rs"