---

brson · brson · commit a01fc332afec · 2014-08-04T14:37:07.000-07:00
yaml --- r: 154091 b: refs/heads/try2 c: 57e53d5 h: refs/heads/master i: 154089: a06088c 154087: f9bf375 v: v3
diff --git a/[refs] b/[refs]
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 2b0a15494ae24f7f131c8cbe14ca00638b1ae5f9
+refs/heads/try2: 57e53d5c2f761a09c1d37d54dd93dc7109b329ab
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/try2/src/librustdoc/html/layout.rs b/branches/try2/src/librustdoc/html/layout.rs
@@ -26,7 +26,8 @@ pub struct Page<'a> {
     pub title: &'a str,
     pub ty: &'a str,
     pub root_path: &'a str,
-    pub description: &'a str
+    pub description: &'a str,
+    pub keywords: &'a str
 }
 
 pub fn render<T: fmt::Show, S: fmt::Show>(
@@ -41,6 +42,7 @@ r##"<!DOCTYPE html>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="generator" content="rustdoc">
     <meta name="description" content="{description}">
+    <meta name="keywords" content="{keywords}">
 
     <title>{title}</title>
 
@@ -137,6 +139,7 @@ r##"<!DOCTYPE html>
     },
     title     = page.title,
     description = page.description,
+    keywords = page.keywords,
     favicon   = if layout.favicon.len() == 0 {
         "".to_string()
     } else {
diff --git a/branches/try2/src/librustdoc/html/render.rs b/branches/try2/src/librustdoc/html/render.rs
@@ -748,6 +748,7 @@ impl<'a> SourceCollector<'a> {
             ty: "source",
             root_path: root_path.as_slice(),
             description: desc.as_slice(),
+            keywords: get_basic_keywords(),
         };
         try!(layout::render(&mut w as &mut Writer, &self.cx.layout,
                             &page, &(""), &Source(contents)));
@@ -1081,6 +1082,7 @@ impl Context {
                 root_path: this.root_path.as_slice(),
                 title: title.as_slice(),
                 description: desc.as_slice(),
+                keywords: get_basic_keywords(),
             };
             let html_dst = &this.dst.join("stability.html");
             let mut html_out = BufferedWriter::new(try!(File::create(html_dst)));
@@ -1137,11 +1139,13 @@ impl Context {
                 format!("API documentation for the Rust `{}` {} in crate `{}`.",
                         it.name.get_ref(), tyname, cx.layout.krate)
             };
+            let keywords = make_item_keywords(it);
             let page = layout::Page {
                 ty: tyname,
                 root_path: cx.root_path.as_slice(),
                 title: title.as_slice(),
                 description: desc.as_slice(),
+                keywords: keywords.as_slice(),
             };
 
             markdown::reset_headers();
@@ -2170,3 +2174,11 @@ fn ignore_private_item(it: &clean::Item) -> bool {
         _ => false,
     }
 }
+
+fn get_basic_keywords() -> &'static str {
+    "rust, rustlang, rust-lang"
+}
+
+fn make_item_keywords(it: &clean::Item) -> String {
+    format!("{}, {}", get_basic_keywords(), it.name.get_ref())
+}
