---

yaml
---
r: 102099
b: refs/heads/master
c: 5444da5
h: refs/heads/master
i:
  102097: bf8c45a
  102095: 7af326b
v: v3

Author: huonw

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 8786405047cadcfb5ec3a2d711ca264d74843c13
+refs/heads/master: 5444da54fd32b705eec28112e309f63b704e3f8c
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 6e7f170fedd3c526a643c0b2d13863acd982be02
 refs/heads/try: a97642026c18a624ff6ea01075dd9550f8ed07ff

trunk/src/librustc/lib.rs

@@ -28,7 +28,6 @@ This API is completely unstable and subject to change.
       html_root_url = "http://static.rust-lang.org/doc/master")];
 
 #[feature(macro_rules, globs, struct_variant, managed_boxes)];
-#[allow(unknown_features)]; // Note: remove it after a snapshot.
 #[feature(quote)];
 
 extern crate extra;

trunk/src/librustdoc/html/highlight.rs

@@ -35,8 +35,6 @@ use std::str;
 use std::intrinsics;
 use std::vec;
 
-use html::highlight;
-
 /// A unit struct which has the `fmt::Show` trait implemented. When
 /// formatted, this struct will emit the HTML corresponding to the rendered
 /// version of the contained markdown string.
@@ -97,7 +95,6 @@ extern {
     fn sd_markdown_free(md: *sd_markdown);
 
     fn bufnew(unit: libc::size_t) -> *buf;
-    fn bufputs(b: *buf, c: *libc::c_char);
     fn bufrelease(b: *buf);
 
 }
@@ -130,27 +127,7 @@ pub fn render(w: &mut io::Writer, s: &str) -> fmt::Result {
                     asize: text.len() as libc::size_t,
                     unit: 0,
                 };
-                let rendered = if lang.is_null() {
-                    false
-                } else {
-                    vec::raw::buf_as_slice((*lang).data,
-                                           (*lang).size as uint, |rlang| {
-                        let rlang = str::from_utf8(rlang).unwrap();
-                        if rlang.contains("notrust") {
-                            (my_opaque.dfltblk)(ob, &buf, lang, opaque);
-                            true
-                        } else {
-                            false
-                        }
-                    })
-                };
-
-                if !rendered {
-                    let output = highlight::highlight(text).to_c_str();
-                    output.with_ref(|r| {
-                        bufputs(ob, r)
-                    })
-                }
+                (my_opaque.dfltblk)(ob, &buf, lang, opaque);
             })
         }
     }
@@ -204,8 +181,7 @@ pub fn find_testable_code(doc: &str, tests: &mut ::test::Collector) {
                 vec::raw::buf_as_slice((*lang).data,
                                        (*lang).size as uint, |lang| {
                     let s = str::from_utf8(lang).unwrap();
-                    (s.contains("should_fail"), s.contains("ignore") ||
-                                                s.contains("notrust"))
+                    (s.contains("should_fail"), s.contains("ignore"))
                 })
             };
             if ignore { return }

trunk/src/librustdoc/html/markdown.rs

@@ -50,10 +50,10 @@ use syntax::parse::token::InternedString;
 use clean;
 use doctree;
 use fold::DocFolder;
+use html::escape::Escape;
 use html::format::{VisSpace, Method, PuritySpace};
 use html::layout;
 use html::markdown::Markdown;
-use html::highlight;
 
 /// Major driving force in all rustdoc rendering. This contains information
 /// about where in the tree-like hierarchy rendering is occurring and controls
