diff options
| author | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2021-05-05 17:28:18 +0200 |
|---|---|---|
| committer | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2021-05-05 17:28:18 +0200 |
| commit | ad4ccf966bea9bf374fa95500ad1f3d1ae6439e9 (patch) | |
| tree | eb6ef04f39bdbf068d62061137abf8189850faea | |
| parent | 24acc388da2cdbe1ec79b6933402941b6fffb26b (diff) | |
| download | rust-ad4ccf966bea9bf374fa95500ad1f3d1ae6439e9.tar.gz rust-ad4ccf966bea9bf374fa95500ad1f3d1ae6439e9.zip | |
Remove unneeded call to with_default_session_globals in rustdoc highlight
| -rw-r--r-- | src/librustdoc/html/highlight.rs | 37 |
1 files changed, 17 insertions, 20 deletions
diff --git a/src/librustdoc/html/highlight.rs b/src/librustdoc/html/highlight.rs index 7130a6bc1e8..f631f627fc2 100644 --- a/src/librustdoc/html/highlight.rs +++ b/src/librustdoc/html/highlight.rs @@ -13,7 +13,6 @@ use std::iter::Peekable; use rustc_lexer::{LiteralKind, TokenKind}; use rustc_span::edition::Edition; use rustc_span::symbol::Symbol; -use rustc_span::with_default_session_globals; use super::format::Buffer; @@ -238,28 +237,26 @@ impl<'a> Classifier<'a> { /// possibly giving it an HTML span with a class specifying what flavor of /// token is used. fn highlight(mut self, sink: &mut dyn FnMut(Highlight<'a>)) { - with_default_session_globals(|| { - loop { - if self - .tokens - .peek() - .map(|t| matches!(t.0, TokenKind::Colon | TokenKind::Ident)) - .unwrap_or(false) - { - let tokens = self.get_full_ident_path(); - for (token, start, end) in tokens { - let text = &self.src[start..end]; - self.advance(token, text, sink); - self.byte_pos += text.len() as u32; - } - } - if let Some((token, text)) = self.next() { + loop { + if self + .tokens + .peek() + .map(|t| matches!(t.0, TokenKind::Colon | TokenKind::Ident)) + .unwrap_or(false) + { + let tokens = self.get_full_ident_path(); + for (token, start, end) in tokens { + let text = &self.src[start..end]; self.advance(token, text, sink); - } else { - break; + self.byte_pos += text.len() as u32; } } - }) + if let Some((token, text)) = self.next() { + self.advance(token, text, sink); + } else { + break; + } + } } /// Single step of highlighting. This will classify `token`, but maybe also |
