mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unneeded call to with_default_session_globals in rustdoc highlight

Browse Source
This commit is contained in:
Guillaume Gomez 2021-05-05 17:28:18 +02:00
parent 24acc388da
commit ad4ccf966b
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/librustdoc/html/highlight.rs
View File

@ -13,7 +13,6 @@
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 @@ fn next(&mut self) -> Option<(TokenKind, &'a str)> {
/// 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