Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/librustdoc/scrape_examples.rs
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,8 @@ where
return;
}

let file = tcx.sess.source_map().lookup_char_pos(span.lo()).file;
let source_map = tcx.sess.source_map();
let file = source_map.lookup_char_pos(span.lo()).file;
let file_path = match file.name.clone() {
FileName::Real(real_filename) => real_filename.into_local_path(),
_ => None,
Expand All @@ -217,6 +218,8 @@ where
let fn_entries = self.calls.entry(fn_key).or_default();

trace!("Including expr: {:?}", span);
let enclosing_item_span =
source_map.span_extend_to_prev_char(enclosing_item_span, '\n', false);
let location = CallLocation::new(span, enclosing_item_span, &file);
fn_entries.entry(abs_path).or_insert_with(mk_call_data).locations.push(location);
}
Expand Down
5 changes: 5 additions & 0 deletions src/test/run-make/rustdoc-scrape-examples-whitespace/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
deps := ex

-include ../rustdoc-scrape-examples-multiple/scrape.mk

all: scrape
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
struct Foo;
impl Foo {
fn bar() { foobar::ok(); }
}

fn main() {
Foo::bar();
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// @has foobar/fn.ok.html '//*[@class="docblock scraped-example-list"]//code' ' '

pub fn ok() {}