diff --git a/crates/cfg/src/cfg_expr.rs b/crates/cfg/src/cfg_expr.rs index 5425e6de66fb..91731c29d2bf 100644 --- a/crates/cfg/src/cfg_expr.rs +++ b/crates/cfg/src/cfg_expr.rs @@ -136,7 +136,7 @@ where result } -pub fn next_cfg_expr(it: &mut SliceIter<'_, tt::TokenTree>) -> Option { +fn next_cfg_expr(it: &mut SliceIter<'_, tt::TokenTree>) -> Option { let name = match it.next() { None => return None, Some(tt::TokenTree::Leaf(tt::Leaf::Ident(ident))) => ident.text.clone(), diff --git a/crates/cfg/src/lib.rs b/crates/cfg/src/lib.rs index 81a1f5ffcaf3..454d6fc5384b 100644 --- a/crates/cfg/src/lib.rs +++ b/crates/cfg/src/lib.rs @@ -12,7 +12,6 @@ use std::fmt; use rustc_hash::FxHashSet; use tt::SmolStr; -pub use cfg_attr::CfgAttr; pub use cfg_expr::{CfgAtom, CfgExpr}; pub use dnf::DnfExpr; diff --git a/crates/hir-expand/src/db.rs b/crates/hir-expand/src/db.rs index b62e79704d63..bb69c72be4d4 100644 --- a/crates/hir-expand/src/db.rs +++ b/crates/hir-expand/src/db.rs @@ -10,7 +10,6 @@ use syntax::{ ast::{self, HasAttrs}, AstNode, Parse, SyntaxElement, SyntaxError, SyntaxNode, SyntaxToken, T, }; -use tracing::info; use triomphe::Arc; use crate::{ @@ -462,14 +461,7 @@ fn macro_arg( } } } -fn censor_cfg_elements( - node: &SyntaxNode, - loc: &MacroCallLoc, - span_map: &SpanMap, - db: &dyn ExpandDatabase, -) -> FxHashSet { - cfg_process::process_cfg_attrs(node, loc, span_map, db).unwrap_or_default() -} + // FIXME: Censoring info should be calculated by the caller! Namely by name resolution /// Certain macro calls expect some nodes in the input to be preprocessed away, namely: /// - derives expect all `#[derive(..)]` invocations up to the currently invoked one to be stripped diff --git a/crates/hir-expand/src/fixup.rs b/crates/hir-expand/src/fixup.rs index f55d7097f82c..c3424b452414 100644 --- a/crates/hir-expand/src/fixup.rs +++ b/crates/hir-expand/src/fixup.rs @@ -52,7 +52,6 @@ pub(crate) fn fixup_syntax( ) -> SyntaxFixups { let mut append = FxHashMap::::default(); let mut remove = FxHashSet::::default(); - let mut remove = FxHashSet::::default(); let mut preorder = node.preorder(); let mut original = Vec::new(); let dummy_range = FIXUP_DUMMY_RANGE; diff --git a/crates/mbe/src/syntax_bridge.rs b/crates/mbe/src/syntax_bridge.rs index 964698845560..72dfacb58e89 100644 --- a/crates/mbe/src/syntax_bridge.rs +++ b/crates/mbe/src/syntax_bridge.rs @@ -9,7 +9,6 @@ use syntax::{ SyntaxKind::{self, *}, SyntaxNode, SyntaxToken, SyntaxTreeBuilder, TextRange, TextSize, WalkEvent, T, }; -use tracing::info; use tt::{ buffer::{Cursor, TokenBuffer}, Span,