Skip to content

Commit a6b7a26

Browse files
Update rinja version in generate-copyright
1 parent 6966416 commit a6b7a26

File tree

4 files changed

+6
-8
lines changed

4 files changed

+6
-8
lines changed

Cargo.lock

+1-3
Original file line numberDiff line numberDiff line change
@@ -1387,8 +1387,8 @@ name = "generate-copyright"
13871387
version = "0.1.0"
13881388
dependencies = [
13891389
"anyhow",
1390+
"askama",
13901391
"cargo_metadata 0.18.1",
1391-
"rinja",
13921392
"serde",
13931393
"serde_json",
13941394
"thiserror 1.0.69",
@@ -3111,9 +3111,7 @@ version = "0.3.5"
31113111
source = "registry+https://github.com/rust-lang/crates.io-index"
31123112
checksum = "3dc4940d00595430b3d7d5a01f6222b5e5b51395d1120bdb28d854bb8abb17a5"
31133113
dependencies = [
3114-
"humansize",
31153114
"itoa",
3116-
"percent-encoding",
31173115
"rinja_derive",
31183116
]
31193117

src/librustdoc/html/render/print_item.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ use crate::html::markdown::{HeadingOffset, MarkdownSummaryLine};
3737
use crate::html::render::{document_full, document_item_info};
3838
use crate::html::url_parts_builder::UrlPartsBuilder;
3939

40-
/// Generates a Askama template struct for rendering items with common methods.
40+
/// Generates an Askama template struct for rendering items with common methods.
4141
///
4242
/// Usage:
4343
/// ```ignore (illustrative)
@@ -1867,7 +1867,7 @@ fn item_proc_macro(cx: &Context<'_>, it: &clean::Item, m: &clean::ProcMacro) ->
18671867
}
18681868
}
18691869
}
1870-
Ok::<(), fmt::Error>(())
1870+
fmt::Result::Ok(())
18711871
})?;
18721872
write!(w, "{}", document(cx, it, None, HeadingOffset::H2))
18731873
})

src/tools/generate-copyright/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ description = "Produces a manifest of all the copyrighted materials in the Rust
88

99
[dependencies]
1010
anyhow = "1.0.65"
11+
askama = "0.13.0"
1112
cargo_metadata = "0.18.1"
12-
rinja = "0.3.0"
1313
serde = { version = "1.0.147", features = ["derive"] }
1414
serde_json = "1.0.85"
1515
thiserror = "1"

src/tools/generate-copyright/src/main.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use std::collections::BTreeMap;
22
use std::path::{Path, PathBuf};
33

44
use anyhow::Error;
5-
use rinja::Template;
5+
use askama::Template;
66

77
mod cargo_metadata;
88

@@ -117,7 +117,7 @@ struct Metadata {
117117
}
118118

119119
/// Describes one node in our metadata tree
120-
#[derive(serde::Deserialize, rinja::Template, Clone, Debug, PartialEq, Eq)]
120+
#[derive(serde::Deserialize, Template, Clone, Debug, PartialEq, Eq)]
121121
#[serde(rename_all = "kebab-case", tag = "type")]
122122
#[template(path = "Node.html")]
123123
pub(crate) enum Node {

0 commit comments

Comments
 (0)