diff options
| author | Robin Kruppe <robin.kruppe@gmail.com> | 2015-08-16 16:49:10 +0200 |
|---|---|---|
| committer | Robin Kruppe <robin.kruppe@gmail.com> | 2015-08-16 16:49:10 +0200 |
| commit | 16ec84b75f4c4f4c20c7b7038587ca02e7f8d5b9 (patch) | |
| tree | 4a7c4ab641ff6613ebca01e4c4aaffde67976903 | |
| parent | 316f5e5acfe6e69bc7ab39b0e4feed116a86a58a (diff) | |
| download | rust-16ec84b75f4c4f4c20c7b7038587ca02e7f8d5b9.tar.gz rust-16ec84b75f4c4f4c20c7b7038587ca02e7f8d5b9.zip | |
Correct signature of hoedown callback for codespans
| -rw-r--r-- | src/librustdoc/html/markdown.rs | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/librustdoc/html/markdown.rs b/src/librustdoc/html/markdown.rs index 7388a066f22..dd754e58072 100644 --- a/src/librustdoc/html/markdown.rs +++ b/src/librustdoc/html/markdown.rs @@ -74,7 +74,7 @@ type headerfn = extern "C" fn(*mut hoedown_buffer, *const hoedown_buffer, libc::c_int, *mut libc::c_void); type codespanfn = extern "C" fn(*mut hoedown_buffer, *const hoedown_buffer, - *mut libc::c_void); + *mut libc::c_void) -> libc::c_int; type linkfn = extern "C" fn (*mut hoedown_buffer, *const hoedown_buffer, *const hoedown_buffer, *const hoedown_buffer, @@ -317,7 +317,11 @@ pub fn render(w: &mut fmt::Formatter, s: &str, print_toc: bool) -> fmt::Result { reset_headers(); - extern fn codespan(ob: *mut hoedown_buffer, text: *const hoedown_buffer, _: *mut libc::c_void) { + extern fn codespan( + ob: *mut hoedown_buffer, + text: *const hoedown_buffer, + _: *mut libc::c_void, + ) -> libc::c_int { let content = if text.is_null() { "".to_string() } else { @@ -329,6 +333,8 @@ pub fn render(w: &mut fmt::Formatter, s: &str, print_toc: bool) -> fmt::Result { 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 { |
