Rollup merge of #68500 - Mark-Simulacrum:fix-bootstrap-clearing, r=alexcrichton

[rust.git] / src / librustdoc / doctree.rs

diff --git a/src/librustdoc/doctree.rs b/src/librustdoc/doctree.rs
index 46eddede0d518c5924667885db820d7c32dfcbed..218674b757f39686bb258a7ca660b1afce201e73 100644 (file)
--- a/src/librustdoc/doctree.rs
+++ b/src/librustdoc/doctree.rs
@@ -2,13 +2,13 @@
 //! 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;
+use rustc_hir as hir;
+use rustc_hir::def_id::CrateNum;
 
 pub struct Module<'hir> {
     pub name: Option<Name>,
@@ -47,8 +47,8 @@ pub fn new(
             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(),
@@ -203,6 +203,7 @@ pub struct Impl<'hir> {
     pub unsafety: hir::Unsafety,
     pub polarity: hir::ImplPolarity,
     pub defaultness: hir::Defaultness,
+    pub constness: ast::Constness,
     pub generics: &'hir hir::Generics<'hir>,
     pub trait_: &'hir Option<hir::TraitRef<'hir>>,
     pub for_: &'hir hir::Ty<'hir>,
@@ -230,7 +231,7 @@ pub struct Macro<'hir> {
     pub def_id: hir::def_id::DefId,
     pub attrs: &'hir [ast::Attribute],
     pub whence: Span,
-    pub matchers: hir::HirVec<Span>,
+    pub matchers: Vec<Span>,
     pub imported_from: Option<Name>,
 }