Skip to content

Commit

Permalink
Merge #11637
Browse files Browse the repository at this point in the history 
11637: minor: Simplify r=Veykril a=Veykril

bors r+

Co-authored-by: Lukas Wirth <[email protected]>
  • Loading branch information
@bors @Veykril
bors[bot] and Veykril authored Mar 6, 2022
2 parents 5b9e46b + c1f91c9 commit b953812
Show file tree
Hide file tree
Showing 4 changed files with 77 additions and 83 deletions.
124 changes: 58 additions & 66 deletions crates/hir/src/semantics/source_to_def.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ use smallvec::SmallVec;
use stdx::impl_from;
use syntax::{
ast::{self, HasName},
match_ast, AstNode, SyntaxNode,
AstNode, SyntaxNode,
};

use crate::{db::HirDatabase, InFile};
Expand Down Expand Up @@ -132,13 +132,10 @@ impl SourceToDefCtx<'_, '_> {

pub(super) fn module_to_def(&mut self, src: InFile<ast::Module>) -> Option<ModuleId> {
let _p = profile::span("module_to_def");
let parent_declaration =
src.syntax().ancestors_with_macros_skip_attr_item(self.db.upcast()).skip(1).find_map(
|it| {
let m = ast::Module::cast(it.value.clone())?;
Some(it.with_value(m))
},
);
let parent_declaration = src
.syntax()
.ancestors_with_macros_skip_attr_item(self.db.upcast())
.find_map(|it| it.map(ast::Module::cast).transpose());

let parent_module = match parent_declaration {
Some(parent_declaration) => self.module_to_def(parent_declaration),
Expand All @@ -150,7 +147,7 @@ impl SourceToDefCtx<'_, '_> {

let child_name = src.value.name()?.as_name();
let def_map = parent_module.def_map(self.db.upcast());
let child_id = *def_map[parent_module.local_id].children.get(&child_name)?;
let &child_id = def_map[parent_module.local_id].children.get(&child_name)?;
Some(def_map.module_id(child_id))
}

Expand Down Expand Up @@ -337,7 +334,7 @@ impl SourceToDefCtx<'_, '_> {
}

pub(super) fn find_container(&mut self, src: InFile<&SyntaxNode>) -> Option<ChildContainer> {
for container in src.ancestors_with_macros_skip_attr_item(self.db.upcast()).skip(1) {
for container in src.ancestors_with_macros_skip_attr_item(self.db.upcast()) {
if let Some(res) = self.container_to_def(container) {
return Some(res);
}
Expand All @@ -348,85 +345,80 @@ impl SourceToDefCtx<'_, '_> {
}

fn container_to_def(&mut self, container: InFile<SyntaxNode>) -> Option<ChildContainer> {
let cont = match_ast! {
match (container.value) {
ast::Module(it) => {
let def = self.module_to_def(container.with_value(it))?;
def.into()
},
ast::Trait(it) => {
let def = self.trait_to_def(container.with_value(it))?;
def.into()
},
ast::Impl(it) => {
let def = self.impl_to_def(container.with_value(it))?;
def.into()
},
ast::Fn(it) => {
let def = self.fn_to_def(container.with_value(it))?;
DefWithBodyId::from(def).into()
},
ast::Struct(it) => {
let cont = if let Some(item) = ast::Item::cast(container.value.clone()) {
match item {
ast::Item::Module(it) => self.module_to_def(container.with_value(it))?.into(),
ast::Item::Trait(it) => self.trait_to_def(container.with_value(it))?.into(),
ast::Item::Impl(it) => self.impl_to_def(container.with_value(it))?.into(),
ast::Item::Enum(it) => self.enum_to_def(container.with_value(it))?.into(),
ast::Item::TypeAlias(it) => {
self.type_alias_to_def(container.with_value(it))?.into()
}
ast::Item::Struct(it) => {
let def = self.struct_to_def(container.with_value(it))?;
VariantId::from(def).into()
},
ast::Enum(it) => {
let def = self.enum_to_def(container.with_value(it))?;
def.into()
},
ast::Union(it) => {
}
ast::Item::Union(it) => {
let def = self.union_to_def(container.with_value(it))?;
VariantId::from(def).into()
},
ast::Static(it) => {
}
ast::Item::Fn(it) => {
let def = self.fn_to_def(container.with_value(it))?;
DefWithBodyId::from(def).into()
}
ast::Item::Static(it) => {
let def = self.static_to_def(container.with_value(it))?;
DefWithBodyId::from(def).into()
},
ast::Const(it) => {
}
ast::Item::Const(it) => {
let def = self.const_to_def(container.with_value(it))?;
DefWithBodyId::from(def).into()
},
ast::TypeAlias(it) => {
let def = self.type_alias_to_def(container.with_value(it))?;
def.into()
},
ast::Variant(it) => {
let def = self.enum_variant_to_def(container.with_value(it))?;
VariantId::from(def).into()
},
}
_ => return None,
}
} else {
let it = ast::Variant::cast(container.value)?;
let def = self.enum_variant_to_def(InFile::new(container.file_id, it))?;
VariantId::from(def).into()
};
Some(cont)
}

fn find_generic_param_container(&mut self, src: InFile<&SyntaxNode>) -> Option<GenericDefId> {
for container in src.ancestors_with_macros_skip_attr_item(self.db.upcast()).skip(1) {
let res: GenericDefId = match_ast! {
match (container.value) {
ast::Fn(it) => self.fn_to_def(container.with_value(it))?.into(),
ast::Struct(it) => self.struct_to_def(container.with_value(it))?.into(),
ast::Enum(it) => self.enum_to_def(container.with_value(it))?.into(),
ast::Trait(it) => self.trait_to_def(container.with_value(it))?.into(),
ast::TypeAlias(it) => self.type_alias_to_def(container.with_value(it))?.into(),
ast::Impl(it) => self.impl_to_def(container.with_value(it))?.into(),
_ => continue,
let ancestors = src.ancestors_with_macros_skip_attr_item(self.db.upcast());
for InFile { file_id, value } in ancestors {
let item = match ast::Item::cast(value) {
Some(it) => it,
None => continue,
};
let res: GenericDefId = match item {
ast::Item::Fn(it) => self.fn_to_def(InFile::new(file_id, it))?.into(),
ast::Item::Struct(it) => self.struct_to_def(InFile::new(file_id, it))?.into(),
ast::Item::Enum(it) => self.enum_to_def(InFile::new(file_id, it))?.into(),
ast::Item::Trait(it) => self.trait_to_def(InFile::new(file_id, it))?.into(),
ast::Item::TypeAlias(it) => {
self.type_alias_to_def(InFile::new(file_id, it))?.into()
}
ast::Item::Impl(it) => self.impl_to_def(InFile::new(file_id, it))?.into(),
_ => continue,
};
return Some(res);
}
None
}

fn find_pat_or_label_container(&mut self, src: InFile<&SyntaxNode>) -> Option<DefWithBodyId> {
for container in src.ancestors_with_macros_skip_attr_item(self.db.upcast()).skip(1) {
let res: DefWithBodyId = match_ast! {
match (container.value) {
ast::Const(it) => self.const_to_def(container.with_value(it))?.into(),
ast::Static(it) => self.static_to_def(container.with_value(it))?.into(),
ast::Fn(it) => self.fn_to_def(container.with_value(it))?.into(),
_ => continue,
}
let ancestors = src.ancestors_with_macros_skip_attr_item(self.db.upcast());
for InFile { file_id, value } in ancestors {
let item = match ast::Item::cast(value) {
Some(it) => it,
None => continue,
};
let res: DefWithBodyId = match item {
ast::Item::Const(it) => self.const_to_def(InFile::new(file_id, it))?.into(),
ast::Item::Static(it) => self.static_to_def(InFile::new(file_id, it))?.into(),
ast::Item::Fn(it) => self.fn_to_def(InFile::new(file_id, it))?.into(),
_ => continue,
};
return Some(res);
}
Expand Down
25 changes: 13 additions & 12 deletions crates/hir_expand/src/builtin_fn_macro.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@ use base_db::{AnchoredPath, Edition, FileId};
use cfg::CfgExpr;
use either::Either;
use mbe::{parse_exprs_with_sep, parse_to_token_tree};
use syntax::ast::{self, AstToken};
use syntax::{
ast::{self, AstToken},
SmolStr,
};

use crate::{
db::AstDatabase, name, quote, AstId, CrateId, ExpandError, ExpandResult, MacroCallId,
Expand Down Expand Up @@ -130,6 +133,9 @@ register_builtin! {
(option_env, OptionEnv) => option_env_expand
}

const DOLLAR_CRATE: tt::Ident =
tt::Ident { text: SmolStr::new_inline("$crate"), id: tt::TokenId::unspecified() };

fn module_path_expand(
_db: &dyn AstDatabase,
_id: MacroCallId,
Expand Down Expand Up @@ -202,7 +208,6 @@ fn assert_expand(
_id: MacroCallId,
tt: &tt::Subtree,
) -> ExpandResult<tt::Subtree> {
let krate = tt::Ident { text: "$crate".into(), id: tt::TokenId::unspecified() };
let args = parse_exprs_with_sep(tt, ',');
let expanded = match &*args {
[cond, panic_args @ ..] => {
Expand All @@ -218,7 +223,7 @@ fn assert_expand(
let panic_args = itertools::Itertools::intersperse(panic_args.iter().cloned(), comma);
quote! {{
if !#cond {
#krate::panic!(##panic_args);
#DOLLAR_CRATE::panic!(##panic_args);
}
}}
}
Expand Down Expand Up @@ -293,15 +298,13 @@ fn asm_expand(
// We expand all assembly snippets to `format_args!` invocations to get format syntax
// highlighting for them.

let krate = tt::Ident { text: "$crate".into(), id: tt::TokenId::unspecified() };

let mut literals = Vec::new();
for tt in tt.token_trees.chunks(2) {
match tt {
[tt::TokenTree::Leaf(tt::Leaf::Literal(lit))]
| [tt::TokenTree::Leaf(tt::Leaf::Literal(lit)), tt::TokenTree::Leaf(tt::Leaf::Punct(tt::Punct { char: ',', id: _, spacing: _ }))] =>
{
let krate = krate.clone();
let krate = DOLLAR_CRATE.clone();
literals.push(quote!(#krate::format_args!(#lit);));
}
_ => break,
Expand Down Expand Up @@ -343,11 +346,10 @@ fn panic_expand(
) -> ExpandResult<tt::Subtree> {
let loc: MacroCallLoc = db.lookup_intern_macro_call(id);
// Expand to a macro call `$crate::panic::panic_{edition}`
let krate = tt::Ident { text: "$crate".into(), id: tt::TokenId::unspecified() };
let mut call = if db.crate_graph()[loc.krate].edition >= Edition::Edition2021 {
quote!(#krate::panic::panic_2021!)
quote!(#DOLLAR_CRATE::panic::panic_2021!)
} else {
quote!(#krate::panic::panic_2015!)
quote!(#DOLLAR_CRATE::panic::panic_2015!)
};

// Pass the original arguments
Expand All @@ -362,11 +364,10 @@ fn unreachable_expand(
) -> ExpandResult<tt::Subtree> {
let loc: MacroCallLoc = db.lookup_intern_macro_call(id);
// Expand to a macro call `$crate::panic::unreachable_{edition}`
let krate = tt::Ident { text: "$crate".into(), id: tt::TokenId::unspecified() };
let mut call = if db.crate_graph()[loc.krate].edition >= Edition::Edition2021 {
quote!(#krate::panic::unreachable_2021!)
quote!(#DOLLAR_CRATE::panic::unreachable_2021!)
} else {
quote!(#krate::panic::unreachable_2015!)
quote!(#DOLLAR_CRATE::panic::unreachable_2015!)
};

// Pass the original arguments
Expand Down
5 changes: 3 additions & 2 deletions crates/hir_expand/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -712,7 +712,7 @@ impl<'a> InFile<&'a SyntaxNode> {
self,
db: &dyn db::AstDatabase,
) -> impl Iterator<Item = InFile<SyntaxNode>> + '_ {
iter::successors(Some(self.cloned()), move |node| match node.value.parent() {
let succ = move |node: &InFile<SyntaxNode>| match node.value.parent() {
Some(parent) => Some(node.with_value(parent)),
None => {
let parent_node = node.file_id.call_node(db)?;
Expand All @@ -724,7 +724,8 @@ impl<'a> InFile<&'a SyntaxNode> {
Some(parent_node)
}
}
})
};
iter::successors(succ(&self.cloned()), succ)
}

/// Falls back to the macro call range if the node cannot be mapped up fully.
Expand Down
6 changes: 3 additions & 3 deletions crates/ide_db/src/defs.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,9 @@ impl IdentClass {
sema: &Semantics<RootDatabase>,
lifetime: &ast::Lifetime,
) -> Option<IdentClass> {
NameClass::classify_lifetime(sema, &lifetime).map(IdentClass::NameClass).or_else(|| {
NameRefClass::classify_lifetime(sema, &lifetime).map(IdentClass::NameRefClass)
})
NameRefClass::classify_lifetime(sema, &lifetime)
.map(IdentClass::NameRefClass)
.or_else(|| NameClass::classify_lifetime(sema, &lifetime).map(IdentClass::NameClass))
}

pub fn definitions(self) -> ArrayVec<Definition, 2> {
Expand Down

0 comments on commit b953812

Please sign in to comment.