From 4fd061c426902b0904c65e64a3780b21f9ab3afb Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Wed, 18 Sep 2013 22:18:38 -0700 Subject: Implement a web backend for rustdoc_ng This large commit implements and `html` output option for rustdoc_ng. The executable has been altered to be invoked as "rustdoc_ng html " and it will dump everything into the local "doc" directory. JSON can still be generated by changing 'html' to 'json'. This also fixes a number of bugs in rustdoc_ng relating to comment stripping, along with some other various issues that I found along the way. The `make doc` command has been altered to generate the new documentation into the `doc/ng/$(CRATE)` directories. --- src/libsyntax/ext/format.rs | 2 +- src/libsyntax/parse/comments.rs | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'src/libsyntax') diff --git a/src/libsyntax/ext/format.rs b/src/libsyntax/ext/format.rs index cace4648df2..d33ae069112 100644 --- a/src/libsyntax/ext/format.rs +++ b/src/libsyntax/ext/format.rs @@ -262,7 +262,7 @@ impl Context { let span = match self.names.find(&name) { Some(e) => e.span, None => { - let msg = fmt!("There is no argument named `%s`", name); + let msg = fmt!("there is no argument named `%s`", name); self.ecx.span_err(self.fmtsp, msg); return; } diff --git a/src/libsyntax/parse/comments.rs b/src/libsyntax/parse/comments.rs index 7ca6224c31d..f13bd6d9123 100644 --- a/src/libsyntax/parse/comments.rs +++ b/src/libsyntax/parse/comments.rs @@ -107,9 +107,7 @@ pub fn strip_doc_comment_decoration(comment: &str) -> ~str { } if comment.starts_with("//") { - // FIXME #5475: - // return comment.slice(3u, comment.len()).to_owned(); - let r = comment.slice(3u, comment.len()); return r.to_owned(); + return comment.slice(3u, comment.len()).to_owned(); } if comment.starts_with("/*") { -- cgit 1.4.1-3-g733a5