language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-02 06:41:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Auto merge of #17224 - Veykril:lock-bump, r=Veykril

Browse source 
Bump Cargo.lock
This commit is contained in:
bors 2024-05-14 08:59:34 +00:00
commit d28111dce8
5 changed files with 169 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/hir-def/src/item_tree.rs
View file

@ -473,12 +473,13 @@ macro_rules! mod_items {
)+
}
#[allow(unexpected_cfgs)]
impl From<GenericModItem> for ModItem {
fn from(id: GenericModItem) -> ModItem {
match id {
$(
$(
#[cfg_attr(FALSE, $generic_params)]
#[cfg_attr(ignore_fragment, $generic_params)]
GenericModItem::$typ(id) => ModItem::$typ(id),
)?
)+
@ -493,13 +494,14 @@ macro_rules! mod_items {
}
$(
#[allow(unexpected_cfgs)]
impl From<FileItemTreeId<$typ>> for ModItem {
fn from(id: FileItemTreeId<$typ>) -> ModItem {
ModItem::$typ(id)
}
}
$(
#[cfg_attr(FALSE, $generic_params)]
#[cfg_attr(ignore_fragment, $generic_params)]
impl From<FileItemTreeId<$typ>> for GenericModItem {
fn from(id: FileItemTreeId<$typ>) -> GenericModItem {
GenericModItem::$typ(id)