about summary refs log tree commit diff
path: root/src/libsyntax/errors
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-05-19 09:45:53 -0700
committerbors <bors@rust-lang.org>2016-05-19 09:45:53 -0700
commit764ef92ae7a26cbb9c2121de3812a0a17739f65f (patch)
treef3da197cb2dd98e06ec2c6937508f7f960d86b1a /src/libsyntax/errors
parent2fb6f8e2c94a7041877ed8460f2621974c5233f7 (diff)
parentacd2c11c5e8427c38471dd9d6aee8a347a612f27 (diff)
downloadrust-764ef92ae7a26cbb9c2121de3812a0a17739f65f.tar.gz
rust-764ef92ae7a26cbb9c2121de3812a0a17739f65f.zip
Auto merge of #33742 - Manishearth:rollup, r=Manishearth
Rollup of 10 pull requests

- Successful merges: #33353, #33611, #33696, #33698, #33705, #33708, #33712, #33720, #33721, #33730
- Failed merges:
Diffstat (limited to 'src/libsyntax/errors')
-rw-r--r--src/libsyntax/errors/emitter.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/errors/emitter.rs b/src/libsyntax/errors/emitter.rs
index 8d0c93f21b2..7c9985d7d23 100644
--- a/src/libsyntax/errors/emitter.rs
+++ b/src/libsyntax/errors/emitter.rs
@@ -423,7 +423,7 @@ impl EmitterWriter {
                     &format!(" (defined in {})",
                         self.cm.span_to_filename(def_site_span)));
             }
-            let snippet = self.cm.span_to_string(sp);
+            let snippet = self.cm.span_to_string(trace.call_site);
             print_diagnostic(&mut self.dst, &snippet, Note, &diag_string, None)?;
         }
         Ok(())