about summary refs log tree commit diff
path: root/src/librustdoc
diff options
context:
space:
mode:
Diffstat (limited to 'src/librustdoc')
-rw-r--r--src/librustdoc/clean/blanket_impl.rs2
-rw-r--r--src/librustdoc/clean/cfg.rs2
-rw-r--r--src/librustdoc/clean/cfg/tests.rs2
-rw-r--r--src/librustdoc/clean/inline.rs4
-rw-r--r--src/librustdoc/clean/mod.rs8
-rw-r--r--src/librustdoc/clean/types.rs22
-rw-r--r--src/librustdoc/clean/utils.rs6
-rw-r--r--src/librustdoc/core.rs2
-rw-r--r--src/librustdoc/doctree.rs8
-rw-r--r--src/librustdoc/html/highlight.rs2
-rw-r--r--src/librustdoc/html/item_type.rs2
-rw-r--r--src/librustdoc/html/render.rs2
-rw-r--r--src/librustdoc/lib.rs2
-rw-r--r--src/librustdoc/passes/calculate_doc_coverage.rs2
-rw-r--r--src/librustdoc/passes/check_code_block_syntax.rs2
-rw-r--r--src/librustdoc/passes/collect_intra_doc_links.rs2
-rw-r--r--src/librustdoc/passes/mod.rs2
-rw-r--r--src/librustdoc/test.rs2
-rw-r--r--src/librustdoc/visit_ast.rs6
19 files changed, 40 insertions, 40 deletions
diff --git a/src/librustdoc/clean/blanket_impl.rs b/src/librustdoc/clean/blanket_impl.rs
index b2c39be5d00..635713bdf1d 100644
--- a/src/librustdoc/clean/blanket_impl.rs
+++ b/src/librustdoc/clean/blanket_impl.rs
@@ -4,7 +4,7 @@ use rustc::infer::InferOk;
 use rustc::traits;
 use rustc::ty::subst::Subst;
 use rustc::ty::ToPredicate;
-use syntax_pos::DUMMY_SP;
+use rustc_span::DUMMY_SP;
 
 use super::*;
 
diff --git a/src/librustdoc/clean/cfg.rs b/src/librustdoc/clean/cfg.rs
index ad1886df664..8b739b704fb 100644
--- a/src/librustdoc/clean/cfg.rs
+++ b/src/librustdoc/clean/cfg.rs
@@ -12,7 +12,7 @@ use syntax::ast::{LitKind, MetaItem, MetaItemKind, NestedMetaItem};
 use syntax::sess::ParseSess;
 use syntax::symbol::{sym, Symbol};
 
-use syntax_pos::Span;
+use rustc_span::Span;
 
 use crate::html::escape::Escape;
 
diff --git a/src/librustdoc/clean/cfg/tests.rs b/src/librustdoc/clean/cfg/tests.rs
index 620b3d92899..3ea971e3138 100644
--- a/src/librustdoc/clean/cfg/tests.rs
+++ b/src/librustdoc/clean/cfg/tests.rs
@@ -1,10 +1,10 @@
 use super::*;
 
+use rustc_span::DUMMY_SP;
 use syntax::ast::*;
 use syntax::attr;
 use syntax::symbol::Symbol;
 use syntax::with_default_globals;
