Rollup merge of #93005 - GuillaumeGomez:templates-in-html, r=notriddle

Move back templates into html folder Follow-up of #92526. r? `@notriddle`
rust-lang · Jan 19, 2022 · 623791d · 623791d
2 parents bcb093e + 48f5dca
commit 623791d
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 1 deletion.
diff --git a/Cargo.lock b/Cargo.lock
@@ -152,7 +152,9 @@ dependencies = [
  "nom",
  "proc-macro2",
  "quote",
+ "serde",
  "syn",
+ "toml",
 ]
 
 [[package]]

diff --git a/src/librustdoc/Cargo.toml b/src/librustdoc/Cargo.toml
@@ -8,7 +8,7 @@ path = "lib.rs"
 
 [dependencies]
 arrayvec = { version = "0.7", default-features = false }
-askama = { version = "0.11", default-features = false }
+askama = { version = "0.11", default-features = false, features = ["config"] }
 atty = "0.2"
 pulldown-cmark = { version = "0.9", default-features = false }
 minifier = "0.0.41"

diff --git a/src/librustdoc/askama.toml b/src/librustdoc/askama.toml
@@ -0,0 +1,2 @@
+[general]
+dirs = ["html/templates"]
diff --git a/src/librustdoc/templates/STYLE.md → src/librustdoc/html/templates/STYLE.md b/src/librustdoc/templates/STYLE.md → src/librustdoc/html/templates/STYLE.md
diff --git a/src/librustdoc/templates/page.html → src/librustdoc/html/templates/page.html b/src/librustdoc/templates/page.html → src/librustdoc/html/templates/page.html
diff --git a/src/librustdoc/templates/print_item.html → ...librustdoc/html/templates/print_item.html b/src/librustdoc/templates/print_item.html → ...librustdoc/html/templates/print_item.html