nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-25 00:03:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

End of pulldown switch and remove completely hoedown

Browse Source
This commit is contained in:
Guillaume Gomez 2017-03-10 14:06:24 +01:00
parent c9415eb98f
commit b96fef8411
7 changed files with 216 additions and 490 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitmodules vendored
View File

@ -5,10 +5,6 @@
[submodule "src/compiler-rt"] [submodule "src/compiler-rt"]
path = src/compiler-rt path = src/compiler-rt
url = https://github.com/rust-lang/compiler-rt.git url = https://github.com/rust-lang/compiler-rt.git
[submodule "src/rt/hoedown"]
path = src/rt/hoedown
url = https://github.com/rust-lang/hoedown.git
branch = rust-2015-09-21-do-not-delete
[submodule "src/jemalloc"] [submodule "src/jemalloc"]
path = src/jemalloc path = src/jemalloc
url = https://github.com/rust-lang/jemalloc.git url = https://github.com/rust-lang/jemalloc.git

1
src/librustdoc/Cargo.toml
View File

@ -2,7 +2,6 @@
authors = ["The Rust Project Developers"] authors = ["The Rust Project Developers"]
name = "rustdoc" name = "rustdoc"
version = "0.0.0" version = "0.0.0"
build = "build.rs"
[lib] [lib]
name = "rustdoc" name = "rustdoc"

29
src/librustdoc/build.rs
View File

@ -1,29 +0,0 @@
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
extern crate build_helper;
extern crate gcc;
fn main() {
let src_dir = std::path::Path::new("../rt/hoedown/src");
build_helper::rerun_if_changed_anything_in_dir(src_dir);
let mut cfg = gcc::Config::new();
cfg.file("../rt/hoedown/src/autolink.c")
.file("../rt/hoedown/src/buffer.c")
.file("../rt/hoedown/src/document.c")
.file("../rt/hoedown/src/escape.c")
.file("../rt/hoedown/src/html.c")
.file("../rt/hoedown/src/html_blocks.c")
.file("../rt/hoedown/src/html_smartypants.c")
.file("../rt/hoedown/src/stack.c")
.file("../rt/hoedown/src/version.c")
.include(src_dir)
.compile("libhoedown.a");
}

661
src/librustdoc/html/markdown.rs
View File

