diff options
| author | bors <bors@rust-lang.org> | 2013-09-21 00:16:02 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-09-21 00:16:02 -0700 |
| commit | db78fdc10c0cf6c02005c0b8daefe9cf47aa806f (patch) | |
| tree | f4fbec72401b8656aa39d7fa8d8869f69b852907 /src/libsyntax | |
| parent | e268c7fcc58593d71962a49a147c21edfa702f20 (diff) | |
| parent | 4fd061c426902b0904c65e64a3780b21f9ab3afb (diff) | |
| download | rust-db78fdc10c0cf6c02005c0b8daefe9cf47aa806f.tar.gz rust-db78fdc10c0cf6c02005c0b8daefe9cf47aa806f.zip | |
auto merge of #9374 : alexcrichton/rust/rustdoc-web, r=cmr
This large commit implements and `html` output option for rustdoc_ng. The executable has been altered to be invoked as "rustdoc_ng html <crate>" 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. Previews * http://www.contrib.andrew.cmu.edu/~acrichto/doc/std/ * http://www.contrib.andrew.cmu.edu/~acrichto/doc/extra/ Missing features * Different versions of documentation on the same page (all possibly indexed as well?) I think that this needs to be thought out before action is taken. It's an awesome idea, but it should be done carefully. * Source links are missing. This is a little dependent on getting versions working. In theory we should link back to github, but we should always link back to the exact version the documentation was generated from. * Integration with other tools. It would be awesome to have rustpkg-style inference of the package name and version so they don't have to be specified anywhere. Additionally, I should be able to build documentation for a pkgid, not necessarily a crate file. cc @cmr/@Seldaek
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ext/format.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/parse/comments.rs | 4 |
2 files changed, 2 insertions, 4 deletions
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("/*") { |