Radish alpha
r
radicle-ci-broker
rad:zwTxygwuz5LDGBq255RA2CbNGrz8
Radicle CI broker
Radicle
Git
Patches › fabc56ea
chore: bump dependency on html-page crate
Merged did:key:z6MkhFSE...ioq3 opened 1 year ago
Activity Changes +55 -41
3 files changed +55 -41 8ee42c7c → a80ab49d
modified Cargo.lock
@@ -81,9 +81,9 @@ checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"


[[package]]

name = "amplify"
- 
version = "4.6.0"
+ 
version = "4.7.0"

source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "9e711289a6cb28171b4f0e6c8019c69ff9476050508dc082167575d458ff74d0"
+ 
checksum = "7147b742325842988dd6c793d55f58df3ae36bccf7d9b6e07db10ab035be343d"

dependencies = [

 "amplify_derive",

 "amplify_num",
@@ -93,9 +93,9 @@ dependencies = [


[[package]]

name = "amplify_derive"
- 
version = "4.0.0"
+ 
version = "4.0.1"

source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "759dcbfaf94d838367a86d493ec34ccc8aa6fe365cb7880d6bf89006de24d9c1"
+ 
checksum = "2a6309e6b8d89b36b9f959b7a8fa093583b94922a0f6438a24fb08936de4d428"

dependencies = [

 "amplify_syn",

 "proc-macro2",
@@ -105,9 +105,9 @@ dependencies = [


[[package]]

name = "amplify_num"
- 
version = "0.5.2"
+ 
version = "0.5.3"

source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "04c009c5c4de814911b177e2ea59e4930bb918978ed3cce4900d846a6ceb0838"
+ 
checksum = "99bcb75a2982047f733547042fc3968c0f460dfcf7d90b90dea3b2744580e9ad"

dependencies = [

 "wasm-bindgen",

]
@@ -331,9 +331,9 @@ dependencies = [


[[package]]

name = "cc"
- 
version = "1.1.6"
+ 
version = "1.1.7"

source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "2aba8f4e9906c7ce3c73463f62a7f0c65183ada1a2d47e397cc8810827f9694f"
+ 
checksum = "26a5c3fd7bfa1ce3897a3a3501d362b2d87b7f2583ebcb4a949ec25911025cbc"

dependencies = [

 "jobserver",

 "libc",
@@ -374,9 +374,9 @@ dependencies = [


[[package]]

name = "clap"
- 
version = "4.5.11"
+ 
version = "4.5.13"

source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "35723e6a11662c2afb578bcf0b88bf6ea8e21282a953428f240574fcc3a2b5b3"
+ 
checksum = "0fbb260a053428790f3de475e304ff84cdbc4face759ea7a3e64c1edd938a7fc"

dependencies = [

 "clap_builder",

 "clap_derive",
@@ -384,9 +384,9 @@ dependencies = [


[[package]]

name = "clap_builder"
- 
version = "4.5.11"
+ 
version = "4.5.13"

source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "49eb96cbfa7cfa35017b7cd548c75b14c3118c98b423041d70562665e07fb0fa"
+ 
checksum = "64b17d7ea74e9f833c7dbf2cbe4fb12ff26783eda4782a8975b72f895c9b4d99"

dependencies = [

 "anstream",

 "anstyle",
@@ -397,9 +397,9 @@ dependencies = [


[[package]]

name = "clap_derive"
- 
version = "4.5.11"
+ 
version = "4.5.13"

source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "5d029b67f89d30bbb547c89fd5161293c0aec155fc691d7924b64550662db93e"
+ 
checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"

dependencies = [

 "heck",

 "proc-macro2",
@@ -795,9 +795,9 @@ dependencies = [


[[package]]

name = "flate2"
- 
version = "1.0.30"
+ 
version = "1.0.31"

source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
+ 
checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920"

dependencies = [

 "crc32fast",

 "miniz_oxide",
@@ -1058,9 +1058,9 @@ dependencies = [


[[package]]

name = "html-page"
- 
version = "0.2.1"
+ 
version = "0.4.0"

source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "b1d1b8f1ac6c574d4bb132a8e5d62b91b2fc7984322d91467c0b1f18eb559909"
+ 
checksum = "95596434766801b2f72a7b1013cc5d8278fad8b4bafee094a22131176b1657df"

dependencies = [

 "html-escape",

]
@@ -1108,9 +1108,9 @@ dependencies = [


[[package]]

name = "indexmap"
- 
version = "2.2.6"
+ 
version = "2.3.0"

source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+ 
checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0"

dependencies = [

 "equivalent",

 "hashbrown",
@@ -1331,11 +1331,11 @@ dependencies = [


[[package]]

name = "normpath"
- 
version = "1.2.0"
+ 
version = "1.3.0"

source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "5831952a9476f2fed74b77d74182fa5ddc4d21c72ec45a333b250e3ed0272804"
+ 
checksum = "c8911957c4b1549ac0dc74e30db9c8b0e66ddcd6d7acc33098f4c63a64a6d7ed"

dependencies = [
- 
 "windows-sys 0.52.0",
+ 
 "windows-sys 0.59.0",

]



[[package]]
@@ -1600,9 +1600,12 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"


[[package]]

name = "ppv-lite86"
- 
version = "0.2.17"
+ 
version = "0.2.20"

source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+ 
checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+ 
dependencies = [
+ 
 "zerocopy",
+ 
]



[[package]]

name = "primeorder"
@@ -1876,9 +1879,9 @@ dependencies = [


[[package]]

name = "regex"
- 
version = "1.10.5"
+ 
version = "1.10.6"

source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
+ 
checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"

dependencies = [

 "aho-corasick",

 "memchr",
@@ -2064,9 +2067,9 @@ dependencies = [


[[package]]

name = "serde_json"
- 
version = "1.0.121"
+ 
version = "1.0.122"

source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "4ab380d7d9f22ef3f21ad3e6c1ebe8e4fc7a2000ccba2e4d71fc96f15b2cb609"
+ 
checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da"

dependencies = [

 "indexmap",

 "itoa",
@@ -2423,14 +2426,15 @@ dependencies = [


[[package]]

name = "tempfile"
- 
version = "3.10.1"
+ 
version = "3.12.0"

source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
+ 
checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"

dependencies = [

 "cfg-if",

 "fastrand",
+ 
 "once_cell",

 "rustix",
- 
 "windows-sys 0.52.0",
+ 
 "windows-sys 0.59.0",

]



[[package]]
@@ -2895,11 +2899,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"


[[package]]

name = "winapi-util"
- 
version = "0.1.8"
+ 
version = "0.1.9"

source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
+ 
checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"

dependencies = [
- 
 "windows-sys 0.52.0",
+ 
 "windows-sys 0.59.0",

]



[[package]]
@@ -2936,6 +2940,15 @@ dependencies = [
]



[[package]]
+ 
name = "windows-sys"
+ 
version = "0.59.0"
+ 
source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+ 
dependencies = [
+ 
 "windows-targets 0.52.6",
+ 
]
+
+ 
[[package]]

name = "windows-targets"

version = "0.48.5"

source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3084,6 +3097,7 @@ version = "0.7.35"
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"

dependencies = [
+ 
 "byteorder",

 "zerocopy-derive",

]
modified Cargo.toml
@@ -14,7 +14,7 @@ categories = ["development-tools::build-utils"]
anyhow = "1.0.86"

clap = { version = "4.5.11", features = ["derive", "wrap_help"] }

env_logger = "0.11.5"
- 
html-page = "0.2.0"
+ 
html-page = "0.4.0"

log = "0.4.22"

radicle-git-ext = "0.7.0"

radicle-surf = { version = "0.18.0", default-features = false, features = ["serde"] }
modified src/pages.rs
@@ -16,7 +16,7 @@ use std::{
    time::Duration,

};
- 
use html_page::{Document, Element, Tag};
+ 
use html_page::{Element, HtmlPage, Tag};

use log::{debug, info};

use serde::Serialize;

use time::{macros::format_description, OffsetDateTime};
@@ -116,8 +116,8 @@ struct PageData {
}



impl PageData {
- 
    fn status_page_as_html(&self) -> Result<Document, PageError> {
- 
        let mut doc = Document::default();
+ 
    fn status_page_as_html(&self) -> Result<HtmlPage, PageError> {
+ 
        let mut doc = HtmlPage::default();



        doc.push_to_head(

            Element::new(Tag::Title)
@@ -306,8 +306,8 @@ impl PageData {
        }

    }
- 
    fn per_repo_page_as_html(&self, rid: RepoId, alias: &str, timestamp: &str) -> Document {
- 
        let mut doc = Document::default();
+ 
    fn per_repo_page_as_html(&self, rid: RepoId, alias: &str, timestamp: &str) -> HtmlPage {
+ 
        let mut doc = HtmlPage::default();



        doc.push_to_head(

            Element::new(Tag::Title)