about summary refs log tree commit diff
path: root/src/librustdoc/html/render.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-09-14 08:28:05 -0700
committerGitHub <noreply@github.com>2016-09-14 08:28:05 -0700
commit5a5736db916ac30ca67945bbf0aee41ced1fcf05 (patch)
treed681ded3fcaea851b72f01b8e1d0b08bba9597bf /src/librustdoc/html/render.rs
parent97b561a0944141a02a0cebe577c3c69e436abcf4 (diff)
parente368cdd2d5fc2ceff4c4745600fda29dba9fd81f (diff)
downloadrust-5a5736db916ac30ca67945bbf0aee41ced1fcf05.tar.gz
rust-5a5736db916ac30ca67945bbf0aee41ced1fcf05.zip
Auto merge of #36472 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 5 pull requests

- Successful merges: #36334, #36335, #36363, #36374, #36467
- Failed merges:
Diffstat (limited to 'src/librustdoc/html/render.rs')
-rw-r--r--src/librustdoc/html/render.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs
index f352e39071c..82ef68745a1 100644
--- a/src/librustdoc/html/render.rs
+++ b/src/librustdoc/html/render.rs
@@ -2963,7 +2963,7 @@ impl<'a> fmt::Display for Source<'a> {
             write!(fmt, "<span id=\"{0}\">{0:1$}</span>\n", i, cols)?;
         }
         write!(fmt, "</pre>")?;
-        write!(fmt, "{}", highlight::render_with_highlighting(s, None, None))?;
+        write!(fmt, "{}", highlight::render_with_highlighting(s, None, None, None))?;
         Ok(())
     }
 }
@@ -2972,6 +2972,7 @@ fn item_macro(w: &mut fmt::Formatter, cx: &Context, it: &clean::Item,
               t: &clean::Macro) -> fmt::Result {
     w.write_str(&highlight::render_with_highlighting(&t.source,
                                                      Some("macro"),
+                                                     None,
                                                      None))?;
     render_stability_since_raw(w, it.stable_since(), None)?;
     document(w, cx, it)