From 409e8ba34e03fd48d9a2395d5f602ddc4e8bc97a Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Thu, 12 Jan 2017 20:33:01 +0100 Subject: [PATCH] Move to my own hoedown repository --- .gitmodules | 2 +- src/librustdoc/html/markdown.rs | 45 ++++++++++++++++++++------------- src/librustdoc/test.rs | 10 +++----- src/rt/hoedown | 2 +- 4 files changed, 33 insertions(+), 26 deletions(-) diff --git a/.gitmodules b/.gitmodules index 39288a7ae49..73824b7b42c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,7 +7,7 @@ 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 + url = https://github.com/GuillaumeGomez/hoedown.git [submodule "src/jemalloc"] path = src/jemalloc url = https://github.com/rust-lang/jemalloc.git diff --git a/src/librustdoc/html/markdown.rs b/src/librustdoc/html/markdown.rs index 3df476907d9..c35342e25b5 100644 --- a/src/librustdoc/html/markdown.rs +++ b/src/librustdoc/html/markdown.rs @@ -71,29 +71,31 @@ const HOEDOWN_EXTENSIONS: libc::c_uint = enum hoedown_document {} type blockcodefn = extern "C" fn(*mut hoedown_buffer, *const hoedown_buffer, - *const hoedown_buffer, *const hoedown_renderer_data); + *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); + *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::c_int, *const hoedown_renderer_data, + libc::size_t); type blockhtmlfn = extern "C" fn(*mut hoedown_buffer, *const hoedown_buffer, - *const hoedown_renderer_data); + *const hoedown_renderer_data, libc::size_t); type codespanfn = extern "C" fn(*mut hoedown_buffer, *const hoedown_buffer, - *const hoedown_renderer_data) -> libc::c_int; + *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::c_int; + *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); + *const hoedown_renderer_data, libc::size_t); type normaltextfn = extern "C" fn(*mut hoedown_buffer, *const hoedown_buffer, - *const hoedown_renderer_data); + *const hoedown_renderer_data, libc::size_t); #[repr(C)] struct hoedown_renderer_data { @@ -147,7 +149,8 @@ struct html_toc_data { struct MyOpaque { dfltblk: extern "C" fn(*mut hoedown_buffer, *const hoedown_buffer, - *const hoedown_buffer, *const hoedown_renderer_data), + *const hoedown_buffer, *const hoedown_renderer_data, + libc::size_t), toc_builder: Option, } @@ -229,7 +232,8 @@ pub fn render(w: &mut fmt::Formatter, print_toc: bool, html_flags: libc::c_uint) -> fmt::Result { extern fn block(ob: *mut hoedown_buffer, orig_text: *const hoedown_buffer, - lang: *const hoedown_buffer, data: *const hoedown_renderer_data) { + lang: *const hoedown_buffer, data: *const hoedown_renderer_data, + line: libc::size_t) { unsafe { if orig_text.is_null() { return } @@ -246,7 +250,8 @@ pub fn render(w: &mut fmt::Formatter, 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); + opaque as *const hoedown_renderer_data, + line); true } else { false @@ -312,7 +317,8 @@ pub fn render(w: &mut fmt::Formatter, } extern fn header(ob: *mut hoedown_buffer, text: *const hoedown_buffer, - level: libc::c_int, data: *const hoedown_renderer_data) { + 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 _); } @@ -373,6 +379,7 @@ pub fn render(w: &mut fmt::Formatter, 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() @@ -426,7 +433,8 @@ pub fn find_testable_code(doc: &str, tests: &mut ::test::Collector) { extern fn block(_ob: *mut hoedown_buffer, text: *const hoedown_buffer, lang: *const hoedown_buffer, - data: *const hoedown_renderer_data) { + data: *const hoedown_renderer_data, + _: libc::size_t) { unsafe { if text.is_null() { return } let block_info = if lang.is_null() { @@ -455,7 +463,8 @@ pub fn find_testable_code(doc: &str, tests: &mut ::test::Collector) { extern fn header(_ob: *mut hoedown_buffer, text: *const hoedown_buffer, - level: libc::c_int, data: *const hoedown_renderer_data) { + level: libc::c_int, data: *const hoedown_renderer_data, + _: libc::size_t) { unsafe { let opaque = (*data).opaque as *mut hoedown_html_renderer_state; let tests = &mut *((*opaque).opaque as *mut ::test::Collector); @@ -590,7 +599,8 @@ pub fn plain_summary_line(md: &str) -> String { _link: *const hoedown_buffer, _title: *const hoedown_buffer, content: *const hoedown_buffer, - data: *const hoedown_renderer_data) -> libc::c_int + data: *const hoedown_renderer_data, + _: libc::size_t) -> libc::c_int { unsafe { if !content.is_null() && (*content).size > 0 { @@ -603,8 +613,9 @@ pub fn plain_summary_line(md: &str) -> String { } extern fn normal_text(_ob: *mut hoedown_buffer, - text: *const hoedown_buffer, - data: *const hoedown_renderer_data) + text: *const hoedown_buffer, + data: *const hoedown_renderer_data, + _: libc::size_t) { unsafe { let ob = (*data).opaque as *mut hoedown_buffer; diff --git a/src/librustdoc/test.rs b/src/librustdoc/test.rs index 3b910c276ee..bad2986ab62 100644 --- a/src/librustdoc/test.rs +++ b/src/librustdoc/test.rs @@ -88,7 +88,7 @@ pub fn run(input: &str, config::build_configuration(&sess, config::parse_cfgspecs(cfgs.clone())); let krate = panictry!(driver::phase_1_parse_input(&sess, &input)); - let driver::ExpansionResult { hir_forest, .. } = { + let driver::ExpansionResult { defs, mut hir_forest, .. } = { phase_2_configure_and_expand( &sess, &cstore, krate, None, "rustdoc-test", None, MakeGlobMap::No, |_| Ok(()) ).expect("phase_2_configure_and_expand aborted in rustdoc!") @@ -174,8 +174,7 @@ fn runtest(test: &str, cratename: &str, cfgs: Vec, libs: SearchPaths, externs: Externs, should_panic: bool, no_run: bool, as_test_harness: bool, compile_fail: bool, mut error_codes: Vec, opts: &TestOptions, - maybe_sysroot: Option, - original: &str, line_number: u32, filename: &str) { + maybe_sysroot: Option) { // the test harness wants its own `main` & top level functions, so // never wrap the test in `fn main() { ... }` let test = maketest(test, Some(cratename), as_test_harness, opts); @@ -490,10 +489,7 @@ impl Collector { compile_fail, error_codes, &opts, - maybe_sysroot, - &original, - line_number, - &filename) + maybe_sysroot) }) } { Ok(()) => (), diff --git a/src/rt/hoedown b/src/rt/hoedown index a3736a0a190..78e7b6f69d3 160000 --- a/src/rt/hoedown +++ b/src/rt/hoedown @@ -1 +1 @@ -Subproject commit a3736a0a1907cbc8bf619708738815a5fd789c80 +Subproject commit 78e7b6f69d3fa0cb6ae6e7fb9278c3fd167ec0d1