Back out "feat: Implement default-field-values"

This backs out commit 7de0b2e.

Author: davidbarsky

crates/hir-def/src/expr_store/body.rs

@@ -122,9 +122,6 @@ impl Body {
                     src.map(|it| it.expr())
                 }
                 DefWithBodyId::InTypeConstId(c) => c.lookup(db).id.map(|_| c.source(db).expr()),
-                DefWithBodyId::FieldId(f) => {
-                    f.record_field_source(db).map(|it| it.and_then(|it| it.expr()))
-                }
             }
         };
         let module = def.module(db);

crates/hir-def/src/expr_store/lower.rs

@@ -90,7 +90,6 @@ pub(super) fn lower_body(
         DefWithBodyId::ConstId(it) => db.attrs(it.into()),
         DefWithBodyId::InTypeConstId(_) => Attrs::EMPTY,
         DefWithBodyId::VariantId(it) => db.attrs(it.into()),
-        DefWithBodyId::FieldId(it) => db.attrs(it.into()),
     }
     .rust_analyzer_tool()
     .any(|attr| *attr.path() == tool_path![skip]);
@@ -169,7 +168,6 @@ pub(super) fn lower_body(
                     Awaitable::No("constant")
                 }
                 DefWithBodyId::VariantId(..) => Awaitable::No("enum variant"),
-                DefWithBodyId::FieldId(..) => Awaitable::No("field"),
             }
         },
     );

crates/hir-def/src/expr_store/pretty.rs

@@ -11,7 +11,6 @@ use crate::{
         Statement,
     },
     pretty::{print_generic_args, print_path, print_type_ref},
-    VariantId,
 };
 
 use super::*;
@@ -57,32 +56,6 @@ pub(super) fn print_body_hir(
                 loc.id.item_tree(db)[loc.id.value].name.display(db.upcast(), edition),
             )
         }
-        DefWithBodyId::FieldId(it) => {
-            let parent_name: String = match it.parent {
-                VariantId::EnumVariantId(it) => {
-                    let loc = it.lookup(db);
-                    let enum_loc = loc.parent.lookup(db);
-                    format!(
-                        "{}::{}",
-                        enum_loc.id.item_tree(db)[enum_loc.id.value]
-                            .name
-                            .display(db.upcast(), edition),
-                        loc.id.item_tree(db)[loc.id.value].name.display(db.upcast(), edition),
-                    )
-                }
-                VariantId::StructId(it) => it
-                    .lookup(db)
-                    .id
-                    .resolved(db, |it| it.name.display(db.upcast(), edition).to_string()),
-                VariantId::UnionId(it) => it
-                    .lookup(db)
-                    .id
-                    .resolved(db, |it| it.name.display(db.upcast(), edition).to_string()),
-            };
-            let variant_data = it.parent.variant_data(db);
-            let field_name = &variant_data.fields()[it.local_id].name;
-            format!("field {}.{}", parent_name, field_name.display(db.upcast(), edition),)
-        }
     };
 
     let mut p = Printer {

crates/hir-def/src/lib.rs

@@ -55,7 +55,6 @@ pub mod visibility;
 
 use intern::Interned;
 pub use rustc_abi as layout;
-use src::HasSource;
 use triomphe::Arc;
 
 #[cfg(test)]
@@ -78,7 +77,6 @@ use hir_expand::{
     builtin::{BuiltinAttrExpander, BuiltinDeriveExpander, BuiltinFnLikeExpander, EagerExpander},
     db::ExpandDatabase,
     eager::expand_eager_macro_input,
-    files::InFileWrapper,
     impl_intern_lookup,
     name::Name,
     proc_macro::{CustomProcMacroExpander, ProcMacroKind},
@@ -521,41 +519,6 @@ pub struct FieldId {
     pub local_id: LocalFieldId,
 }
 
-impl FieldId {
-    pub fn record_field_source(
-        &self,
-        db: &dyn DefDatabase,
-    ) -> InFileWrapper<HirFileId, Option<ast::RecordField>> {
-        let field_list = match self.parent {
-            crate::VariantId::EnumVariantId(it) => {
-                let s = it.lookup(db);
-                s.source(db).map(|it| {
-                    it.field_list().and_then(|it| match it {
-                        ast::FieldList::RecordFieldList(it) => Some(it),
-                        _ => None,
-                    })
-                })
-            }
-            crate::VariantId::StructId(it) => {
-                let s = it.lookup(db);
-                s.source(db).map(|it| {
-                    it.field_list().and_then(|it| match it {
-                        ast::FieldList::RecordFieldList(it) => Some(it),
-                        _ => None,
-                    })
-                })
-            }
-            crate::VariantId::UnionId(it) => {
-                let s = it.lookup(db);
-                s.source(db).map(|it| it.record_field_list())
-            }
-        };
-        field_list.map(|it| {
-            it.and_then(|it| it.fields().nth(self.local_id.into_raw().into_u32() as usize))
-        })
-    }
-}
-
 pub type LocalFieldId = Idx<data::adt::FieldData>;
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
@@ -723,7 +686,6 @@ pub enum TypeOwnerId {
     TypeAliasId(TypeAliasId),
     ImplId(ImplId),
     EnumVariantId(EnumVariantId),
-    FieldId(FieldId),
 }
 
 impl TypeOwnerId {
@@ -741,11 +703,6 @@ impl TypeOwnerId {
                 GenericDefId::AdtId(AdtId::EnumId(it.lookup(db).parent))
             }
             TypeOwnerId::InTypeConstId(_) => return None,
-            TypeOwnerId::FieldId(it) => GenericDefId::AdtId(match it.parent {
-                VariantId::EnumVariantId(it) => AdtId::EnumId(it.lookup(db).parent),
-                VariantId::StructId(it) => it.into(),
-                VariantId::UnionId(it) => it.into(),
-            }),
         })
     }
 }
