Merge pull request #1812 from rust-lang/master

Deploy

Author: Manishearth

src/caching.rs

@@ -1,6 +1,5 @@
 use rocket::fs::NamedFile;
-use rocket::http::uncased::Uncased;
-use rocket::http::Header;
+use rocket::http::{hyper, Header};
 use rocket::response::Responder;
 
 #[derive(Responder)]
@@ -13,12 +12,10 @@ impl CachedNamedFile {
     pub fn max_age(file: NamedFile, max_age: u32) -> Self {
         Self {
             file,
-            header: Header {
-                name: Uncased {
-                    string: "CacheControl".into(),
-                },
-                value: format!("max-age={max_age}").into(),
-            },
+            header: Header::new(
+                hyper::header::CACHE_CONTROL.as_str(),
+                format!("max-age={max_age}"),
+            ),
         }
     }
 }

templates/policies/code-of-conduct.html.hbs

@@ -41,9 +41,7 @@
       <div class="highlight"></div>
     </header>
     {{#fluent "coc-moderation-description"}}
-      {{#fluentparam "coc-rust-moderation-team-anchor"}}
-        <a href="{{baseurl}}/governance/teams/moderation">{{fluent "coc-moderation-description-team-anchor-text"}}</a>
-      {{/fluentparam}}
+      {{#fluentparam "coc-rust-moderation-team-anchor"}}<a href="{{baseurl}}/governance/teams/moderation">{{fluent "coc-moderation-description-team-anchor-text"}}</a>{{/fluentparam}}
     {{/fluent}}
   </div>
 </section>