about summary refs log tree commit diff
path: root/src/libproc_macro
diff options
context:
space:
mode:
authorDavid Tolnay <dtolnay@gmail.com>2018-01-02 23:37:36 -0800
committerDavid Tolnay <dtolnay@gmail.com>2018-01-02 23:37:36 -0800
commit2b9add2c165c4e397aeb02e1d11c57621ad11dbe (patch)
tree9be4539b881b2e9a2581301b34cf5600a583bca0 /src/libproc_macro
parent0f4ebf9f0a3196420e25cf1558b49ea3f38643c4 (diff)
downloadrust-2b9add2c165c4e397aeb02e1d11c57621ad11dbe.tar.gz
rust-2b9add2c165c4e397aeb02e1d11c57621ad11dbe.zip
Return None from Span::join if in different files
Diffstat (limited to 'src/libproc_macro')
-rw-r--r--src/libproc_macro/lib.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libproc_macro/lib.rs b/src/libproc_macro/lib.rs
index 41ccd88b4a8..386c12ba36d 100644
--- a/src/libproc_macro/lib.rs
+++ b/src/libproc_macro/lib.rs
@@ -247,7 +247,7 @@ impl Span {
     #[unstable(feature = "proc_macro", issue = "38356")]
     pub fn join(&self, other: Span) -> Option<Span> {
         let self_loc = __internal::lookup_char_pos(self.0.lo());
-        let other_loc = __internal::lookup_char_pos(self.0.lo());
+        let other_loc = __internal::lookup_char_pos(other.0.lo());
 
         if self_loc.file.name != other_loc.file.name { return None }