about summary refs log tree commit diff
path: root/src/librustdoc/html
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2020-01-01 19:25:28 +0100
committerMazdak Farrokhzad <twingoow@gmail.com>2020-01-02 13:57:04 +0100
commit75e4783f63fc7a788d8dff47504b29dcd63d97fe (patch)
treead3199f1bb8f8e6a1a7b68ff7d1994017f8ef914 /src/librustdoc/html
parent766fba3fdca8fe075c370a63d2f76f8407483af5 (diff)
downloadrust-75e4783f63fc7a788d8dff47504b29dcd63d97fe.tar.gz
rust-75e4783f63fc7a788d8dff47504b29dcd63d97fe.zip
Normalize `syntax::source_map` imports.
Diffstat (limited to 'src/librustdoc/html')
-rw-r--r--src/librustdoc/html/highlight.rs2
-rw-r--r--src/librustdoc/html/render.rs2
-rw-r--r--src/librustdoc/html/render/cache.rs2
-rw-r--r--src/librustdoc/html/sources.rs2
4 files changed, 4 insertions, 4 deletions
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,