about summary refs log tree commit diff
path: root/src/librustdoc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-07-22 11:30:29 -0700
committerGitHub <noreply@github.com>2016-07-22 11:30:29 -0700
commitad264f7f39b6113fb87a489d72d31abbc03ab148 (patch)
tree4534d3522de7de7d9bf9335b0f2df85923c71bd0 /src/librustdoc
parentaf87681ed28c35689d817a12be92024864ce7e2c (diff)
parent536c3157955b76297ff667087807ffe463b48018 (diff)
downloadrust-ad264f7f39b6113fb87a489d72d31abbc03ab148.tar.gz
rust-ad264f7f39b6113fb87a489d72d31abbc03ab148.zip
Auto merge of #34924 - cgswords:empty_delim, r=nrc
Added empty CloseDelim to tokens for future use.

Description says it all. I added a new DelimToken type, Empty, to indicate a Delimited tokenstream with no actual delimiters (which are variously useful for constructing macro output).

r? @nrc
Diffstat (limited to 'src/librustdoc')
-rw-r--r--src/librustdoc/html/highlight.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/librustdoc/html/highlight.rs b/src/librustdoc/html/highlight.rs
index 096e1ecc9ff..6cb79d6e863 100644
--- a/src/librustdoc/html/highlight.rs
+++ b/src/librustdoc/html/highlight.rs
@@ -233,6 +233,7 @@ impl<'a> Classifier<'a> {
             token::Dot | token::DotDot | token::DotDotDot | token::Comma | token::Semi |
                 token::Colon | token::ModSep | token::LArrow | token::OpenDelim(_) |
                 token::CloseDelim(token::Brace) | token::CloseDelim(token::Paren) |
+                token::CloseDelim(token::NoDelim) |
                 token::Question => Class::None,
             token::Dollar => {
                 if self.lexer.peek().tok.is_ident() {