Normalize `syntax::source_map` imports.

10 files changed, 12 insertions, 11 deletions

diff --git a/src/librustdoc/clean/types.rs b/src/librustdoc/clean/types.rs
index 0c4323a62f5..6dd89dbd7f1 100644
--- a/src/librustdoc/clean/types.rs
+++ b/src/librustdoc/clean/types.rs
@@ -17,12 +17,12 @@ use rustc::ty::layout::VariantIdx;
 use rustc::util::nodemap::{FxHashMap, FxHashSet};
 use rustc_index::vec::IndexVec;
 use rustc_span::hygiene::MacroKind;
+use rustc_span::source_map::DUMMY_SP;
 use rustc_span::symbol::{sym, Symbol};
 use rustc_span::{self, FileName};
 use rustc_target::spec::abi::Abi;
 use syntax::ast::{self, AttrStyle, Ident};
 use syntax::attr;
-use syntax::source_map::DUMMY_SP;
 use syntax::util::comments::strip_doc_comment_decoration;
 
 use crate::clean::cfg::Cfg;
diff --git a/src/librustdoc/core.rs b/src/librustdoc/core.rs
index bd19eeecf77..cac3480f28d 100644
--- a/src/librustdoc/core.rs
+++ b/src/librustdoc/core.rs
@@ -17,10 +17,10 @@ use rustc_resolve as resolve;
 
 use errors::emitter::{Emitter, EmitterWriter};
 use errors::json::JsonEmitter;
+use rustc_span::source_map;
 use rustc_span::DUMMY_SP;
 use syntax::ast::CRATE_NODE_ID;
 use syntax::attr;
-use syntax::source_map;
 use syntax::symbol::sym;
 
 use rustc_data_structures::sync::{self, Lrc};
diff --git a/src/librustdoc/html/highlight.rs b/src/librustdoc/html/highlight.rs
index d8786a5e10e..bf8a8fcd3a3 100644
--- a/src/librustdoc/html/highlight.rs
+++ b/src/librustdoc/html/highlight.rs
@@ -12,9 +12,9 @@ use std::io;
 use std::io::prelude::*;
 
 use rustc_parse::lexer;
+use rustc_span::source_map::SourceMap;
 use rustc_span::{FileName, Span};
 use syntax::sess::ParseSess;
-use syntax::source_map::SourceMap;
 use syntax::symbol::{kw, sym};
 use syntax::token::{self, Token};
 
diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs
index 2c41e91b01b..32d42b9c734 100644
--- a/src/librustdoc/html/render.rs
+++ b/src/librustdoc/html/render.rs
@@ -51,12 +51,12 @@ use rustc::util::nodemap::{FxHashMap, FxHashSet};
 use rustc_data_structures::flock;
 use rustc_feature::UnstableFeatures;
 use rustc_span::hygiene::MacroKind;
+use rustc_span::source_map::FileName;
 use serde::ser::SerializeSeq;
 use serde::{Serialize, Serializer};
 use syntax::ast;
 use syntax::edition::Edition;
 use syntax::print::pprust;
-use syntax::source_map::FileName;
 use syntax::symbol::{sym, Symbol};
 
 use crate::clean::{self, AttributesExt, Deprecation, GetDefId, SelfTy};
diff --git a/src/librustdoc/html/render/cache.rs b/src/librustdoc/html/render/cache.rs
index d30c9a3d333..04e7c3a6161 100644
--- a/src/librustdoc/html/render/cache.rs
+++ b/src/librustdoc/html/render/cache.rs
@@ -3,10 +3,10 @@ use crate::fold::DocFolder;
 use rustc::hir::def_id::{CrateNum, DefId, CRATE_DEF_INDEX};
 use rustc::middle::privacy::AccessLevels;
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
+use rustc_span::source_map::FileName;
 use std::collections::BTreeMap;
 use std::mem;
 use std::path::{Path, PathBuf};
