From 5cc3183fc6604ec916f236ecc88c2146cf35d082 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= <matthias.krueger@famsik.de>
Date: Sat, 4 Jan 2020 17:40:50 +0100
Subject: [PATCH] rustup https://github.com/rust-lang/rust/pull/67853

---
 rls-rustc/src/lib.rs   | 2 +-
 rls/src/build/rustc.rs | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/rls-rustc/src/lib.rs b/rls-rustc/src/lib.rs
index b01d22a1548..66b86cab1d8 100644
--- a/rls-rustc/src/lib.rs
+++ b/rls-rustc/src/lib.rs
@@ -5,7 +5,7 @@ extern crate rustc;
 extern crate rustc_driver;
 extern crate rustc_interface;
 extern crate rustc_save_analysis;
-extern crate syntax;
+extern crate rustc_span;
 
 use rustc::session::config::ErrorOutputType;
 use rustc::session::early_error;
diff --git a/rls/src/build/rustc.rs b/rls/src/build/rustc.rs
index 81bb07281aa..7da3a4a4747 100644
--- a/rls/src/build/rustc.rs
+++ b/rls/src/build/rustc.rs
@@ -19,7 +19,7 @@ extern crate rustc_resolve;
 #[allow(unused_extern_crates)]
 extern crate rustc_save_analysis;
 #[allow(unused_extern_crates)]
-extern crate syntax;
+extern crate rustc_span;
 
 use std::collections::{HashMap, HashSet};
 use std::env;
@@ -41,8 +41,8 @@ use self::rustc_interface::interface;
 use self::rustc_interface::Queries;
 use self::rustc_save_analysis as save;
 use self::rustc_save_analysis::CallbackHandler;
-use self::syntax::edition::Edition as RustcEdition;
-use self::syntax::source_map::{FileLoader, RealFileLoader};
+use self::rustc_span::edition::Edition as RustcEdition;
+use self::rustc_span::source_map::{FileLoader, RealFileLoader};
 use crate::build::environment::{Environment, EnvironmentLockFacade};
 use crate::build::plan::{Crate, Edition};
 use crate::build::{BufWriter, BuildResult};