From 48f5dcad104dd4dd58b8852cb6147abb4179b3b1 Mon Sep 17 00:00:00 2001
From: Guillaume Gomez <guillaume.gomez@huawei.com>
Date: Mon, 17 Jan 2022 17:36:39 +0100
Subject: [PATCH] Move back templates into html folder

---
 Cargo.lock                                          | 2 ++
 src/librustdoc/Cargo.toml                           | 2 +-
 src/librustdoc/askama.toml                          | 2 ++
 src/librustdoc/{ => html}/templates/STYLE.md        | 0
 src/librustdoc/{ => html}/templates/page.html       | 0
 src/librustdoc/{ => html}/templates/print_item.html | 0
 6 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 src/librustdoc/askama.toml
 rename src/librustdoc/{ => html}/templates/STYLE.md (100%)
 rename src/librustdoc/{ => html}/templates/page.html (100%)
 rename src/librustdoc/{ => html}/templates/print_item.html (100%)

diff --git a/Cargo.lock b/Cargo.lock
index 73ffd3e044e..a7496e61b8b 100644
--- 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
index ccb844cd10b..67d167e86df 100644
--- 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
new file mode 100644
index 00000000000..0c984f637ba
--- /dev/null
+++ b/src/librustdoc/askama.toml
@@ -0,0 +1,2 @@
+[general]
+dirs = ["html/templates"]
diff --git a/src/librustdoc/templates/STYLE.md b/src/librustdoc/html/templates/STYLE.md
similarity index 100%
rename from src/librustdoc/templates/STYLE.md
rename to src/librustdoc/html/templates/STYLE.md
diff --git a/src/librustdoc/templates/page.html b/src/librustdoc/html/templates/page.html
similarity index 100%
rename from src/librustdoc/templates/page.html
rename to src/librustdoc/html/templates/page.html
diff --git a/src/librustdoc/templates/print_item.html b/src/librustdoc/html/templates/print_item.html
similarity index 100%
rename from src/librustdoc/templates/print_item.html
rename to src/librustdoc/html/templates/print_item.html