-use syntax_pos::DUMMY_SP;
 
 fn word_cfg(s: &str) -> Cfg {
     Cfg::Cfg(Symbol::intern(s), None)
diff --git a/src/librustdoc/clean/inline.rs b/src/librustdoc/clean/inline.rs
index e12d9affdfa..d3169de632e 100644
--- a/src/librustdoc/clean/inline.rs
+++ b/src/librustdoc/clean/inline.rs
@@ -2,10 +2,10 @@
 
 use std::iter::once;
 
+use rustc_span::hygiene::MacroKind;
+use rustc_span::Span;
 use syntax::ast;
 use syntax::symbol::sym;
-use syntax_pos::hygiene::MacroKind;
-use syntax_pos::Span;
 
 use rustc::hir::def::{CtorKind, DefKind, Res};
 use rustc::hir::def_id::DefId;
diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs
index defdeb52186..0ba7370f3eb 100644
--- a/src/librustdoc/clean/mod.rs
+++ b/src/librustdoc/clean/mod.rs
@@ -21,12 +21,12 @@ use rustc::ty::subst::InternalSubsts;
 use rustc::ty::{self, AdtKind, Lift, Ty, TyCtxt};
 use rustc::util::nodemap::{FxHashMap, FxHashSet};
 use rustc_index::vec::{Idx, IndexVec};
+use rustc_span::hygiene::MacroKind;
+use rustc_span::symbol::{kw, sym};
+use rustc_span::{self, Pos};
 use rustc_typeck::hir_ty_to_ty;
 use syntax::ast::{self, Ident};
 use syntax::attr;
-use syntax_pos::hygiene::MacroKind;
-use syntax_pos::symbol::{kw, sym};
-use syntax_pos::{self, Pos};
 
 use std::collections::hash_map::Entry;
 use std::default::Default;
@@ -1903,7 +1903,7 @@ impl Clean<VariantKind> for hir::VariantData<'_> {
     }
 }
 