@@ -760,8 +717,7 @@ impl_from!(
     TraitAliasId,
     TypeAliasId,
     ImplId,
-    EnumVariantId,
-    FieldId
+    EnumVariantId
     for TypeOwnerId
 );
 
@@ -774,7 +730,6 @@ impl From<DefWithBodyId> for TypeOwnerId {
             DefWithBodyId::ConstId(it) => it.into(),
             DefWithBodyId::InTypeConstId(it) => it.into(),
             DefWithBodyId::VariantId(it) => it.into(),
-            DefWithBodyId::FieldId(it) => it.into(),
         }
     }
 }
@@ -930,7 +885,6 @@ pub enum DefWithBodyId {
     ConstId(ConstId),
     InTypeConstId(InTypeConstId),
     VariantId(EnumVariantId),
-    FieldId(FieldId),
 }
 
 impl_from!(FunctionId, ConstId, StaticId, InTypeConstId for DefWithBodyId);
@@ -951,7 +905,6 @@ impl DefWithBodyId {
             // FIXME: stable rust doesn't allow generics in constants, but we should
             // use `TypeOwnerId::as_generic_def_id` when it does.
             DefWithBodyId::InTypeConstId(_) => None,
-            DefWithBodyId::FieldId(_) => None,
         }
     }
 }
@@ -1379,11 +1332,6 @@ impl HasModule for TypeOwnerId {
             TypeOwnerId::ImplId(it) => it.module(db),
             TypeOwnerId::EnumVariantId(it) => it.module(db),
             TypeOwnerId::InTypeConstId(it) => it.lookup(db).owner.module(db),
-            TypeOwnerId::FieldId(it) => match it.parent {
-                VariantId::EnumVariantId(it) => it.module(db),
-                VariantId::StructId(it) => it.module(db),
-                VariantId::UnionId(it) => it.module(db),
-            },
         }
     }
 }
@@ -1396,11 +1344,6 @@ impl HasModule for DefWithBodyId {
             DefWithBodyId::ConstId(it) => it.module(db),
             DefWithBodyId::VariantId(it) => it.module(db),
             DefWithBodyId::InTypeConstId(it) => it.lookup(db).owner.module(db),
-            DefWithBodyId::FieldId(it) => match it.parent {
-                VariantId::EnumVariantId(it) => it.module(db),
-                VariantId::StructId(it) => it.module(db),
-                VariantId::UnionId(it) => it.module(db),
-            },
         }
     }
 }

crates/hir-def/src/macro_expansion_tests/builtin_derive_macro.rs

@@ -211,20 +211,6 @@ enum Bar {
     #[default]
     Bar,
 }
-#[derive(Default)]
-struct Baz {
-    field1: i32 = 2,
-    field2: bool = { false },
-}
-#[derive(Default)]
-enum Qux {
-    #[default]
-    Foo {
-        field1: i32,
-        field2: bool = true,
-        field3: (),
-    }
-}
 "#,
         expect![[r#"
 #[derive(Default)]
@@ -238,20 +224,6 @@ enum Bar {
     #[default]
     Bar,
 }
-#[derive(Default)]
-struct Baz {
-    field1: i32 = 2,
-    field2: bool = { false },
-}
-#[derive(Default)]
-enum Qux {
-    #[default]
-    Foo {
-        field1: i32,
-        field2: bool = true,
-        field3: (),
-    }
-}
 
 impl <> $crate::default::Default for Foo< > where {
     fn default() -> Self {
@@ -264,20 +236,6 @@ impl <> $crate::default::Default for Bar< > where {
     fn default() -> Self {
         Bar::Bar
     }
-}
-impl <> $crate::default::Default for Baz< > where {
-    fn default() -> Self {
-        Baz {
-            ..
-        }
-    }
-}
-impl <> $crate::default::Default for Qux< > where {
-    fn default() -> Self {
-        Qux::Foo {
-            field1: $crate::default::Default::default(), field3: $crate::default::Default::default(), ..
-        }
-    }
 }"#]],
     );
 }

crates/hir-def/src/resolver.rs

@@ -1227,11 +1227,6 @@ impl HasResolver for TypeOwnerId {
             TypeOwnerId::TypeAliasId(it) => it.resolver(db),
             TypeOwnerId::ImplId(it) => it.resolver(db),
             TypeOwnerId::EnumVariantId(it) => it.resolver(db),
-            TypeOwnerId::FieldId(it) => match it.parent {
-                VariantId::EnumVariantId(it) => it.resolver(db),
-                VariantId::StructId(it) => it.resolver(db),
-                VariantId::UnionId(it) => it.resolver(db),
-            },
         }
     }
 }
@@ -1244,11 +1239,6 @@ impl HasResolver for DefWithBodyId {
             DefWithBodyId::StaticId(s) => s.resolver(db),
             DefWithBodyId::VariantId(v) => v.resolver(db),
             DefWithBodyId::InTypeConstId(c) => c.lookup(db).owner.resolver(db),
-            DefWithBodyId::FieldId(f) => match f.parent {
-                VariantId::EnumVariantId(it) => it.resolver(db),
-                VariantId::StructId(it) => it.resolver(db),
-                VariantId::UnionId(it) => it.resolver(db),
-            },
         }
     }
 }