8 files changed, 10 insertions, 10 deletions
diff --git a/src/librustdoc/config.rs b/src/librustdoc/config.rs
index 25a892062fc..4a65a9f431a 100644
--- a/src/librustdoc/config.rs
+++ b/src/librustdoc/config.rs
@@ -15,8 +15,8 @@ use rustc::session::config::{parse_crate_types_from_list, parse_externs, CrateTy
 use rustc::session::config::{CodegenOptions, DebuggingOptions, ErrorOutputType, Externs};
 use rustc::session::search_paths::SearchPath;
 use rustc_driver;
+use rustc_span::edition::{Edition, DEFAULT_EDITION};
 use rustc_target::spec::TargetTriple;
-use syntax::edition::{Edition, DEFAULT_EDITION};
 
 use crate::core::new_handler;
 use crate::externalfiles::ExternalHtml;
diff --git a/src/librustdoc/externalfiles.rs b/src/librustdoc/externalfiles.rs
index ec1c6890230..e0ed02c11c7 100644
--- a/src/librustdoc/externalfiles.rs
+++ b/src/librustdoc/externalfiles.rs
@@ -1,5 +1,5 @@
 use crate::html::markdown::{ErrorCodes, IdMap, Markdown, Playground};
-use crate::syntax::edition::Edition;
+use crate::rustc_span::edition::Edition;
 use errors;
 use rustc_feature::UnstableFeatures;
 use std::fs;
diff --git a/src/librustdoc/html/markdown.rs b/src/librustdoc/html/markdown.rs
index 4250d4305f3..c5f88f9f7f4 100644
--- a/src/librustdoc/html/markdown.rs
+++ b/src/librustdoc/html/markdown.rs
@@ -5,9 +5,9 @@
 //! ```
 //! #![feature(rustc_private)]
 //!
-//! extern crate syntax;
+//! extern crate rustc_span;
 //!
-//! use syntax::edition::Edition;
+//! use rustc_span::edition::Edition;
 //! use rustdoc::html::markdown::{IdMap, Markdown, ErrorCodes};
 //!
 //! let s = "My *markdown* _text_";
@@ -20,6 +20,7 @@
 #![allow(non_camel_case_types)]
 
 use rustc_data_structures::fx::FxHashMap;
+use rustc_span::edition::Edition;
 use std::borrow::Cow;
 use std::cell::RefCell;
 use std::collections::VecDeque;
@@ -27,7 +28,6 @@ use std::default::Default;
 use std::fmt::Write;
 use std::ops::Range;
 use std::str;
-use syntax::edition::Edition;
 
 use crate::html::highlight;
 use crate::html::toc::TocBuilder;
diff --git a/src/librustdoc/html/markdown/tests.rs b/src/librustdoc/html/markdown/tests.rs
index 862c6c56c78..48231ce7b73 100644
--- a/src/librustdoc/html/markdown/tests.rs
+++ b/src/librustdoc/html/markdown/tests.rs
@@ -1,7 +1,7 @@
 use super::plain_summary_line;
 use super::{ErrorCodes, IdMap, Ignore, LangString, Markdown, MarkdownHtml};
+use rustc_span::edition::{Edition, DEFAULT_EDITION};
 use std::cell::RefCell;
-use syntax::edition::{Edition, DEFAULT_EDITION};
 
 #[test]
 fn test_unique_id() {
diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs
index 4758e48241f..ad059463aa4 100644
--- a/src/librustdoc/html/render.rs
+++ b/src/librustdoc/html/render.rs
@@ -50,13 +50,13 @@ use rustc::middle::stability;
 use rustc::util::nodemap::{FxHashMap, FxHashSet};
 use rustc_data_structures::flock;
 use rustc_feature::UnstableFeatures;
+use rustc_span::edition::Edition;
 use rustc_span::hygiene::MacroKind;
 use rustc_span::source_map::FileName;
 use rustc_span::symbol::{sym, Symbol};
 use serde::ser::SerializeSeq;
 use serde::{Serialize, Serializer};
 use syntax::ast;
-use syntax::edition::Edition;
 use syntax::print::pprust;
 
 use crate::clean::{self, AttributesExt, Deprecation, GetDefId, SelfTy};
diff --git a/src/librustdoc/markdown.rs b/src/librustdoc/markdown.rs
index 95edff4ba80..69aa248aa8e 100644
--- a/src/librustdoc/markdown.rs
+++ b/src/librustdoc/markdown.rs
@@ -4,8 +4,8 @@ use std::path::PathBuf;
 
 use errors;
 use rustc_feature::UnstableFeatures;
+use rustc_span::edition::Edition;
 use rustc_span::source_map::DUMMY_SP;
-use syntax::edition::Edition;
 use testing;
 
 use crate::config::{Options, RenderOptions};
diff --git a/src/librustdoc/test.rs b/src/librustdoc/test.rs
index af06effa77d..d7285b9d0bb 100644
--- a/src/librustdoc/test.rs
+++ b/src/librustdoc/test.rs
@@ -5,6 +5,7 @@ use rustc::util::common::ErrorReported;
 use rustc_data_structures::sync::Lrc;
 use rustc_feature::UnstableFeatures;
 use rustc_interface::interface;
+use rustc_span::edition::Edition;
 use rustc_span::source_map::SourceMap;
 use rustc_span::symbol::sym;
 use rustc_span::{BytePos, FileName, Pos, Span, DUMMY_SP};
@@ -16,7 +17,6 @@ use std::path::PathBuf;
 use std::process::{self, Command, Stdio};
 use std::str;
 use syntax::ast;
-use syntax::edition::Edition;
 use syntax::with_globals;
 use tempfile::Builder as TempFileBuilder;
 use testing;
diff --git a/src/librustdoc/test/tests.rs b/src/librustdoc/test/tests.rs
index b041251b7d3..a96186a95e1 100644
--- a/src/librustdoc/test/tests.rs
+++ b/src/librustdoc/test/tests.rs
@@ -1,5 +1,5 @@
 use super::{make_test, TestOptions};
-use syntax::edition::DEFAULT_EDITION;
+use rustc_span::edition::DEFAULT_EDITION;
 
 #[test]
 fn make_test_basic() {