@ -26,7 +26,7 @@
#![allow(non_camel_case_types)] #![allow(non_camel_case_types)]
use libc; //use libc;
use std::ascii::AsciiExt; use std::ascii::AsciiExt;
use std::cell::RefCell; use std::cell::RefCell;
use std::default::Default; use std::default::Default;
@ -43,158 +43,19 @@ use html::highlight;
use html::escape::Escape; use html::escape::Escape;
use test; use test;
use pulldown_cmark::{self, Event, Parser}; use pulldown_cmark::{self, Event, Parser, Tag};
/// A unit struct which has the `fmt::Display` trait implemented. When /// A unit struct which has the `fmt::Display` trait implemented. When
/// formatted, this struct will emit the HTML corresponding to the rendered /// formatted, this struct will emit the HTML corresponding to the rendered
/// version of the contained markdown string. /// version of the contained markdown string.
pub struct Markdown<'a>(pub &'a str); // The second parameter is whether we need a shorter version or not.
pub struct Markdown<'a>(pub &'a str, pub bool);
/// A unit struct like `Markdown`, that renders the markdown with a /// A unit struct like `Markdown`, that renders the markdown with a
/// table of contents. /// table of contents.
pub struct MarkdownWithToc<'a>(pub &'a str); pub struct MarkdownWithToc<'a>(pub &'a str);
/// A unit struct like `Markdown`, that renders the markdown escaping HTML tags. /// A unit struct like `Markdown`, that renders the markdown escaping HTML tags.
pub struct MarkdownHtml<'a>(pub &'a str); pub struct MarkdownHtml<'a>(pub &'a str);
/*const DEF_OUNIT: libc::size_t = 64;
const HOEDOWN_EXT_NO_INTRA_EMPHASIS: libc::c_uint = 1 << 11;
const HOEDOWN_EXT_TABLES: libc::c_uint = 1 << 0;
const HOEDOWN_EXT_FENCED_CODE: libc::c_uint = 1 << 1;
const HOEDOWN_EXT_AUTOLINK: libc::c_uint = 1 << 3;
const HOEDOWN_EXT_STRIKETHROUGH: libc::c_uint = 1 << 4;
const HOEDOWN_EXT_SUPERSCRIPT: libc::c_uint = 1 << 8;
const HOEDOWN_EXT_FOOTNOTES: libc::c_uint = 1 << 2;
const HOEDOWN_HTML_ESCAPE: libc::c_uint = 1 << 1;
const HOEDOWN_EXTENSIONS: libc::c_uint =
HOEDOWN_EXT_NO_INTRA_EMPHASIS | HOEDOWN_EXT_TABLES |
HOEDOWN_EXT_FENCED_CODE | HOEDOWN_EXT_AUTOLINK |
HOEDOWN_EXT_STRIKETHROUGH | HOEDOWN_EXT_SUPERSCRIPT |
HOEDOWN_EXT_FOOTNOTES;
enum hoedown_document {}
type blockcodefn = extern "C" fn(*mut hoedown_buffer, *const hoedown_buffer,
*const hoedown_buffer, *const hoedown_renderer_data,
libc::size_t);
type blockquotefn = extern "C" fn(*mut hoedown_buffer, *const hoedown_buffer,
*const hoedown_renderer_data, libc::size_t);
type headerfn = extern "C" fn(*mut hoedown_buffer, *const hoedown_buffer,
libc::c_int, *const hoedown_renderer_data,
libc::size_t);
type blockhtmlfn = extern "C" fn(*mut hoedown_buffer, *const hoedown_buffer,
*const hoedown_renderer_data, libc::size_t);
type codespanfn = extern "C" fn(*mut hoedown_buffer, *const hoedown_buffer,
*const hoedown_renderer_data, libc::size_t) -> libc::c_int;
type linkfn = extern "C" fn (*mut hoedown_buffer, *const hoedown_buffer,
*const hoedown_buffer, *const hoedown_buffer,
*const hoedown_renderer_data, libc::size_t) -> libc::c_int;
type entityfn = extern "C" fn (*mut hoedown_buffer, *const hoedown_buffer,
*const hoedown_renderer_data, libc::size_t);
type normaltextfn = extern "C" fn(*mut hoedown_buffer, *const hoedown_buffer,
*const hoedown_renderer_data, libc::size_t);
#[repr(C)]
struct hoedown_renderer_data {
opaque: *mut libc::c_void,
}
#[repr(C)]
struct hoedown_renderer {
opaque: *mut libc::c_void,
blockcode: Option<blockcodefn>,
blockquote: Option<blockquotefn>,
header: Option<headerfn>,
other_block_level_callbacks: [libc::size_t; 11],
blockhtml: Option<blockhtmlfn>,
/* span level callbacks - NULL or return 0 prints the span verbatim */
autolink: libc::size_t, // unused
codespan: Option<codespanfn>,
other_span_level_callbacks_1: [libc::size_t; 7],
link: Option<linkfn>,
other_span_level_callbacks_2: [libc::size_t; 6],
/* low level callbacks - NULL copies input directly into the output */
entity: Option<entityfn>,
normal_text: Option<normaltextfn>,
/* header and footer */
other_callbacks: [libc::size_t; 2],
}
#[repr(C)]
struct hoedown_html_renderer_state {
opaque: *mut libc::c_void,
toc_data: html_toc_data,
flags: libc::c_uint,
link_attributes: Option<extern "C" fn(*mut hoedown_buffer,
*const hoedown_buffer,
*const hoedown_renderer_data)>,
}
#[repr(C)]
struct html_toc_data {
header_count: libc::c_int,
current_level: libc::c_int,
level_offset: libc::c_int,
nesting_level: libc::c_int,
}
struct MyOpaque {
dfltblk: extern "C" fn(*mut hoedown_buffer, *const hoedown_buffer,
*const hoedown_buffer, *const hoedown_renderer_data,
libc::size_t),
toc_builder: Option<TocBuilder>,
}
#[repr(C)]
struct hoedown_buffer {
data: *const u8,
size: libc::size_t,
asize: libc::size_t,
unit: libc::size_t,
}
extern {
fn hoedown_html_renderer_new(render_flags: libc::c_uint,
nesting_level: libc::c_int)
-> *mut hoedown_renderer;
fn hoedown_html_renderer_free(renderer: *mut hoedown_renderer);
fn hoedown_document_new(rndr: *const hoedown_renderer,
extensions: libc::c_uint,
max_nesting: libc::size_t) -> *mut hoedown_document;
fn hoedown_document_render(doc: *mut hoedown_document,
ob: *mut hoedown_buffer,
document: *const u8,
doc_size: libc::size_t);
fn hoedown_document_free(md: *mut hoedown_document);
fn hoedown_buffer_new(unit: libc::size_t) -> *mut hoedown_buffer;
/*fn hoedown_buffer_put(b: *mut hoedown_buffer, c: *const libc::c_char,
n: libc::size_t);*/
fn hoedown_buffer_puts(b: *mut hoedown_buffer, c: *const libc::c_char);
fn hoedown_buffer_free(b: *mut hoedown_buffer);
}
// hoedown_buffer helpers
impl hoedown_buffer {
fn as_bytes(&self) -> &[u8] {
unsafe { slice::from_raw_parts(self.data, self.size as usize) }
}
}*/
/// Returns Some(code) if `s` is a line that should be stripped from /// Returns Some(code) if `s` is a line that should be stripped from
/// documentation but used in example code. `code` is the portion of /// documentation but used in example code. `code` is the portion of
/// `s` that should be used in tests. (None for lines that should be /// `s` that should be used in tests. (None for lines that should be
@ -228,213 +89,15 @@ thread_local!(pub static PLAYGROUND: RefCell<Option<(Option<String>, String)>> =
pub fn render(w: &mut fmt::Formatter, pub fn render(w: &mut fmt::Formatter,
s: &str, s: &str,
print_toc: bool, print_toc: bool,
_html_flags: libc::c_uint) -> fmt::Result { shorter: bool) -> fmt::Result {
/*extern fn block(ob: *mut hoedown_buffer, orig_text: *const hoedown_buffer, fn block(parser: &mut Parser, buffer: &mut String, lang: &str) {
lang: *const hoedown_buffer, data: *const hoedown_renderer_data,
line: libc::size_t) {
unsafe {
if orig_text.is_null() { return }
let opaque = (*data).opaque as *mut hoedown_html_renderer_state;
let my_opaque: &MyOpaque = &*((*opaque).opaque as *const MyOpaque);
let text = (*orig_text).as_bytes();
let origtext = str::from_utf8(text).unwrap();
let origtext = origtext.trim_left();
debug!("docblock: ==============\n{:?}\n=======", text);
let rendered = if lang.is_null() || origtext.is_empty() {
false
} else {
let rlang = (*lang).as_bytes();
let rlang = str::from_utf8(rlang).unwrap();
if !LangString::parse(rlang).rust {
(my_opaque.dfltblk)(ob, orig_text, lang,
opaque as *const hoedown_renderer_data,
line);
true
} else {
false
}
};
let lines = origtext.lines().filter(|l| {
stripped_filtered_line(*l).is_none()
});
let text = lines.collect::<Vec<&str>>().join("\n");
if rendered { return }
PLAYGROUND.with(|play| {
// insert newline to clearly separate it from the
// previous block so we can shorten the html output
let mut s = String::from("\n");
let playground_button = play.borrow().as_ref().and_then(|&(ref krate, ref url)| {
if url.is_empty() {
return None;
}
let test = origtext.lines().map(|l| {
stripped_filtered_line(l).unwrap_or(l)
}).collect::<Vec<&str>>().join("\n");
let krate = krate.as_ref().map(|s| &**s);
let test = test::maketest(&test, krate, false,
&Default::default());
let channel = if test.contains("#![feature(") {
"&amp;version=nightly"
} else {
""
};
// These characters don't need to be escaped in a URI.
// FIXME: use a library function for percent encoding.
fn dont_escape(c: u8) -> bool {
(b'a' <= c && c <= b'z') ||
(b'A' <= c && c <= b'Z') ||
(b'0' <= c && c <= b'9') ||
c == b'-' || c == b'_' || c == b'.' ||
c == b'~' || c == b'!' || c == b'\'' ||
c == b'(' || c == b')' || c == b'*'
}
let mut test_escaped = String::new();
for b in test.bytes() {
if dont_escape(b) {
test_escaped.push(char::from(b));
} else {
write!(test_escaped, "%{:02X}", b).unwrap();
}
}
Some(format!(
r#"<a class="test-arrow" target="_blank" href="{}?code={}{}">Run</a>"#,
url, test_escaped, channel
))
});
s.push_str(&highlight::render_with_highlighting(
&text,
Some("rust-example-rendered"),
None,
playground_button.as_ref().map(String::as_str)));
let output = CString::new(s).unwrap();
hoedown_buffer_puts(ob, output.as_ptr());
})
}
}
extern fn header(ob: *mut hoedown_buffer, text: *const hoedown_buffer,
level: libc::c_int, data: *const hoedown_renderer_data,
_: libc::size_t) {
// hoedown does this, we may as well too
unsafe { hoedown_buffer_puts(ob, "\n\0".as_ptr() as *const _); }
// Extract the text provided
let s = if text.is_null() {
"".to_owned()
} else {
let s = unsafe { (*text).as_bytes() };
str::from_utf8(&s).unwrap().to_owned()
};
// Discard '<em>', '<code>' tags and some escaped characters,
// transform the contents of the header into a hyphenated string
// without non-alphanumeric characters other than '-' and '_'.
//
// This is a terrible hack working around how hoedown gives us rendered
// html for text rather than the raw text.
let mut id = s.clone();
let repl_sub = vec!["<em>", "</em>", "<code>", "</code>",
"<strong>", "</strong>",
"&lt;", "&gt;", "&amp;", "&#39;", "&quot;"];
for sub in repl_sub {
id = id.replace(sub, "");
}
let id = id.chars().filter_map(|c| {
if c.is_alphanumeric() || c == '-' || c == '_' {
if c.is_ascii() {
Some(c.to_ascii_lowercase())
} else {
Some(c)
}
} else if c.is_whitespace() && c.is_ascii() {
Some('-')
} else {
None
}
}).collect::<String>();
let opaque = unsafe { (*data).opaque as *mut hoedown_html_renderer_state };
let opaque = unsafe { &mut *((*opaque).opaque as *mut MyOpaque) };
let id = derive_id(id);
let sec = opaque.toc_builder.as_mut().map_or("".to_owned(), |builder| {
format!("{} ", builder.push(level as u32, s.clone(), id.clone()))
});
// Render the HTML
let text = format!("<h{lvl} id='{id}' class='section-header'>\
<a href='#{id}'>{sec}{}</a></h{lvl}>",
s, lvl = level, id = id, sec = sec);
let text = CString::new(text).unwrap();
unsafe { hoedown_buffer_puts(ob, text.as_ptr()) }
}
extern fn codespan(
ob: *mut hoedown_buffer,
text: *const hoedown_buffer,
_: *const hoedown_renderer_data,
_: libc::size_t
) -> libc::c_int {
let content = if text.is_null() {
"".to_owned()
} else {
let bytes = unsafe { (*text).as_bytes() };
let s = str::from_utf8(bytes).unwrap();
collapse_whitespace(s)
};
let content = format!("<code>{}</code>", Escape(&content));
let element = CString::new(content).unwrap();
unsafe { hoedown_buffer_puts(ob, element.as_ptr()); }
// Return anything except 0, which would mean "also print the code span verbatim".
1
}
unsafe {
let ob = hoedown_buffer_new(DEF_OUNIT);
let renderer = hoedown_html_renderer_new(html_flags, 0);
let mut opaque = MyOpaque {
dfltblk: (*renderer).blockcode.unwrap(),
toc_builder: if print_toc {Some(TocBuilder::new())} else {None}
};
(*((*renderer).opaque as *mut hoedown_html_renderer_state)).opaque
= &mut opaque as *mut _ as *mut libc::c_void;
(*renderer).blockcode = Some(block);
(*renderer).header = Some(header);
(*renderer).codespan = Some(codespan);
let document = hoedown_document_new(renderer, HOEDOWN_EXTENSIONS, 16);
hoedown_document_render(document, ob, s.as_ptr(),
s.len() as libc::size_t);
hoedown_document_free(document);
hoedown_html_renderer_free(renderer);
let mut ret = opaque.toc_builder.map_or(Ok(()), |builder| {
write!(w, "<nav id=\"TOC\">{}</nav>", builder.into_toc())
});
if ret.is_ok() {
let buf = (*ob).as_bytes();
ret = w.write_str(str::from_utf8(buf).unwrap());
}
hoedown_buffer_free(ob);
ret
}*/
fn block(parser: &mut Parser, lang: &str, buffer: &mut String) {
let mut origtext = String::new(); let mut origtext = String::new();
loop { loop {
let event = parser.next(); let event = parser.next();
if let Some(event) = event { if let Some(event) = event {
match event { match event {
pulldown_cmark::Event::End( Event::End(Tag::CodeBlock(_)) => break,
pulldown_cmark::Tag::CodeBlock(_)) => break, Event::Text(ref s) => {
pulldown_cmark::Event::Text(ref s) => {
origtext.push_str(s); origtext.push_str(s);
} }
_ => {} _ => {}
@ -445,25 +108,21 @@ pub fn render(w: &mut fmt::Formatter,
} }
let origtext = origtext.trim_left(); let origtext = origtext.trim_left();
debug!("docblock: ==============\n{:?}\n=======", origtext); debug!("docblock: ==============\n{:?}\n=======", origtext);
let rendered = if lang.is_empty() || origtext.is_empty() {
false
} else {
if !LangString::parse(lang).rust {
/*(my_opaque.dfltblk)(ob, orig_text, lang,
opaque as *const hoedown_renderer_data,
line);*/
// true
false
} else {
false
}
};
let lines = origtext.lines().filter(|l| { let lines = origtext.lines().filter(|l| {
stripped_filtered_line(*l).is_none() stripped_filtered_line(*l).is_none()
}); });
let text = lines.collect::<Vec<&str>>().join("\n"); let text = lines.collect::<Vec<&str>>().join("\n");
if rendered { return } let block_info = if lang.is_empty() {
LangString::all_false()
} else {
LangString::parse(lang)
};
if !block_info.rust {
buffer.push_str(&format!("<pre><code class=\"language-{}\">{}</code></pre>",
lang, text));
return
}
PLAYGROUND.with(|play| { PLAYGROUND.with(|play| {
// insert newline to clearly separate it from the // insert newline to clearly separate it from the
// previous block so we can shorten the html output // previous block so we can shorten the html output
@ -521,9 +180,8 @@ pub fn render(w: &mut fmt::Formatter,
let event = parser.next(); let event = parser.next();
if let Some(event) = event { if let Some(event) = event {
match event { match event {
pulldown_cmark::Event::End( Event::End(Tag::Header(_)) => break,
pulldown_cmark::Tag::Header(_)) => break, Event::Text(ref s) => {
pulldown_cmark::Event::Text(ref s) => {
ret.push_str(s); ret.push_str(s);
} }
_ => {} _ => {}
@ -561,8 +219,8 @@ pub fn render(w: &mut fmt::Formatter,
}); });
// Render the HTML // Render the HTML
buffer.push_str(&format!("<h{lvl} id='{id}' class='section-header'>\ buffer.push_str(&format!("<h{lvl} id=\"{id}\" class=\"section-header\">\
<a href='#{id}'>{sec}{}</a></h{lvl}>", <a href=\"#{id}\">{sec}{}</a></h{lvl}>",
ret, lvl = level, id = id, sec = sec)); ret, lvl = level, id = id, sec = sec));
} }
@ -572,9 +230,8 @@ pub fn render(w: &mut fmt::Formatter,
let event = parser.next(); let event = parser.next();
if let Some(event) = event { if let Some(event) = event {
match event { match event {
pulldown_cmark::Event::End( Event::End(Tag::Code) => break,
pulldown_cmark::Tag::Code) => break, Event::Text(ref s) => {
pulldown_cmark::Event::Text(ref s) => {
content.push_str(s); content.push_str(s);
} }
_ => {} _ => {}
@ -591,9 +248,8 @@ pub fn render(w: &mut fmt::Formatter,
let event = parser.next(); let event = parser.next();
if let Some(event) = event { if let Some(event) = event {
match event { match event {
pulldown_cmark::Event::End( Event::End(Tag::Link(_, _)) => break,
pulldown_cmark::Tag::Link(_, _)) => break, Event::Text(ref s) => {
pulldown_cmark::Event::Text(ref s) => {
title.push_str(s); title.push_str(s);
} }
_ => {} _ => {}
@ -605,19 +261,19 @@ pub fn render(w: &mut fmt::Formatter,
buffer.push_str(&format!("<a href=\"{}\">{}</a>", url, title)); buffer.push_str(&format!("<a href=\"{}\">{}</a>", url, title));
} }
fn paragraph(parser: &mut Parser, buffer: &mut String, toc_builder: &mut Option<TocBuilder>) { fn paragraph(parser: &mut Parser, buffer: &mut String, toc_builder: &mut Option<TocBuilder>,
shorter: bool) {
let mut content = String::new(); let mut content = String::new();
loop { loop {
let event = parser.next(); let event = parser.next();
if let Some(event) = event { if let Some(event) = event {
match event { match event {
pulldown_cmark::Event::End( Event::End(Tag::Paragraph) => break,
pulldown_cmark::Tag::Paragraph) => break, Event::Text(ref s) => {
pulldown_cmark::Event::Text(ref s) => {
content.push_str(s); content.push_str(s);
} }
x => { x => {
looper(parser, &mut content, Some(x), toc_builder); looper(parser, &mut content, Some(x), toc_builder, shorter);
} }
} }
} else { } else {
@ -627,28 +283,135 @@ pub fn render(w: &mut fmt::Formatter,
buffer.push_str(&format!("<p>{}</p>", content)); buffer.push_str(&format!("<p>{}</p>", content));
} }
fn cell(parser: &mut Parser, buffer: &mut String, toc_builder: &mut Option<TocBuilder>,
shorter: bool) {
let mut content = String::new();
loop {
let event = parser.next();
if let Some(event) = event {
match event {
Event::End(Tag::TableHead) |
Event::End(Tag::Table(_)) |
Event::End(Tag::TableRow) |
Event::End(Tag::TableCell) => break,
Event::Text(ref s) => {
content.push_str(s);
}
x => {
looper(parser, &mut content, Some(x), toc_builder, shorter);
}
}
} else {
break
}
}
buffer.push_str(&format!("<td>{}</td>", content.trim()));
}
fn row(parser: &mut Parser, buffer: &mut String, toc_builder: &mut Option<TocBuilder>,
shorter: bool) {
let mut content = String::new();
loop {
let event = parser.next();
if let Some(event) = event {
match event {
Event::End(Tag::TableHead) |
Event::End(Tag::Table(_)) |
Event::End(Tag::TableRow) => break,
Event::Start(Tag::TableCell) => {
cell(parser, &mut content, toc_builder, shorter);
}
x => {
looper(parser, &mut content, Some(x), toc_builder, shorter);
}
}
} else {
break
}
}
buffer.push_str(&format!("<tr>{}</tr>", content));
}
fn head(parser: &mut Parser, buffer: &mut String, toc_builder: &mut Option<TocBuilder>,
shorter: bool) {
let mut content = String::new();
loop {
let event = parser.next();
if let Some(event) = event {
match event {
Event::End(Tag::TableHead) | Event::End(Tag::Table(_)) => break,
Event::Start(Tag::TableCell) => {
cell(parser, &mut content, toc_builder, shorter);
}
x => {
looper(parser, &mut content, Some(x), toc_builder, shorter);
}
}
} else {
break
}
}
if content.is_empty() {
return
}
buffer.push_str(&format!("<thead><tr>{}</tr></thead>", content.replace("td>", "th>")));
}
fn table(parser: &mut Parser, buffer: &mut String, toc_builder: &mut Option<TocBuilder>,
shorter: bool) {
let mut content = String::new();
let mut rows = String::new();
loop {
let event = parser.next();
if let Some(event) = event {
match event {
Event::End(Tag::Table(_)) => break,
Event::Start(Tag::TableHead) => {
head(parser, &mut content, toc_builder, shorter);
}
Event::Start(Tag::TableRow) => {
row(parser, &mut rows, toc_builder, shorter);
}
_ => {}
}
} else {
break
}
}
buffer.push_str(&format!("<table>{}{}</table>",
content,
if shorter || rows.is_empty() {
String::new()
} else {
format!("<tbody>{}</tbody>", rows)
}));
}
fn looper<'a>(parser: &'a mut Parser, buffer: &mut String, next_event: Option<Event<'a>>, fn looper<'a>(parser: &'a mut Parser, buffer: &mut String, next_event: Option<Event<'a>>,
toc_builder: &mut Option<TocBuilder>) -> bool { toc_builder: &mut Option<TocBuilder>, shorter: bool) -> bool {
if let Some(event) = next_event { if let Some(event) = next_event {
match event { match event {
pulldown_cmark::Event::Start(pulldown_cmark::Tag::CodeBlock(s)) => { Event::Start(Tag::CodeBlock(lang)) => {
block(parser, &*s, buffer); block(parser, buffer, &*lang);
} }
pulldown_cmark::Event::Start(pulldown_cmark::Tag::Header(level)) => { Event::Start(Tag::Header(level)) => {
header(parser, level, toc_builder, buffer); header(parser, level, toc_builder, buffer);
} }
pulldown_cmark::Event::Start(pulldown_cmark::Tag::Code) => { Event::Start(Tag::Code) => {
codespan(parser, buffer); codespan(parser, buffer);
} }
pulldown_cmark::Event::Start(pulldown_cmark::Tag::Paragraph) => { Event::Start(Tag::Paragraph) => {
paragraph(parser, buffer, toc_builder); paragraph(parser, buffer, toc_builder, shorter);
} }
pulldown_cmark::Event::Start(pulldown_cmark::Tag::Link(ref url, ref t)) => { Event::Start(Tag::Link(ref url, ref t)) => {
link(parser, buffer, url, t.as_ref().to_owned()); link(parser, buffer, url, t.as_ref().to_owned());
} }
Event::Start(Tag::Table(_)) => {
table(parser, buffer, toc_builder, shorter);
}
_ => {} _ => {}
} }
true shorter == false
} else { } else {
false false
} }
@ -660,10 +423,10 @@ pub fn render(w: &mut fmt::Formatter,
None None
}; };
let mut buffer = String::new(); let mut buffer = String::new();
let mut parser = Parser::new(s); let mut parser = Parser::new_ext(s, pulldown_cmark::OPTION_ENABLE_TABLES);
loop { loop {
let next_event = parser.next(); let next_event = parser.next();
if !looper(&mut parser, &mut buffer, next_event, &mut toc_builder) { if !looper(&mut parser, &mut buffer, next_event, &mut toc_builder, shorter) {
break break
} }
} }
@ -684,67 +447,64 @@ pub fn find_testable_code(doc: &str, tests: &mut ::test::Collector, position: Sp
let mut prev_offset = 0; let mut prev_offset = 0;
let mut nb_lines = 0; let mut nb_lines = 0;
let mut register_header = None; let mut register_header = None;
'main: loop { 'main: while let Some(event) = parser.next() {
let next_event = parser.next(); match event {
if let Some(event) = next_event { Event::Start(Tag::CodeBlock(s)) => {
match event { let block_info = if s.is_empty() {
pulldown_cmark::Event::Start(pulldown_cmark::Tag::CodeBlock(s)) => { LangString::all_false()
let block_info = if s.is_empty() { } else {
LangString::all_false() LangString::parse(&*s)
} else { };
LangString::parse(&*s) if !block_info.rust {
}; continue
let mut test_s = String::new(); }
let mut offset = None; let mut test_s = String::new();
loop { let mut offset = None;
let event = parser.next(); loop {
if let Some(event) = event { let event = parser.next();
match event { if let Some(event) = event {
pulldown_cmark::Event::End( match event {
pulldown_cmark::Tag::CodeBlock(_)) => break, Event::End(Tag::CodeBlock(_)) => break,
pulldown_cmark::Event::Text(ref s) => { Event::Text(ref s) => {
test_s.push_str(s); test_s.push_str(s);
if offset.is_none() { if offset.is_none() {
offset = Some(parser.get_offset()); offset = Some(parser.get_offset());
}
} }
_ => {}
} }
} else { _ => {}
break 'main;
} }
}
let offset = offset.unwrap_or(0);
let lines = test_s.lines().map(|l| {
stripped_filtered_line(l).unwrap_or(l)
});
let text = lines.collect::<Vec<&str>>().join("\n");
nb_lines += doc[prev_offset..offset].lines().count();
let line = tests.get_line() + (nb_lines - 1);
let filename = tests.get_filename();
tests.add_test(text.to_owned(),
block_info.should_panic, block_info.no_run,
block_info.ignore, block_info.test_harness,
block_info.compile_fail, block_info.error_codes,
line, filename);
prev_offset = offset;
}
pulldown_cmark::Event::Start(pulldown_cmark::Tag::Header(level)) => {
register_header = Some(level as u32);
}
pulldown_cmark::Event::Text(ref s) if register_header.is_some() => {
let level = register_header.unwrap();
if s.is_empty() {
tests.register_header("", level);
} else { } else {
tests.register_header(s, level); break 'main;
} }
register_header = None;
} }
_ => {} let offset = offset.unwrap_or(0);
let lines = test_s.lines().map(|l| {
stripped_filtered_line(l).unwrap_or(l)
});
let text = lines.collect::<Vec<&str>>().join("\n");
nb_lines += doc[prev_offset..offset].lines().count();
let line = tests.get_line() + (nb_lines - 1);
let filename = tests.get_filename();
tests.add_test(text.to_owned(),
block_info.should_panic, block_info.no_run,
block_info.ignore, block_info.test_harness,
block_info.compile_fail, block_info.error_codes,
line, filename);
prev_offset = offset;
} }
} else { Event::Start(Tag::Header(level)) => {
break register_header = Some(level as u32);
}
Event::Text(ref s) if register_header.is_some() => {
let level = register_header.unwrap();
if s.is_empty() {
tests.register_header("", level);
} else {
tests.register_header(s, level);
}
register_header = None;
}
_ => {}
} }
} }
} }
@ -824,17 +584,17 @@ impl LangString {
impl<'a> fmt::Display for Markdown<'a> { impl<'a> fmt::Display for Markdown<'a> {
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
let Markdown(md) = *self; let Markdown(md, shorter) = *self;
// This is actually common enough to special-case // This is actually common enough to special-case
if md.is_empty() { return Ok(()) } if md.is_empty() { return Ok(()) }
render(fmt, md, false, 0) render(fmt, md, false, shorter)
} }
} }
impl<'a> fmt::Display for MarkdownWithToc<'a> { impl<'a> fmt::Display for MarkdownWithToc<'a> {
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
let MarkdownWithToc(md) = *self; let MarkdownWithToc(md) = *self;
render(fmt, md, true, 0) render(fmt, md, true, false)
} }
} }
@ -843,7 +603,7 @@ impl<'a> fmt::Display for MarkdownHtml<'a> {
let MarkdownHtml(md) = *self; let MarkdownHtml(md) = *self;
// This is actually common enough to special-case // This is actually common enough to special-case
if md.is_empty() { return Ok(()) } if md.is_empty() { return Ok(()) }
render(fmt, md, false, /*HOEDOWN_HTML_ESCAPE*/0) render(fmt, md, false, false)
} }
} }
@ -864,12 +624,13 @@ pub fn plain_summary_line(md: &str) -> String {
} }
let next_event = next_event.unwrap(); let next_event = next_event.unwrap();
let (ret, is_in) = match next_event { let (ret, is_in) = match next_event {
pulldown_cmark::Event::Start(pulldown_cmark::Tag::Paragraph) => (None, 1), Event::Start(Tag::Paragraph) => (None, 1),
pulldown_cmark::Event::Start( Event::Start(Tag::Link(_, ref t)) if !self.is_first => {
pulldown_cmark::Tag::Link(_, ref t)) if !self.is_first => (Some(t.as_ref().to_owned()), 1), (Some(t.as_ref().to_owned()), 1)
pulldown_cmark::Event::Text(ref s) if self.is_in > 0 => (Some(s.as_ref().to_owned()), 0), }
pulldown_cmark::Event::End(pulldown_cmark::Tag::Link(_, ref t)) => (Some(t.as_ref().to_owned()), -1), Event::Text(ref s) if self.is_in > 0 => (Some(s.as_ref().to_owned()), 0),
pulldown_cmark::Event::End(pulldown_cmark::Tag::Paragraph) => (None, -1), Event::End(Tag::Link(_, ref t)) => (Some(t.as_ref().to_owned()), -1),
Event::End(Tag::Paragraph) => (None, -1),
_ => (None, 0), _ => (None, 0),
}; };
if is_in > 0 || (is_in < 0 && self.is_in > 0) { if is_in > 0 || (is_in < 0 && self.is_in > 0) {

8
src/librustdoc/html/render.rs
View File

@ -1650,7 +1650,7 @@ fn document_short(w: &mut fmt::Formatter, item: &clean::Item, link: AssocItemLin
} else { } else {
format!("{}", &plain_summary_line(Some(s))) format!("{}", &plain_summary_line(Some(s)))
}; };
write!(w, "<div class='docblock'>{}</div>", Markdown(&markdown))?; write!(w, "<div class='docblock'>{}</div>", Markdown(&markdown, false))?;
} }
Ok(()) Ok(())
} }
@ -1683,7 +1683,7 @@ fn get_doc_value(item: &clean::Item) -> Option<&str> {
fn document_full(w: &mut fmt::Formatter, item: &clean::Item) -> fmt::Result { fn document_full(w: &mut fmt::Formatter, item: &clean::Item) -> fmt::Result {
if let Some(s) = get_doc_value(item) { if let Some(s) = get_doc_value(item) {
write!(w, "<div class='docblock'>{}</div>", write!(w, "<div class='docblock'>{}</div>",
Markdown(&format!("{}{}", md_render_assoc_item(item), s)))?; Markdown(&format!("{}{}", md_render_assoc_item(item), s), false))?;
} }
Ok(()) Ok(())
} }
@ -1871,7 +1871,7 @@ fn item_module(w: &mut fmt::Formatter, cx: &Context,
</tr>", </tr>",
name = *myitem.name.as_ref().unwrap(), name = *myitem.name.as_ref().unwrap(),
stab_docs = stab_docs, stab_docs = stab_docs,
docs = shorter(Some(&Markdown(doc_value).to_string())), docs = shorter(Some(&Markdown(doc_value, true).to_string())),
class = myitem.type_(), class = myitem.type_(),
stab = myitem.stability_class().unwrap_or("".to_string()), stab = myitem.stability_class().unwrap_or("".to_string()),
unsafety_flag = unsafety_flag, unsafety_flag = unsafety_flag,
@ -2901,7 +2901,7 @@ fn render_impl(w: &mut fmt::Formatter, cx: &Context, i: &Impl, link: AssocItemLi
write!(w, "</span>")?; write!(w, "</span>")?;
write!(w, "</h3>\n")?; write!(w, "</h3>\n")?;
if let Some(ref dox) = i.impl_item.doc_value() { if let Some(ref dox) = i.impl_item.doc_value() {
write!(w, "<div class='docblock'>{}</div>", Markdown(dox))?; write!(w, "<div class='docblock'>{}</div>", Markdown(dox, false))?;
} }
} }

2
src/librustdoc/markdown.rs
View File

@ -94,7 +94,7 @@ pub fn render(input: &str, mut output: PathBuf, matches: &getopts::Matches,
let rendered = if include_toc { let rendered = if include_toc {
format!("{}", MarkdownWithToc(text)) format!("{}", MarkdownWithToc(text))
} else { } else {
format!("{}", Markdown(text)) format!("{}", Markdown(text, false))
}; };
let err = write!( let err = write!(

1
src/rt/hoedown

@ -1 +0,0 @@
Subproject commit da282f1bb7277b4d30fa1599ee29ad8eb4dd2a92