Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit b96fef8

Browse files
committedMar 28, 2017
End of pulldown switch and remove completely hoedown
1 parent c9415eb commit b96fef8

File tree

7 files changed

+216
-490
lines changed

7 files changed

+216
-490
lines changed
 

‎.gitmodules

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@
55
[submodule "src/compiler-rt"]
66
path = src/compiler-rt
77
url = https://github.com/rust-lang/compiler-rt.git
8-
[submodule "src/rt/hoedown"]
9-
path = src/rt/hoedown
10-
url = https://github.com/rust-lang/hoedown.git
11-
branch = rust-2015-09-21-do-not-delete
128
[submodule "src/jemalloc"]
139
path = src/jemalloc
1410
url = https://github.com/rust-lang/jemalloc.git

‎src/librustdoc/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
authors = ["The Rust Project Developers"]
33
name = "rustdoc"
44
version = "0.0.0"
5-
build = "build.rs"
65

76
[lib]
87
name = "rustdoc"

‎src/librustdoc/build.rs

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎src/librustdoc/html/markdown.rs

Lines changed: 211 additions & 450 deletions
Large diffs are not rendered by default.

‎src/librustdoc/html/render.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1650,7 +1650,7 @@ fn document_short(w: &mut fmt::Formatter, item: &clean::Item, link: AssocItemLin
16501650
} else {
16511651
format!("{}", &plain_summary_line(Some(s)))
16521652
};
1653-
write!(w, "<div class='docblock'>{}</div>", Markdown(&markdown))?;
1653+
write!(w, "<div class='docblock'>{}</div>", Markdown(&markdown, false))?;
16541654
}
16551655
Ok(())
16561656
}
@@ -1683,7 +1683,7 @@ fn get_doc_value(item: &clean::Item) -> Option<&str> {
16831683
fn document_full(w: &mut fmt::Formatter, item: &clean::Item) -> fmt::Result {
16841684
if let Some(s) = get_doc_value(item) {
16851685
write!(w, "<div class='docblock'>{}</div>",
1686-
Markdown(&format!("{}{}", md_render_assoc_item(item), s)))?;
1686+
Markdown(&format!("{}{}", md_render_assoc_item(item), s), false))?;
16871687
}
16881688
Ok(())
16891689
}
@@ -1871,7 +1871,7 @@ fn item_module(w: &mut fmt::Formatter, cx: &Context,
18711871
</tr>",
18721872
name = *myitem.name.as_ref().unwrap(),
18731873
stab_docs = stab_docs,
1874-
docs = shorter(Some(&Markdown(doc_value).to_string())),
1874+
docs = shorter(Some(&Markdown(doc_value, true).to_string())),
18751875
class = myitem.type_(),
18761876
stab = myitem.stability_class().unwrap_or("".to_string()),
18771877
unsafety_flag = unsafety_flag,
@@ -2901,7 +2901,7 @@ fn render_impl(w: &mut fmt::Formatter, cx: &Context, i: &Impl, link: AssocItemLi
29012901
write!(w, "</span>")?;
29022902
write!(w, "</h3>\n")?;
29032903
if let Some(ref dox) = i.impl_item.doc_value() {
2904-
write!(w, "<div class='docblock'>{}</div>", Markdown(dox))?;
2904+
write!(w, "<div class='docblock'>{}</div>", Markdown(dox, false))?;
29052905
}
29062906
}
29072907

‎src/librustdoc/markdown.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ pub fn render(input: &str, mut output: PathBuf, matches: &getopts::Matches,
9494
let rendered = if include_toc {
9595
format!("{}", MarkdownWithToc(text))
9696
} else {
97-
format!("{}", Markdown(text))
97+
format!("{}", Markdown(text, false))
9898
};
9999

100100
let err = write!(

‎src/rt/hoedown

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.