pub enum AnnNode<'a> {
Name(&'a ast::Name),
Block(&'a hir::Block),
- Item(&'a hir::Item),
+ Item(&'a hir::Item<'a>),
SubItem(hir::HirId),
Expr(&'a hir::Expr),
Pat(&'a hir::Pat),
}
fn post(&self, _state: &mut State<'_>, _node: AnnNode<'_>) {
}
- fn try_fetch_item(&self, _: hir::HirId) -> Option<&hir::Item> {
+ fn try_fetch_item(&self, _: hir::HirId) -> Option<&hir::Item<'_>> {
None
}
}
impl PpAnn for NoAnn {}
pub const NO_ANN: &dyn PpAnn = &NoAnn;
-impl PpAnn for hir::Crate {
- fn try_fetch_item(&self, item: hir::HirId) -> Option<&hir::Item> {
+impl PpAnn for hir::Crate<'a> {
+ fn try_fetch_item(&self, item: hir::HirId) -> Option<&hir::Item<'_>> {
Some(self.item(item))
}
fn nested(&self, state: &mut State<'_>, nested: Nested) {
/// it can scan the input text for comments to copy forward.
pub fn print_crate<'a>(cm: &'a SourceMap,
sess: &ParseSess,
- krate: &hir::Crate,
+ krate: &hir::Crate<'a>,
filename: FileName,
input: String,
ann: &'a dyn PpAnn) -> String {
}
pub fn print_foreign_mod(&mut self,
- nmod: &hir::ForeignMod,
+ nmod: &hir::ForeignMod<'_>,
attrs: &[ast::Attribute])
{
self.print_inner_attributes(attrs);
- for item in &nmod.items {
+ for item in nmod.items {
self.print_foreign_item(item);
}
}
self.end()
}
- pub fn print_foreign_item(&mut self, item: &hir::ForeignItem) {
+ pub fn print_foreign_item(&mut self, item: &hir::ForeignItem<'_>) {
self.hardbreak_if_not_bol();
self.maybe_print_comment(item.span.lo());
self.print_outer_attributes(&item.attrs);
}
hir::ForeignItemKind::Static(ref t, m) => {
self.head(visibility_qualified(&item.vis, "static"));
- if m == hir::Mutability::Mutable {
+ if m == hir::Mutability::Mut {
self.word_space("mut");
}
self.print_ident(item.ident);
fn print_item_type(
&mut self,
- item: &hir::Item,
+ item: &hir::Item<'_>,
generics: &hir::Generics,
inner: impl Fn(&mut Self),
) {
}
/// Pretty-print an item
- pub fn print_item(&mut self, item: &hir::Item) {
+ pub fn print_item(&mut self, item: &hir::Item<'_>) {
self.hardbreak_if_not_bol();
self.maybe_print_comment(item.span.lo());
self.print_outer_attributes(&item.attrs);
}
hir::ItemKind::Static(ref ty, m, expr) => {
self.head(visibility_qualified(&item.vis, "static"));
- if m == hir::Mutability::Mutable {
+ if m == hir::Mutability::Mut {
self.word_space("mut");
}
self.print_ident(item.ident);
ref generics,
ref opt_trait,
ref ty,
- ref impl_items) => {
+ impl_items) => {
self.head("");
self.print_visibility(&item.vis);
self.print_defaultness(defaultness);
}
self.bclose(item.span);
}
- hir::ItemKind::Trait(is_auto, unsafety, ref generics, ref bounds, ref trait_items) => {
+ hir::ItemKind::Trait(is_auto, unsafety, ref generics, ref bounds, trait_items) => {
self.head("");
self.print_visibility(&item.vis);
self.print_is_auto(is_auto);
body_id)
}
- pub fn print_trait_item(&mut self, ti: &hir::TraitItem) {
+ pub fn print_trait_item(&mut self, ti: &hir::TraitItem<'_>) {
self.ann.pre(self, AnnNode::SubItem(ti.hir_id));
self.hardbreak_if_not_bol();
self.maybe_print_comment(ti.span.lo());
self.ann.post(self, AnnNode::SubItem(ti.hir_id))
}
- pub fn print_impl_item(&mut self, ii: &hir::ImplItem) {
+ pub fn print_impl_item(&mut self, ii: &hir::ImplItem<'_>) {
self.ann.pre(self, AnnNode::SubItem(ii.hir_id));
self.hardbreak_if_not_bol();
self.maybe_print_comment(ii.span.lo());
match binding_mode {
hir::BindingAnnotation::Ref => {
self.word_nbsp("ref");
- self.print_mutability(hir::Mutability::Immutable, false);
+ self.print_mutability(hir::Mutability::Not, false);
}
hir::BindingAnnotation::RefMut => {
self.word_nbsp("ref");
- self.print_mutability(hir::Mutability::Mutable, false);
+ self.print_mutability(hir::Mutability::Mut, false);
}
hir::BindingAnnotation::Unannotated => {}
hir::BindingAnnotation::Mutable => {
pub fn print_mutability(&mut self, mutbl: hir::Mutability, print_const: bool) {
match mutbl {
- hir::Mutability::Mutable => self.word_nbsp("mut"),
- hir::Mutability::Immutable => if print_const { self.word_nbsp("const") },
+ hir::Mutability::Mut => self.word_nbsp("mut"),
+ hir::Mutability::Not => if print_const { self.word_nbsp("const") },
}
}