diff options
| author | bors <bors@rust-lang.org> | 2019-05-28 23:07:19 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-05-28 23:07:19 +0000 |
| commit | 4b9d80325a65b0375eea526409a0f3aaf1cbc23c (patch) | |
| tree | eed0f81053a76faca4275c4fba888362e2ea8896 /src/libsyntax/source_map.rs | |
| parent | 721268583759224d0f6476e0b8b196cc8afbdea0 (diff) | |
| parent | 9121a73ab1d474d5cdba44b566c782eb2581e60b (diff) | |
| download | rust-4b9d80325a65b0375eea526409a0f3aaf1cbc23c.tar.gz rust-4b9d80325a65b0375eea526409a0f3aaf1cbc23c.zip | |
Auto merge of #61296 - Centril:rollup-5ad68b0, r=Centril
Rollup of 9 pull requests Successful merges: - #60742 (Allow const parameters in array sizes to be unified) - #60756 (Add better tests for hidden lifetimes in impl trait) - #60928 (Changes the type `mir::Mir` into `mir::Body`) - #61024 (tests: Centralize proc macros commonly used for testing) - #61157 (BufReader: In Seek impl, remove extra discard_buffer call) - #61195 (Special-case `.llvm` in mangler) - #61202 (Print PermissionExt::mode() in octal in Documentation Examples) - #61259 (Mailmap fixes) - #61273 (mention that MaybeUninit is a bit like Option) Failed merges: r? @ghost
Diffstat (limited to 'src/libsyntax/source_map.rs')
| -rw-r--r-- | src/libsyntax/source_map.rs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/libsyntax/source_map.rs b/src/libsyntax/source_map.rs index 8a210db9185..e2171a84e23 100644 --- a/src/libsyntax/source_map.rs +++ b/src/libsyntax/source_map.rs @@ -727,6 +727,11 @@ impl SourceMap { debug!("find_width_of_character_at_span: local_begin=`{:?}`, local_end=`{:?}`", local_begin, local_end); + if local_begin.sf.start_pos != local_end.sf.start_pos { + debug!("find_width_of_character_at_span: begin and end are in different files"); + return 1; + } + let start_index = local_begin.pos.to_usize(); let end_index = local_end.pos.to_usize(); debug!("find_width_of_character_at_span: start_index=`{:?}`, end_index=`{:?}`", |