user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mv codemap source_map

Browse source
This commit is contained in:
Donato Sciarra 2018-08-18 12:14:14 +02:00
parent d3fe97f3d3
commit 062bfbf39b
28 changed files with 130 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/librustdoc/html/highlight.rs
View file

@ -60,7 +60,7 @@ pub fn render_with_highlighting(src: &str, class: Option<&str>,
/// each span of text in sequence.
struct Classifier<'a> {
lexer: lexer::StringReader<'a>,
codemap: &'a SourceMap,
source_map: &'a SourceMap,
// State of the classifier.
in_attribute: bool,
@ -145,10 +145,10 @@ impl<U: Write> Writer for U {
}
impl<'a> Classifier<'a> {
fn new(lexer: lexer::StringReader<'a>, codemap: &'a SourceMap) -> Classifier<'a> {
fn new(lexer: lexer::StringReader<'a>, source_map: &'a SourceMap) -> Classifier<'a> {
Classifier {
lexer,
codemap,
source_map,
in_attribute: false,
in_macro: false,
in_macro_nonterminal: false,
@ -338,9 +338,9 @@ impl<'a> Classifier<'a> {
out.string(Escape(&self.snip(tas.sp)), klass)
}
// Helper function to get a snippet from the codemap.
// Helper function to get a snippet from the source_map.
fn snip(&self, sp: Span) -> String {
self.codemap.span_to_snippet(sp).unwrap()
self.source_map.span_to_snippet(sp).unwrap()
}
}