-impl Clean<Span> for syntax_pos::Span {
+impl Clean<Span> for rustc_span::Span {
     fn clean(&self, cx: &DocContext<'_>) -> Span {
         if self.is_dummy() {
             return Span::empty();
diff --git a/src/librustdoc/clean/types.rs b/src/librustdoc/clean/types.rs
index a8781604622..0c4323a62f5 100644
--- a/src/librustdoc/clean/types.rs
+++ b/src/librustdoc/clean/types.rs
@@ -16,14 +16,14 @@ use rustc::middle::stability;
 use rustc::ty::layout::VariantIdx;
 use rustc::util::nodemap::{FxHashMap, FxHashSet};
 use rustc_index::vec::IndexVec;
+use rustc_span::hygiene::MacroKind;
+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 syntax_pos::hygiene::MacroKind;
-use syntax_pos::symbol::{sym, Symbol};
-use syntax_pos::{self, FileName};
 
 use crate::clean::cfg::Cfg;
 use crate::clean::external_path;
@@ -360,12 +360,12 @@ impl<I: IntoIterator<Item = ast::NestedMetaItem>> NestedAttributesExt for I {
 #[derive(Clone, PartialEq, Eq, Debug, Hash)]
 pub enum DocFragment {
     /// A doc fragment created from a `///` or `//!` doc comment.
-    SugaredDoc(usize, syntax_pos::Span, String),
+    SugaredDoc(usize, rustc_span::Span, String),
     /// A doc fragment created from a "raw" `#[doc=""]` attribute.
-    RawDoc(usize, syntax_pos::Span, String),
+    RawDoc(usize, rustc_span::Span, String),
     /// A doc fragment created from a `#[doc(include="filename")]` attribute. Contains both the
     /// given filename and the file contents.
-    Include(usize, syntax_pos::Span, String, String),
+    Include(usize, rustc_span::Span, String, String),
 }
 
 impl DocFragment {
@@ -377,7 +377,7 @@ impl DocFragment {
         }
     }
 
-    pub fn span(&self) -> syntax_pos::Span {
+    pub fn span(&self) -> rustc_span::Span {
         match *self {
             DocFragment::SugaredDoc(_, span, _)
             | DocFragment::RawDoc(_, span, _)
@@ -411,7 +411,7 @@ pub struct Attributes {
     pub doc_strings: Vec<DocFragment>,
     pub other_attrs: Vec<ast::Attribute>,
     pub cfg: Option<Arc<Cfg>>,
-    pub span: Option<syntax_pos::Span>,
+    pub span: Option<rustc_span::Span>,
     /// map from Rust paths to resolved defs and potential URL fragments
     pub links: Vec<(String, Option<DefId>, Option<String>)>,
     pub inner_docs: bool,
@@ -1349,7 +1349,7 @@ pub struct Span {
     pub locol: usize,
     pub hiline: usize,
     pub hicol: usize,
-    pub original: syntax_pos::Span,
+    pub original: rustc_span::Span,
 }
 
 impl Span {
@@ -1360,11 +1360,11 @@ impl Span {
             locol: 0,
             hiline: 0,
             hicol: 0,
-            original: syntax_pos::DUMMY_SP,
+            original: rustc_span::DUMMY_SP,
         }
     }
 
-    pub fn span(&self) -> syntax_pos::Span {
+    pub fn span(&self) -> rustc_span::Span {
         self.original
     }
 }
diff --git a/src/librustdoc/clean/utils.rs b/src/librustdoc/clean/utils.rs
index e52afe501c3..be4ae1c9119 100644
--- a/src/librustdoc/clean/utils.rs
+++ b/src/librustdoc/clean/utils.rs
@@ -16,9 +16,9 @@ use rustc::mir::interpret::{sign_extend, ConstValue, Scalar};
 use rustc::ty::subst::{GenericArgKind, SubstsRef};
 use rustc::ty::{self, DefIdTree, Ty};
 use rustc::util::nodemap::FxHashSet;
+use rustc_span;
+use rustc_span::symbol::{kw, sym, Symbol};
 use std::mem;
-use syntax_pos;
-use syntax_pos::symbol::{kw, sym, Symbol};
 
 pub fn krate(mut cx: &mut DocContext<'_>) -> Crate {
     use crate::visit_lib::LibEmbargoVisitor;
@@ -399,7 +399,7 @@ pub trait ToSource {
     fn to_src(&self, cx: &DocContext<'_>) -> String;
 }
 
-impl ToSource for syntax_pos::Span {
+impl ToSource for rustc_span::Span {
     fn to_src(&self, cx: &DocContext<'_>) -> String {
         debug!("converting span {:?} to snippet", self.clean(cx));
         let sn = match cx.sess().source_map().span_to_snippet(*self) {
diff --git a/src/librustdoc/core.rs b/src/librustdoc/core.rs
index 62218d80785..bd19eeecf77 100644
--- a/src/librustdoc/core.rs
+++ b/src/librustdoc/core.rs
@@ -17,11 +17,11 @@ use rustc_resolve as resolve;
 
 use errors::emitter::{Emitter, EmitterWriter};
 use errors::json::JsonEmitter;
+use rustc_span::DUMMY_SP;
 use syntax::ast::CRATE_NODE_ID;
 use syntax::attr;
 use syntax::source_map;
 use syntax::symbol::sym;
-use syntax_pos::DUMMY_SP;
 
 use rustc_data_structures::sync::{self, Lrc};
 use std::cell::RefCell;
diff --git a/src/librustdoc/doctree.rs b/src/librustdoc/doctree.rs
index 07a3f663145..81f2db91fd5 100644
--- a/src/librustdoc/doctree.rs
+++ b/src/librustdoc/doctree.rs
@@ -2,10 +2,10 @@
 //! manner (and with prettier names) before cleaning.
 pub use self::StructType::*;
 
+use rustc_span::hygiene::MacroKind;
+use rustc_span::{self, Span};
 use syntax::ast;
 use syntax::ast::Name;
-use syntax_pos::hygiene::MacroKind;
-use syntax_pos::{self, Span};
 
 use rustc::hir;
 use rustc::hir::def_id::CrateNum;
@@ -47,8 +47,8 @@ impl Module<'hir> {
             name: name,
             id: hir::CRATE_HIR_ID,
             vis,
-            where_outer: syntax_pos::DUMMY_SP,
-            where_inner: syntax_pos::DUMMY_SP,
+            where_outer: rustc_span::DUMMY_SP,
+            where_inner: rustc_span::DUMMY_SP,
             attrs,
             extern_crates: Vec::new(),
             imports: Vec::new(),
diff --git a/src/librustdoc/html/highlight.rs b/src/librustdoc/html/highlight.rs
index a2261edffff..d8786a5e10e 100644
--- a/src/librustdoc/html/highlight.rs
+++ b/src/librustdoc/html/highlight.rs
@@ -12,11 +12,11 @@ use std::io;
 use std::io::prelude::*;
 
 use rustc_parse::lexer;
+use rustc_span::{FileName, Span};
 use syntax::sess::ParseSess;
 use syntax::source_map::SourceMap;
 use syntax::symbol::{kw, sym};
 use syntax::token::{self, Token};
-use syntax_pos::{FileName, Span};
 
 /// Highlights `src`, returning the HTML output.
 pub fn render_with_highlighting(
diff --git a/src/librustdoc/html/item_type.rs b/src/librustdoc/html/item_type.rs
index 19cf7180eee..4a0f4e5a4c9 100644
--- a/src/librustdoc/html/item_type.rs
+++ b/src/librustdoc/html/item_type.rs
@@ -4,7 +4,7 @@ use std::fmt;
 
 use serde::{Serialize, Serializer};
 
-use syntax_pos::hygiene::MacroKind;
+use rustc_span::hygiene::MacroKind;
 
 use crate::clean;
 
diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs
index b578e69e60b..2c41e91b01b 100644
--- a/src/librustdoc/html/render.rs
+++ b/src/librustdoc/html/render.rs
@@ -50,6 +50,7 @@ use rustc::middle::stability;
 use rustc::util::nodemap::{FxHashMap, FxHashSet};
 use rustc_data_structures::flock;
 use rustc_feature::UnstableFeatures;
+use rustc_span::hygiene::MacroKind;
 use serde::ser::SerializeSeq;
 use serde::{Serialize, Serializer};
 use syntax::ast;
@@ -57,7 +58,6 @@ use syntax::edition::Edition;
 use syntax::print::pprust;
 use syntax::source_map::FileName;
 use syntax::symbol::{sym, Symbol};
-use syntax_pos::hygiene::MacroKind;
 
 use crate::clean::{self, AttributesExt, Deprecation, GetDefId, SelfTy};
 use crate::config::RenderOptions;
diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs
index b0496dabc72..998b28b8807 100644
--- a/src/librustdoc/lib.rs
+++ b/src/librustdoc/lib.rs
@@ -34,7 +34,7 @@ extern crate rustc_lint;
 extern crate rustc_metadata;
 extern crate rustc_parse;
 extern crate rustc_resolve;
-extern crate rustc_span as syntax_pos;
+extern crate rustc_span as rustc_span;
 extern crate rustc_target;
 extern crate rustc_typeck;
 extern crate syntax;
diff --git a/src/librustdoc/passes/calculate_doc_coverage.rs b/src/librustdoc/passes/calculate_doc_coverage.rs
index 75f874d8327..7432e8b0ce0 100644
--- a/src/librustdoc/passes/calculate_doc_coverage.rs
+++ b/src/librustdoc/passes/calculate_doc_coverage.rs
@@ -3,9 +3,9 @@ use crate::core::DocContext;
 use crate::fold::{self, DocFolder};
 use crate::passes::Pass;
 
+use rustc_span::FileName;
 use syntax::attr;
 use syntax::symbol::sym;
-use syntax_pos::FileName;
 
 use std::collections::BTreeMap;
 use std::ops;
diff --git a/src/librustdoc/passes/check_code_block_syntax.rs b/src/librustdoc/passes/check_code_block_syntax.rs
index 7bbed4af238..2b320b61047 100644
--- a/src/librustdoc/passes/check_code_block_syntax.rs
+++ b/src/librustdoc/passes/check_code_block_syntax.rs
@@ -1,9 +1,9 @@
 use errors::Applicability;
 use rustc_parse::lexer::StringReader as Lexer;
+use rustc_span::{FileName, InnerSpan};
 use syntax::sess::ParseSess;
 use syntax::source_map::FilePathMapping;
 use syntax::token;
-use syntax_pos::{FileName, InnerSpan};
 
 use crate::clean;
 use crate::core::DocContext;
diff --git a/src/librustdoc/passes/collect_intra_doc_links.rs b/src/librustdoc/passes/collect_intra_doc_links.rs
index 75a87e7cc5d..7b89738b43c 100644
--- a/src/librustdoc/passes/collect_intra_doc_links.rs
+++ b/src/librustdoc/passes/collect_intra_doc_links.rs
@@ -11,10 +11,10 @@ use rustc::ty;
 use rustc_expand::base::SyntaxExtensionKind;
 use rustc_feature::UnstableFeatures;
 use rustc_resolve::ParentScope;
+use rustc_span::DUMMY_SP;
 use syntax;
 use syntax::ast::{self, Ident};
 use syntax::symbol::Symbol;
-use syntax_pos::DUMMY_SP;
 
 use std::ops::Range;
 
diff --git a/src/librustdoc/passes/mod.rs b/src/librustdoc/passes/mod.rs
index b69207be3fb..7ac3009d827 100644
--- a/src/librustdoc/passes/mod.rs
+++ b/src/librustdoc/passes/mod.rs
@@ -5,9 +5,9 @@ use rustc::hir::def_id::DefId;
 use rustc::lint;
 use rustc::middle::privacy::AccessLevels;
 use rustc::util::nodemap::DefIdSet;
+use rustc_span::{InnerSpan, Span, DUMMY_SP};
 use std::mem;
 use std::ops::Range;
-use syntax_pos::{InnerSpan, Span, DUMMY_SP};
 
 use crate::clean::{self, GetDefId, Item};
 use crate::core::DocContext;
diff --git a/src/librustdoc/test.rs b/src/librustdoc/test.rs
index f8ae044c8db..0066d36d55f 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::{BytePos, FileName, Pos, Span, DUMMY_SP};
 use rustc_target::spec::TargetTriple;
 use std::env;
 use std::io::{self, Write};
@@ -17,7 +18,6 @@ use syntax::edition::Edition;
 use syntax::source_map::SourceMap;
 use syntax::symbol::sym;
 use syntax::with_globals;
-use syntax_pos::{BytePos, FileName, Pos, Span, DUMMY_SP};
 use tempfile::Builder as TempFileBuilder;
 use testing;
 
diff --git a/src/librustdoc/visit_ast.rs b/src/librustdoc/visit_ast.rs
index 642e949e984..4722539fd84 100644
--- a/src/librustdoc/visit_ast.rs
+++ b/src/librustdoc/visit_ast.rs
@@ -7,11 +7,11 @@ use rustc::hir::{self, Node};
 use rustc::middle::privacy::AccessLevel;
 use rustc::ty::TyCtxt;
 use rustc::util::nodemap::{FxHashMap, FxHashSet};
+use rustc_span::hygiene::MacroKind;
+use rustc_span::{self, Span};
 use syntax::ast;
 use syntax::source_map::Spanned;
 use syntax::symbol::sym;
-use syntax_pos::hygiene::MacroKind;
-use syntax_pos::{self, Span};
 
 use std::mem;
 
@@ -65,7 +65,7 @@ impl<'a, 'tcx> RustdocVisitor<'a, 'tcx> {
         let mut module = self.visit_mod_contents(
             krate.span,
             krate.attrs,
-            &Spanned { span: syntax_pos::DUMMY_SP, node: hir::VisibilityKind::Public },
+            &Spanned { span: rustc_span::DUMMY_SP, node: hir::VisibilityKind::Public },
             hir::CRATE_HIR_ID,
             &krate.module,
             None,
generated by cgit-pink 1.4.1-3-g733a5 (git 2.37.1) at 2026-07-15 07:26:18 +0000