X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Flibrustdoc%2Fdoctree.rs;h=218674b757f39686bb258a7ca660b1afce201e73;hb=7f8a61d96c5a628ffb88304eb84a85140479ecad;hp=07a3f663145224236548ee0d67396d8a6b78e892;hpb=529a42a1a6b6523e8376610556d9890479b9524c;p=rust.git diff --git a/src/librustdoc/doctree.rs b/src/librustdoc/doctree.rs index 07a3f663145..218674b757f 100644 --- 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, @@ -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>, pub for_: &'hir hir::Ty<'hir>,