about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorJohn Kåre Alsaker <john.kare.alsaker@gmail.com>2018-03-03 06:26:02 +0100
committerJohn Kåre Alsaker <john.kare.alsaker@gmail.com>2018-03-15 00:43:03 +0100
commit8395ce9451c901a4b5ce3afd916bd20785e6db7f (patch)
tree32efc728b028accb744d455afb1d884ec0b74a2c /src/libsyntax
parenta857e6003e3f1ee1023bb8ec50cf652164bf5e11 (diff)
downloadrust-8395ce9451c901a4b5ce3afd916bd20785e6db7f.tar.gz
rust-8395ce9451c901a4b5ce3afd916bd20785e6db7f.zip
Require the code mapper to be thread-safe
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/json.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/json.rs b/src/libsyntax/json.rs
index eed3c691405..b4f34fb12e3 100644
--- a/src/libsyntax/json.rs
+++ b/src/libsyntax/json.rs
@@ -26,7 +26,7 @@ use errors::{DiagnosticBuilder, SubDiagnostic, CodeSuggestion, CodeMapper};
 use errors::DiagnosticId;
 use errors::emitter::{Emitter, EmitterWriter};
 
-use rustc_data_structures::sync::Lrc;
+use rustc_data_structures::sync::{self, Lrc};
 use std::io::{self, Write};
 use std::vec;
 use std::sync::{Arc, Mutex};
@@ -36,7 +36,7 @@ use rustc_serialize::json::{as_json, as_pretty_json};
 pub struct JsonEmitter {
     dst: Box<Write + Send>,
     registry: Option<Registry>,
-    cm: Lrc<CodeMapper + 'static>,
+    cm: Lrc<CodeMapper + sync::Send + sync::Sync>,
     pretty: bool,
     /// Whether "approximate suggestions" are enabled in the config
     approximate_suggestions: bool,