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 {
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<TocBuilder>,
}
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 }
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
}
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 _); }
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()
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() {
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);
_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 {
}
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;
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!")
externs: Externs,
should_panic: bool, no_run: bool, as_test_harness: bool,
compile_fail: bool, mut error_codes: Vec<String>, opts: &TestOptions,
- maybe_sysroot: Option<PathBuf>,
- original: &str, line_number: u32, filename: &str) {
+ maybe_sysroot: Option<PathBuf>) {
// 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);
compile_fail,
error_codes,
&opts,
- maybe_sysroot,
- &original,
- line_number,
- &filename)
+ maybe_sysroot)
})
} {
Ok(()) => (),