-use syntax::source_map::FileName;
 use syntax::symbol::sym;
 
 use serde::Serialize;
diff --git a/src/librustdoc/html/sources.rs b/src/librustdoc/html/sources.rs
index 717fc7fbabd..79e7d3d783b 100644
--- a/src/librustdoc/html/sources.rs
+++ b/src/librustdoc/html/sources.rs
@@ -5,10 +5,10 @@ use crate::html::format::Buffer;
 use crate::html::highlight;
 use crate::html::layout;
 use crate::html::render::{Error, SharedContext, BASIC_KEYWORDS};
+use rustc_span::source_map::FileName;
 use std::ffi::OsStr;
 use std::fs;
 use std::path::{Component, Path, PathBuf};
-use syntax::source_map::FileName;
 
 crate fn render(
     dst: &Path,
diff --git a/src/librustdoc/markdown.rs b/src/librustdoc/markdown.rs
index 35424ffbe0c..95edff4ba80 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::source_map::DUMMY_SP;
 use syntax::edition::Edition;
-use syntax::source_map::DUMMY_SP;
 use testing;
 
 use crate::config::{Options, RenderOptions};
diff --git a/src/librustdoc/passes/check_code_block_syntax.rs b/src/librustdoc/passes/check_code_block_syntax.rs
index 2b320b61047..b568d034d89 100644
--- a/src/librustdoc/passes/check_code_block_syntax.rs
+++ b/src/librustdoc/passes/check_code_block_syntax.rs
@@ -1,8 +1,8 @@
 use errors::Applicability;
 use rustc_parse::lexer::StringReader as Lexer;
+use rustc_span::source_map::FilePathMapping;
 use rustc_span::{FileName, InnerSpan};
 use syntax::sess::ParseSess;
-use syntax::source_map::FilePathMapping;
 use syntax::token;
 
 use crate::clean;
diff --git a/src/librustdoc/test.rs b/src/librustdoc/test.rs
index 0066d36d55f..312c6dad822 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::source_map::SourceMap;
 use rustc_span::{BytePos, FileName, Pos, Span, DUMMY_SP};
 use rustc_target::spec::TargetTriple;
 use std::env;
@@ -15,7 +16,6 @@ use std::process::{self, Command, Stdio};
 use std::str;
 use syntax::ast;
 use syntax::edition::Edition;
-use syntax::source_map::SourceMap;
 use syntax::symbol::sym;
 use syntax::with_globals;
 use tempfile::Builder as TempFileBuilder;
@@ -402,10 +402,11 @@ pub fn make_test(
     // Uses libsyntax to parse the doctest and find if there's a main fn and the extern
     // crate already is included.
     let (already_has_main, already_has_extern_crate, found_macro) = with_globals(edition, || {
-        use crate::syntax::{sess::ParseSess, source_map::FilePathMapping};
         use errors::emitter::EmitterWriter;
         use errors::Handler;
         use rustc_parse::maybe_new_parser_from_source_str;
+        use rustc_span::source_map::FilePathMapping;
+        use syntax::sess::ParseSess;
 
         let filename = FileName::anon_source_code(s);
         let source = crates + &everything_else;
diff --git a/src/librustdoc/visit_ast.rs b/src/librustdoc/visit_ast.rs
index 4722539fd84..c7a1739bb91 100644
--- a/src/librustdoc/visit_ast.rs
+++ b/src/librustdoc/visit_ast.rs
@@ -8,9 +8,9 @@ use rustc::middle::privacy::AccessLevel;
 use rustc::ty::TyCtxt;
 use rustc::util::nodemap::{FxHashMap, FxHashSet};
 use rustc_span::hygiene::MacroKind;
+use rustc_span::source_map::Spanned;
 use rustc_span::{self, Span};
 use syntax::ast;
-use syntax::source_map::Spanned;
 use syntax::symbol::sym;
 
 use std::mem;