@@ -1091,8 +1091,7 @@ fn item_module(w: &mut Writer, cx: &Context,
 
 fn item_function(w: &mut Writer, it: &clean::Item,
                  f: &clean::Function) -> fmt::Result {
-    try!(write!(w, "<pre class='rust fn'>{vis}{purity}fn \
-                    {name}{generics}{decl}</pre>",
+    try!(write!(w, "<pre class='fn'>{vis}{purity}fn {name}{generics}{decl}</pre>",
            vis = VisSpace(it.visibility),
            purity = PuritySpace(f.purity),
            name = it.name.get_ref().as_slice(),
@@ -1113,7 +1112,7 @@ fn item_trait(w: &mut Writer, it: &clean::Item,
     }
 
     // Output the trait definition
-    try!(write!(w, "<pre class='rust trait'>{}trait {}{}{} ",
+    try!(write!(w, "<pre class='trait'>{}trait {}{}{} ",
                   VisSpace(it.visibility),
                   it.name.get_ref().as_slice(),
                   t.generics,
@@ -1232,7 +1231,7 @@ fn render_method(w: &mut Writer, meth: &clean::Item) -> fmt::Result {
 
 fn item_struct(w: &mut Writer, it: &clean::Item,
                s: &clean::Struct) -> fmt::Result {
-    try!(write!(w, "<pre class='rust struct'>"));
+    try!(write!(w, "<pre class='struct'>"));
     try!(render_struct(w, it, Some(&s.generics), s.struct_type, s.fields,
                          s.fields_stripped, "", true));
     try!(write!(w, "</pre>"));
@@ -1256,7 +1255,7 @@ fn item_struct(w: &mut Writer, it: &clean::Item,
 }
 
 fn item_enum(w: &mut Writer, it: &clean::Item, e: &clean::Enum) -> fmt::Result {
-    try!(write!(w, "<pre class='rust enum'>{}enum {}{}",
+    try!(write!(w, "<pre class='enum'>{}enum {}{}",
                   VisSpace(it.visibility),
                   it.name.get_ref().as_slice(),
                   e.generics));
@@ -1533,7 +1532,7 @@ fn render_impl(w: &mut Writer, i: &clean::Impl,
 
 fn item_typedef(w: &mut Writer, it: &clean::Item,
                 t: &clean::Typedef) -> fmt::Result {
-    try!(write!(w, "<pre class='rust typedef'>type {}{} = {};</pre>",
+    try!(write!(w, "<pre class='typedef'>type {}{} = {};</pre>",
                   it.name.get_ref().as_slice(),
                   t.generics,
                   t.type_));
@@ -1626,7 +1625,9 @@ impl<'a> fmt::Show for Source<'a> {
             try!(write!(fmt.buf, "<span id='{0:u}'>{0:1$u}</span>\n", i, cols));
         }
         try!(write!(fmt.buf, "</pre>"));
-        try!(write!(fmt.buf, "{}", highlight::highlight(s.as_slice())));
+        try!(write!(fmt.buf, "<pre class='rust'>"));
+        try!(write!(fmt.buf, "{}", Escape(s.as_slice())));
+        try!(write!(fmt.buf, "</pre>"));
         Ok(())
     }
 }

trunk/src/librustdoc/html/render.rs

@@ -303,18 +303,3 @@ a {
 .stability.Locked { border-color: #0084B6; color: #00668c; }
 
 :target { background: #FDFFD3; }
-
-pre.rust .kw { color: #cc782f; }
-pre.rust .kw-2 { color: #3bbb33; }
-pre.rust .prelude-ty { color: #3bbb33; }
-pre.rust .number { color: #c13928; }
-pre.rust .self { color: #c13928; }
-pre.rust .boolval { color: #c13928; }
-pre.rust .prelude-val { color: #c13928; }
-pre.rust .op { color: #cc782f; }
-pre.rust .comment { color: #533add; }
-pre.rust .doccomment { color: #d343d0; }
-pre.rust .macro { color: #d343d0; }
-pre.rust .string { color: #c13928; }
-pre.rust .lifetime { color: #d343d0; }
-pre.rust .attribute { color: #d343d0 !important; }

trunk/src/librustdoc/html/static/main.css

@@ -38,7 +38,6 @@ pub mod core;
 pub mod doctree;
 pub mod fold;
 pub mod html {
-    pub mod highlight;
     pub mod escape;
     pub mod format;
     pub mod layout;