diff --git a/Cargo.lock b/Cargo.lock index fe1efb2ddf4..4d2b3eacb15 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1285,7 +1285,6 @@ dependencies = [ "regex", "rustc-ap-rustc_ast", "rustc-ap-rustc_ast_pretty", - "rustc-ap-rustc_attr", "rustc-ap-rustc_data_structures", "rustc-ap-rustc_errors", "rustc-ap-rustc_expand", diff --git a/Cargo.toml b/Cargo.toml index 26175a82cdd..4f114e6afa4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -72,9 +72,9 @@ version = "709.0.0" package = "rustc-ap-rustc_ast_pretty" version = "709.0.0" -[dependencies.rustc_attr] -package = "rustc-ap-rustc_attr" -version = "708.0.0" +# [dependencies.rustc_attr] +# package = "rustc-ap-rustc_attr" +# version = "708.0.0" [dependencies.rustc_data_structures] package = "rustc-ap-rustc_data_structures" diff --git a/src/attr.rs b/src/attr.rs index 2d25c263277..015e9f9b252 100644 --- a/src/attr.rs +++ b/src/attr.rs @@ -1,7 +1,7 @@ //! Format attributes and meta items. use rustc_ast::ast; -use rustc_ast::attr::HasAttrs; +use rustc_ast::AstLike; use rustc_span::{symbol::sym, Span, Symbol}; use self::doc_comment::DocCommentFormatter; diff --git a/src/formatting.rs b/src/formatting.rs index 2c38de04797..ce28f6bfea3 100644 --- a/src/formatting.rs +++ b/src/formatting.rs @@ -4,7 +4,7 @@ use std::collections::HashMap; use std::io::{self, Write}; use std::time::{Duration, Instant}; -use rustc_ast::ast; +use rustc_ast::{ast, AstLike}; use rustc_span::Span; use self::newline_style::apply_newline_style; diff --git a/src/modules.rs b/src/modules.rs index 2ee3639ffb1..feffd6e4a77 100644 --- a/src/modules.rs +++ b/src/modules.rs @@ -3,8 +3,8 @@ use std::collections::BTreeMap; use std::path::{Path, PathBuf}; use rustc_ast::ast; -use rustc_ast::attr::HasAttrs; use rustc_ast::visit::Visitor; +use rustc_ast::AstLike; use rustc_span::symbol::{self, sym, Symbol}; use rustc_span::Span; use thiserror::Error; @@ -54,7 +54,7 @@ impl<'a> Module<'a> { } } -impl<'a> HasAttrs for Module<'a> { +impl<'a> AstLike for Module<'a> { fn attrs(&self) -> &[ast::Attribute] { &self.inner_attr } diff --git a/src/visitor.rs b/src/visitor.rs index 4cd6b8d56d1..55cc9ec7f58 100644 --- a/src/visitor.rs +++ b/src/visitor.rs @@ -1,7 +1,7 @@ use std::cell::{Cell, RefCell}; use std::rc::Rc; -use rustc_ast::{ast, attr::HasAttrs, token::DelimToken, visit}; +use rustc_ast::{ast, token::DelimToken, visit, AstLike}; use rustc_span::{symbol, BytePos, Pos, Span, DUMMY_SP}; use crate::attr::*;