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:09 +02:00
parent 82607d2cf3
commit d3fe97f3d3
78 changed files with 209 additions and 209 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/librustc_codegen_llvm/debuginfo/source_loc.rs
View file

@ -40,7 +40,7 @@ pub fn set_source_location(
};
let dbg_loc = if function_debug_context.source_locations_enabled.get() {
debug!("set_source_location: {}", bx.sess().codemap().span_to_string(span));
debug!("set_source_location: {}", bx.sess().source_map().span_to_string(span));
let loc = span_start(bx.cx, span);
InternalDebugLocation::new(scope.unwrap(), loc.line, loc.col.to_usize())
} else {

2
src/librustc_codegen_llvm/debuginfo/utils.rs
View file

@ -47,7 +47,7 @@ pub fn create_DIArray(
/// Return syntax_pos::Loc corresponding to the beginning of the span
pub fn span_start(cx: &CodegenCx, span: Span) -> syntax_pos::Loc {
cx.sess().codemap().lookup_char_pos(span.lo())
cx.sess().source_map().lookup_char_pos(span.lo())
}
#[inline]

2
src/librustc_codegen_llvm/mir/block.rs
View file

@ -359,7 +359,7 @@ impl FunctionCx<'a, 'll, 'tcx> {
self.set_debug_loc(&bx, terminator.source_info);
// Get the location information.
let loc = bx.sess().codemap().lookup_char_pos(span.lo());
let loc = bx.sess().source_map().lookup_char_pos(span.lo());
let filename = Symbol::intern(&loc.file.name.to_string()).as_str();
let filename = C_str_slice(bx.cx, filename);
let line = C_u32(bx.cx, loc.line as u32);

2
src/librustc_codegen_llvm/mir/mod.rs
View file

@ -166,7 +166,7 @@ impl FunctionCx<'a, 'll, 'tcx> {
let scope_metadata = self.scopes[scope_id].scope_metadata;
if pos < self.scopes[scope_id].file_start_pos ||
pos >= self.scopes[scope_id].file_end_pos {
let cm = self.cx.sess().codemap();
let cm = self.cx.sess().source_map();
let defining_crate = self.debug_context.get_ref(DUMMY_SP).defining_crate;
Some(debuginfo::extend_scope_to_file(self.cx,
scope_metadata.unwrap(),