about summary refs log tree commit diff
path: root/src/rustdoc/markdown_pass.rs
diff options
context:
space:
mode:
authorPaul Stansifer <paul.stansifer@gmail.com>2012-07-30 16:01:07 -0700
committerPaul Stansifer <paul.stansifer@gmail.com>2012-07-30 18:38:15 -0700
commita9cc5066ee61f20e7cc59141d5c7213a452a2778 (patch)
treee65d0e9b5a3d3abf723d596a32785b5655505af1 /src/rustdoc/markdown_pass.rs
parent650fb06d68771828406f4f27e3af5db9c11311c5 (diff)
downloadrust-a9cc5066ee61f20e7cc59141d5c7213a452a2778.tar.gz
rust-a9cc5066ee61f20e7cc59141d5c7213a452a2778.zip
Change syntax extension syntax: `#m[...]` -> `m!{...}`.
Diffstat (limited to 'src/rustdoc/markdown_pass.rs')
-rw-r--r--src/rustdoc/markdown_pass.rs40
1 files changed, 20 insertions, 20 deletions
diff --git a/src/rustdoc/markdown_pass.rs b/src/rustdoc/markdown_pass.rs
index b04210f4d31..beed9c27602 100644
--- a/src/rustdoc/markdown_pass.rs
+++ b/src/rustdoc/markdown_pass.rs
@@ -123,7 +123,7 @@ fn should_request_new_writer_for_each_page() {
 }
 
 fn write_title(ctxt: ctxt, page: doc::page) {
-    ctxt.w.write_line(#fmt("%% %s", make_title(page)));
+    ctxt.w.write_line(fmt!{"%% %s", make_title(page)});
     ctxt.w.write_line(~"");
 }
 
@@ -175,7 +175,7 @@ fn write_header(ctxt: ctxt, lvl: hlvl, doc: doc::itemtag) {
 
 fn write_header_(ctxt: ctxt, lvl: hlvl, title: ~str) {
     let hashes = str::from_chars(vec::from_elem(lvl as uint, '#'));
-    ctxt.w.write_line(#fmt("%s %s", hashes, title));
+    ctxt.w.write_line(fmt!{"%s %s", hashes, title});
     ctxt.w.write_line(~"");
 }
 
@@ -233,7 +233,7 @@ fn header_name(doc: doc::itemtag) -> ~str {
             }
             trait_part += trait_type;
         }
-        #fmt("%s%s for %s", doc.name(), trait_part, self_ty)
+        fmt!{"%s%s for %s", doc.name(), trait_part, self_ty}
       }
       _ {
         doc.name()
@@ -246,7 +246,7 @@ fn header_text(doc: doc::itemtag) -> ~str {
 }
 
 fn header_text_(kind: ~str, name: ~str) -> ~str {
-    #fmt("%s `%s`", kind, name)
+    fmt!{"%s `%s`", kind, name}
 }
 
 fn write_crate(
@@ -385,10 +385,10 @@ fn write_index(ctxt: ctxt, index: doc::index) {
         let header = header_text_(entry.kind, entry.name);
         let id = entry.link;
         if option::is_some(entry.brief) {
-            ctxt.w.write_line(#fmt("* [%s](%s) - %s",
-                                   header, id, option::get(entry.brief)));
+            ctxt.w.write_line(fmt!{"* [%s](%s) - %s",
+                                   header, id, option::get(entry.brief)});
         } else {
-            ctxt.w.write_line(#fmt("* [%s](%s)", header, id));
+            ctxt.w.write_line(fmt!{"* [%s](%s)", header, id});
         }
     }
     ctxt.w.write_line(~"");
@@ -492,7 +492,7 @@ fn write_sig(ctxt: ctxt, sig: option<~str>) {
 
 fn code_block_indent(s: ~str) -> ~str {
     let lines = str::lines_any(s);
-    let indented = vec::map(lines, |line| #fmt("    %s", line) );
+    let indented = vec::map(lines, |line| fmt!{"    %s", line} );
     str::connect(indented, ~"\n")
 }
 
@@ -604,10 +604,10 @@ fn write_variant(ctxt: ctxt, doc: doc::variantdoc) {
     let sig = option::get(doc.sig);
     alt doc.desc {
       some(desc) {
-        ctxt.w.write_line(#fmt("* `%s` - %s", sig, desc));
+        ctxt.w.write_line(fmt!{"* `%s` - %s", sig, desc});
       }
       none {
-        ctxt.w.write_line(#fmt("* `%s`", sig));
+        ctxt.w.write_line(fmt!{"* `%s`", sig});
       }
     }
 }
@@ -761,7 +761,7 @@ mod test {
     fn render(source: ~str) -> ~str {
         let (srv, doc) = create_doc_srv(source);
         let markdown = write_markdown_str_srv(srv, doc);
-        #debug("markdown: %s", markdown);
+        debug!{"markdown: %s", markdown};
         markdown
     }
 
@@ -774,23 +774,23 @@ mod test {
             };
 
             let doc = extract::from_srv(srv, ~"");
-            #debug("doc (extract): %?", doc);
+            debug!{"doc (extract): %?", doc};
             let doc = tystr_pass::mk_pass().f(srv, doc);
-            #debug("doc (tystr): %?", doc);
+            debug!{"doc (tystr): %?", doc};
             let doc = path_pass::mk_pass().f(srv, doc);
-            #debug("doc (path): %?", doc);
+            debug!{"doc (path): %?", doc};
             let doc = attr_pass::mk_pass().f(srv, doc);
-            #debug("doc (attr): %?", doc);
+            debug!{"doc (attr): %?", doc};
             let doc = desc_to_brief_pass::mk_pass().f(srv, doc);
-            #debug("doc (desc_to_brief): %?", doc);
+            debug!{"doc (desc_to_brief): %?", doc};
             let doc = unindent_pass::mk_pass().f(srv, doc);
-            #debug("doc (unindent): %?", doc);
+            debug!{"doc (unindent): %?", doc};
             let doc = sectionalize_pass::mk_pass().f(srv, doc);
-            #debug("doc (trim): %?", doc);
+            debug!{"doc (trim): %?", doc};
             let doc = trim_pass::mk_pass().f(srv, doc);
-            #debug("doc (sectionalize): %?", doc);
+            debug!{"doc (sectionalize): %?", doc};
             let doc = markdown_index_pass::mk_pass(config).f(srv, doc);
-            #debug("doc (index): %?", doc);
+            debug!{"doc (index): %?", doc};
             (srv, doc)
         }
     }